Skip to content

Commit d579af4

Browse files
attempt to restore from master
1 parent 3ead046 commit d579af4

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

src/bmerge.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,11 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
182182
allGrp1[0] = TRUE;
183183
protecti += 2;
184184

185-
// isorted arg
186-
o = NULL;
187-
if (!LOGICAL(isorted)[0]) {
188-
SEXP order = PROTECT(allocVector(INTSXP, length(icolsArg))); protecti++;
189-
for (int j=0; j<LENGTH(order); j++)
190-
INTEGER(order)[j]=1; // rep(1L, length(icolsArg))
191-
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), order, /* naArg= */ScalarLogical(FALSE), /* reuseSortingArg= */ScalarLogical(TRUE))); protecti++;
192-
// TODO - split head of forder into C-level callable
193-
if (!LENGTH(oSxp))
194-
o = NULL;
195-
else
196-
o = INTEGER(oSxp);
197-
}
185+
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), /* ascArg= */ScalarInteger(1), /* naArg= */ScalarLogical(FALSE), /* lazyArg= */ScalarLogical(TRUE))); protecti++;
186+
if (!LENGTH(oSxp))
187+
o = NULL;
188+
else
189+
o = INTEGER(oSxp);
198190

199191
// xo arg
200192
xo = NULL;

0 commit comments

Comments
 (0)