Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cbindlist/mergelist] Whitespace changes #6431

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[cbindlist/mergelist] Whitespace changes #6431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ replace_dot_alias = function(e) {
}
return(x)
}
if (!mult %chin% c("first","last","all")) stopf("mult argument can only be 'first', 'last' or 'all'")
if (!mult %chin% c("first", "last", "all")) stopf("mult argument can only be 'first', 'last' or 'all'")
missingroll = missing(roll)
if (length(roll)!=1L || is.na(roll)) stopf("roll must be a single TRUE, FALSE, positive/negative integer/double including +Inf and -Inf or 'nearest'")
if (is.character(roll)) {
Expand Down
60 changes: 40 additions & 20 deletions src/bmerge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
// iArg, xArg, icolsArg and xcolsArg
idtVec = SEXPPTR_RO(idt); // set globals so bmerge_r can see them.
xdtVec = SEXPPTR_RO(xdt);
if (!isInteger(icolsArg)) internal_error(__func__, "icols is not integer vector"); // # nocov
if (!isInteger(xcolsArg)) internal_error(__func__, "xcols is not integer vector"); // # nocov
if (!isInteger(icolsArg))
internal_error(__func__, "icols is not integer vector"); // # nocov
if (!isInteger(xcolsArg))
internal_error(__func__, "xcols is not integer vector"); // # nocov
if ((LENGTH(icolsArg)==0 || LENGTH(xcolsArg)==0) && LENGTH(idt)>0) // We let through LENGTH(i) == 0 for tests 2126.*
internal_error(__func__, "icols and xcols must be non-empty integer vectors");
if (LENGTH(icolsArg) > LENGTH(xcolsArg)) internal_error(__func__, "length(icols) [%d] > length(xcols) [%d]", LENGTH(icolsArg), LENGTH(xcolsArg)); // # nocov
Expand All @@ -60,10 +62,14 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
iN = ilen = anslen = LENGTH(idt) ? LENGTH(VECTOR_ELT(idt,0)) : 0;
ncol = LENGTH(icolsArg); // there may be more sorted columns in x than involved in the join
for(int col=0; col<ncol; col++) {
if (icols[col]==NA_INTEGER) internal_error(__func__, "icols[%d] is NA", col); // # nocov
if (xcols[col]==NA_INTEGER) internal_error(__func__, "xcols[%d] is NA", col); // # nocov
if (icols[col]>LENGTH(idt) || icols[col]<1) error(_("icols[%d]=%d outside range [1,length(i)=%d]"), col, icols[col], LENGTH(idt));
if (xcols[col]>LENGTH(xdt) || xcols[col]<1) error(_("xcols[%d]=%d outside range [1,length(x)=%d]"), col, xcols[col], LENGTH(xdt));
if (icols[col]==NA_INTEGER)
internal_error(__func__, "icols[%d] is NA", col); // # nocov
if (xcols[col]==NA_INTEGER)
internal_error(__func__, "xcols[%d] is NA", col); // # nocov
if (icols[col]>LENGTH(idt) || icols[col]<1)
internal_error(__func__, "icols[%d]=%d outside range [1,length(i)=%d]", col, icols[col], LENGTH(idt)); // # nocov. Should have been caught already.
if (xcols[col]>LENGTH(xdt) || xcols[col]<1)
internal_error(__func__, "xcols[%d]=%d outside range [1,length(x)=%d]", col, xcols[col], LENGTH(xdt)); // # nocov
int it = TYPEOF(VECTOR_ELT(idt, icols[col]-1));
int xt = TYPEOF(VECTOR_ELT(xdt, xcols[col]-1));
if (iN && it!=xt)
Expand All @@ -75,11 +81,14 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
// rollArg, rollendsArg
roll = 0.0; rollToNearest = FALSE;
if (isString(rollarg)) {
if (strcmp(CHAR(STRING_ELT(rollarg,0)),"nearest") != 0) error(_("roll is character but not 'nearest'"));
if (ncol>0 && TYPEOF(VECTOR_ELT(idt, icols[ncol-1]-1))==STRSXP) error(_("roll='nearest' can't be applied to a character column, yet."));
if (strcmp(CHAR(STRING_ELT(rollarg, 0)), "nearest") != 0)
internal_error(__func__, "roll is character but not 'nearest'"); // # nocov. Only [.data.table exposes roll= directly, and this is already checked there.
if (ncol>0 && TYPEOF(VECTOR_ELT(idt, icols[ncol-1]-1))==STRSXP)
error(_("roll='nearest' can't be applied to a character column, yet."));
roll=1.0; rollToNearest=TRUE; // the 1.0 here is just any non-0.0, so roll!=0.0 can be used later
} else {
if (!isReal(rollarg)) internal_error(__func__, "roll is not character or double"); // # nocov
if (!isReal(rollarg))
internal_error(__func__, "roll is not character or double"); // # nocov
roll = REAL(rollarg)[0]; // more common case (rolling forwards or backwards) or no roll when 0.0
}
rollabs = fabs(roll);
Expand All @@ -98,10 +107,14 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
}

// mult arg
if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "all")) mult = ALL;
else if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "first")) mult = FIRST;
else if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "last")) mult = LAST;
else internal_error(__func__, "invalid value for 'mult'"); // # nocov
if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "all"))
mult = ALL;
else if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "first"))
mult = FIRST;
else if (!strcmp(CHAR(STRING_ELT(multArg, 0)), "last"))
mult = LAST;
else
internal_error(__func__, "invalid value for 'mult'"); // # nocov

// opArg
if (!isInteger(opArg) || length(opArg)!=ncol)
Expand Down Expand Up @@ -132,7 +145,8 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
retLength = R_Calloc(anslen, int);
retIndex = R_Calloc(anslen, int);
// initialise retIndex here directly, as next loop is meant for both equi and non-equi joins
for (int j=0; j<anslen; j++) retIndex[j] = j+1;
for (int j=0; j<anslen; j++)
retIndex[j] = j+1;
} else { // equi joins (or) non-equi join but no multiple matches
retFirstArg = PROTECT(allocVector(INTSXP, anslen));
retFirst = INTEGER(retFirstArg);
Expand All @@ -145,9 +159,11 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
for (int j=0; j<anslen; j++) {
// defaults need to populated here as bmerge_r may well not touch many locations, say if the last row of i is before the first row of x.
retFirst[j] = nomatch; // default to no match for NA goto below
// retLength[j] = 0; // TO DO: do this to save the branch below and later branches at R level to set .N to 0
retLength[j] = nomatch==0 ? 0 : 1;
}
// retLength[j] = 0; // TO DO: do this to save the branch below and later branches at R level to set .N to 0
int retLengthVal = (int)(nomatch != 0);
for (int j=0; j<anslen; j++)
retLength[j] = retLengthVal;

// allLen1Arg
allLen1Arg = PROTECT(allocVector(LGLSXP, 1));
Expand All @@ -174,7 +190,8 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
// xo arg
xo = NULL;
if (length(xoArg)) {
if (!isInteger(xoArg)) internal_error(__func__, "xoArg is not an integer vector"); // # nocov
if (!isInteger(xoArg))
internal_error(__func__, "xoArg is not an integer vector"); // # nocov
xo = INTEGER(xoArg);
}

Expand Down Expand Up @@ -391,10 +408,13 @@ void bmerge_r(int xlowIn, int xuppIn, int ilowIn, int iuppIn, int col, int thisg
// final two 1's are lowmax and uppmax
} else {
int len = xupp-xlow-1+rollLow+rollUpp; // rollLow and rollUpp cannot both be true
if (mult==ALL && len>1) allLen1[0] = FALSE;
if (len>1) {
if (mult==ALL)
allLen1[0] = FALSE; // bmerge()$allLen1
}
if (nqmaxgrp == 1) {
const int rf = (mult!=LAST) ? xlow+2-rollLow : xupp+rollUpp; // extra +1 for 1-based indexing at R level
const int rl = (mult==ALL) ? len : 1;
const int rf = (mult!=LAST) ? xlow+2-rollLow : xupp+rollUpp; // bmerge()$starts thus extra +1 for 1-based indexing at R level
const int rl = (mult==ALL) ? len : 1; // bmerge()$lens
for (int j=ilow+1; j<iupp; j++) { // usually iterates once only for j=ir
const int k = o ? o[j]-1 : j;
retFirst[k] = rf;
Expand Down
18 changes: 12 additions & 6 deletions src/vecseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ SEXP vecseq(SEXP x, SEXP len, SEXP clamp)
// Specially for use by [.data.table after binary search. Now so specialized that for general use
// bit::vecseq is recommended (Jens has coded it in C now).

if (!isInteger(x)) error(_("x must be an integer vector"));
if (!isInteger(len)) error(_("len must be an integer vector"));
if (LENGTH(x) != LENGTH(len)) error(_("x and len must be the same length"));
if (!isInteger(x))
error(_("x must be an integer vector")); // # nocov
if (!isInteger(len))
error(_("len must be an integer vector")); // # nocov
if (LENGTH(x) != LENGTH(len))
error(_("x and len must be the same length")); // # nocov
const int *ix = INTEGER(x);
const int *ilen = INTEGER(len), nlen=LENGTH(len);
int reslen = 0;
Expand All @@ -22,10 +25,13 @@ SEXP vecseq(SEXP x, SEXP len, SEXP clamp)
reslen += ilen[i];
}
if (!isNull(clamp)) {
if (!isNumeric(clamp) || LENGTH(clamp)!=1) error(_("clamp must be a double vector length 1"));
if (!isNumeric(clamp) || LENGTH(clamp)!=1)
error(_("clamp must be a double vector length 1")); // # nocov
double limit = REAL(clamp)[0];
if (limit<0) error(_("clamp must be positive"));
if (reslen>limit) error(_("Join results in %d rows; more than %d = nrow(x)+nrow(i). Check for duplicate key values in i each of which join to the same group in x over and over again. If that's ok, try by=.EACHI to run j for each group to avoid the large allocation. If you are sure you wish to proceed, rerun with allow.cartesian=TRUE. Otherwise, please search for this error message in the FAQ, Wiki, Stack Overflow and data.table issue tracker for advice."), reslen, (int)limit);
if (limit<0)
error(_("clamp must be positive")); // # nocov
if (reslen>limit)
error(_("Join results in %d rows; more than %d = nrow(x)+nrow(i). Check for duplicate key values in i each of which join to the same group in x over and over again. If that's ok, try by=.EACHI to run j for each group to avoid the large allocation. If you are sure you wish to proceed, rerun with allow.cartesian=TRUE. Otherwise, please search for this error message in the FAQ, Wiki, Stack Overflow and data.table issue tracker for advice."), reslen, (int)limit);
}
SEXP ans = PROTECT(allocVector(INTSXP, reslen));
int *ians = INTEGER(ans);
Expand Down
Loading