Skip to content

Conversation

@aitap
Copy link
Member

@aitap aitap commented Dec 19, 2025

Towards #6180.

Replace remaining uses of SET_ATTRIB with SHALLOW_DUPLICATE_ATTRIB or CLEAR_ATTRIB. Replace remaining uses of ATTRIB testing with ANY_ATTRIB; use the new R_mapAttrib interface to walk the attributes.

  • The most invasive fix is in assign.c where attr(., 'index') is adjusted following a by-reference operation that could invalidate some indices. What used to be a for (cons = ATTRIB(x); !isNull(cons); cons = CDR(cons)) loop now has to construct a context struct to share between the caller and the map callback. On the plus side, I simplified the memory management and string operations a bit, getting rid of things like memset(string, '\0', 1) and making use of the new hash table to look up the indices.
  • The compact rownames attribute in dogroups.c is also a bit tricky. Now dogroups creates a throwaway INTSXP c(NA_integer, -whatever), gives it to setAttrib(SD, R_RowNamesSymbol, decoy), and obtains the actual compact rownames attribute that R re-creates from the return value. I think this is simpler than walking the attribute list by hand in search of the correct attribute, and the end result is the same: we can modify rownames by reference without spilling it into a large string vector.

Instead, backport and use CLEAR_ATTRIB (R >= 4.5).
Use SHALLOW_DUPLICATE_ATTRIB (R >= 3.3) for the simple case. Also,
Backport ANY_ATTRIB (R >= 4.5) instead of testing !isNull(ATTRIB(.)).
Instead of trying to walk ATTRIB in search of the compact 'rownames'
attribute to modify, install it anew, take note of the returned
reference to the value being installed (a different one!) and modify
that.
Instead of walking the attribute list directly, use R_mapAttrib().
Create a hash table of index names instead of relying on chin() and a
temporary string vector. Move all temporary allocations onto the R heap.
@codecov
Copy link

codecov bot commented Dec 19, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.00%. Comparing base (458d12a) to head (fa2df39).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7487      +/-   ##
==========================================
+ Coverage   98.97%   99.00%   +0.03%     
==========================================
  Files          87       87              
  Lines       16739    16759      +20     
==========================================
+ Hits        16567    16592      +25     
+ Misses        172      167       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@github-actions
Copy link

github-actions bot commented Dec 19, 2025

No obvious timing issues in HEAD=attrib
Comparison Plot

Generated via commit fa2df39

Download link for the artifact containing the test results: ↓ atime-results.zip

Task Duration
R setup and installing dependencies 3 minutes and 1 seconds
Installing different package versions 44 seconds
Running and plotting the test cases 5 minutes and 8 seconds

@ben-schwen ben-schwen added this to the 1.19.0 milestone Dec 21, 2025
Copy link
Member

@HughParsonage HughParsonage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add some brief documentation about what each function does and returns if time permits.

return NULL;
}

static SEXP fixIndexAttrib(SEXP tag, SEXP value, void *ctx_) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is SEXP the intended return type?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's following the R_mapAttrib interface. I have to return (SEXP)NULL to continue iteration.

src/assign.c Outdated
struct attrib_name_ctx {
hashtab *indexNames;
SEXP index, assignedNames;
R_xlen_t len;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this field name be changed to make it clear what length it is the length of. R_xlen_t len_of<...>;

src/assign.c Outdated
// indexLength > 0 indicates reordering. Drop it to avoid spurious reordering in non-indexed columns (#2372)
// shortened name already present indicates that index needs to be dropped to avoid duplicate indices.
setAttrib(index, tag, R_NilValue);
hash_set(indexNames, tag, 0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be?

hash_set(indexNames, PRINTNAME(tag), 0);

(tag is a SYMSXP, not a CHARSXP?)

src/assign.c Outdated
// newcolnames : add these columns (if any)
// cols : column names or numbers corresponding to the values to set
// rows : row numbers to assign
R_len_t numToDo, targetlen, vlen, oldncol, oldtncol, coln, protecti=0, newcolnum, indexLength;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is indexLength used in assign any more?


SEXP ret = NULL;
for (; !isNull(a); REPROTECT(a = CDR(a), i)) {
ret = fun(TAG(a), CAR(a), ctx);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking, but if time permits consider R's structure more closely with protection of the TAG(a) and CAR(a) in teh callback.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK while a is protected, TAG(a), CAR(a), and CDR(a) should also stay protected. What do you recommend to do instead?

Copy link
Member

@ben-schwen ben-schwen Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why we are not just backporting the implementation of R, since it seems to have the same level of complexity/speed

https://github.com/wch/r-source/blob/f21cd0f6e791dbe35292db51f96a25f46f306748/src/main/attrib.c#L2010-L2031

PROTECT_WITH_INDEX(rownames = allocVector(INTSXP, 2), &rownamesi); nprotect++;
INTEGER(rownames)[0] = NA_INTEGER;
INTEGER(rownames)[1] = -maxGrpSize;
REPROTECT(rownames = setAttrib(SD, R_RowNamesSymbol, rownames), rownamesi);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is wrong; check the return value of setAttrib

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider R_mapAttrib for this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R is somewhat inconsistent about this. setAttrib(foo, R_CommentSymbol, bar) and setAttrib(foo, R_ClassSymbol, bar) return R_NilValue, but generic installAttrib and our specific case row_names_gets do return the freshly installed value. Since it's not documented, R_mapAttrib might be a safer approach.

@aitap
Copy link
Member Author

aitap commented Dec 25, 2025

This is expected to become more of a problem around end of January.

@aitap aitap modified the milestones: 1.19.0, 1.18.2 Dec 25, 2025
Comment on lines +140 to +145
SEXP rownames;
PROTECT_INDEX rownamesi;
PROTECT_WITH_INDEX(rownames = allocVector(INTSXP, 2), &rownamesi); nprotect++;
INTEGER(rownames)[0] = NA_INTEGER;
INTEGER(rownames)[1] = -maxGrpSize;
REPROTECT(rownames = setAttrib(SD, R_RowNamesSymbol, rownames), rownamesi);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

static SEXP findRowNames(SEXP key, SEXP val, void *data) {
  (void)data;
  if (key == R_RowNamesSymbol) return val;
  return NULL;
}
SEXP rownames = R_mapAttrib(SD, findRowNames, NULL);
  if (rownames == NULL) error(_("row.names attribute of .SD not found"));
  if (!isInteger(rownames) || LENGTH(rownames)!=2 || INTEGER(rownames)[0]!=NA_INTEGER) error(_("row.names of .SD isn't integer length 2 with NA as first item; i.e., .set_row_names(). [%s %d %d]"),type2char(TYPEOF(rownames)),LENGTH(rownames),INTEGER(rownames)[0]);

R_len_t ngrp, nrowgroups, njval=0, ngrpcols, ansloc=0, maxn, estn=-1, thisansloc, grpn, thislen, igrp;
int nprotect=0;
SEXP ans=NULL, jval, thiscol, BY, N, I, GRP, iSD, xSD, rownames, s, RHS, target, source;
SEXP ans=NULL, jval, thiscol, BY, N, I, GRP, iSD, xSD, s, RHS, target, source;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SEXP ans=NULL, jval, thiscol, BY, N, I, GRP, iSD, xSD, s, RHS, target, source;
SEXP ans=NULL, jval, thiscol, BY, N, I, GRP, iSD, xSD, RHS, target, source;

// with PR#4164 started to copy input list columns too much. Hence PR#4655 in v1.13.2 moved that copy here just where it is needed.
// Currently the marker is negative truelength. These specials are protected by us here and before we release them
// we restore the true truelength for when R starts to use vector truelength.
SEXP attribs, list_el;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SEXP list_el;

Copy link
Member

@ben-schwen ben-schwen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

Minor nag that NEWS is missing.

Should we add an atime test like in #2389?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants