fix orderfin segfault

Author: MichaelChirico

NEWS.md

@@ -51,6 +51,7 @@
 1. `as.integer64.integer64` is consistent with `as.integer.integer` in terms or returning a plain integer64 vector (i.e., stripped of attributes; #188). Thanks @hcirellu.
 1. `log(integer64(), base=integer64(1))` no longer warns, consistent with `log(integer(), base=integer())` (#93).
 1. `sortfin(integer64(), 1:10)` no longer segfaults (#164).
+1. `orderfin(as.integer64(10:1), 1:3, 8:11)` no longer segfaults (#166).
 
 ## NOTES
 

src/sortuse64.c

@@ -257,7 +257,7 @@ SEXP r_ram_integer64_orderfin_asc(
 )
 {
   int i,n = LENGTH(x_);
-  int pos,nt = LENGTH(table_);
+  int pos,nt = LENGTH(order_);
   int n1 = nt-1;
   int method = asInteger(method_);
 
@@ -336,7 +336,7 @@ SEXP r_ram_integer64_orderpos_asc(
 )
 {
   int i,n = LENGTH(x_);
-  int pos,nt = LENGTH(table_);
+  int pos,nt = LENGTH(order_);
   int n1 = nt-1;
   int method = asInteger(method_);
   int nomatch = asInteger(nomatch_);

tests/testthat/test-sortuse64.R

@@ -1,37 +1,26 @@
-with_parameters_test_that("sortfin works", method=1:3, {
-  x = as.integer64(1:10)
-  r = sample(x) # NB: default method assumes 'sorted' is, well, sorted, so this requires method!=1
-  expect_identical(sortfin(integer64(), 1:10, method=method), rep(FALSE, 10L))
-  expect_identical(sortfin(x, integer64(), method=method), logical())
+test_that("orderfin and orderpos work with partial order", {
+  # These were segfaulting due to length(order) < length(table)
+  table = as.integer64(c(10, 20, 30, 5, 15, 25))
+  order = c(4, 1, 5, 2, 6, 3) # order of table is 5, 10, 15, 20, 25, 30
 
-  expect_true(all(sortfin(x, r)))
+  partial_order = c(4, 1, 5, 2) # order of subset of table is 5, 10, 15, 20
 
-  expect_true(sortfin(x, 1L, method=method))
-  expect_true(all(sortfin(x, c(1.0, 4.0), method=method)))
-  expect_identical(sortfin(x, as.integer64(0:1), method=method), c(FALSE, TRUE))
-  # only 'x' need be sorted
-  expect_identical(sortfin(x, as.integer64(1:0), method=method), c(TRUE, FALSE))
-})
-
-test_that("orderfin and orderpos work", {
-  x = as.integer64(1:10)
-  idx = seq_along(x)
+  x = as.integer64(c(5, 10, 15, 20, 25, 30, 99))
 
-  expect_identical(orderfin(x, idx, 0:1), c(FALSE, TRUE))
-  expect_identical(orderfin(x, idx, as.integer64(0:1), method=2L), c(FALSE, TRUE))
-  expect_identical(orderfin(x, idx, as.integer64(0:1), method=3L), c(FALSE, TRUE))
-
-  expect_identical(orderpos(x, idx, 0:1), c(NA_integer_, 1L))
-  expect_identical(orderpos(x, idx, as.integer64(0:1), method=2L), c(NA_integer_, 1L))
-  expect_identical(orderpos(x, idx, as.integer64(0:1), method=3L), c(NA_integer_, 1L))
-})
+  # reference with full order
+  full_fin = c(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE)
+  full_pos = c(4L, 1L, 5L, 2L, 6L, 3L, NA_integer_)
+  expect_identical(orderfin(table, order, x), full_fin)
+  expect_identical(orderpos(table, order, x), full_pos)
 
-test_that("ordertab and orderdup work", {
-  x = as.integer64(1:10)
-  x = c(x, x[1:8], x[1:6])
-  idx = order(x)
+  # with partial order, we search in a subset
+  partial_fin = c(TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE)
+  partial_pos = c(4L, 1L, 5L, 2L, NA_integer_, NA_integer_, NA_integer_)
+  expect_identical(orderfin(table, partial_order, x), partial_fin)
+  expect_identical(orderpos(table, partial_order, x), partial_pos)
 
-  expect_identical(ordertab(x, idx, 10L), rep(3:1, c(6L, 2L, 2L)))
-  expect_identical(orderdup(x, idx), rep(c(FALSE, TRUE), c(10L, 14L)))
-  expect_identical(orderdup(x, idx, method=2L), rep(c(FALSE, TRUE), c(10L, 14L)))
+  # user's example, table is not sorted ascending with order
+  # just check for no error
+  expect_identical(orderfin(as.integer64(10:1), 1:3, 8:11, method=1L), c(TRUE, TRUE, TRUE, FALSE))
+  expect_identical(orderpos(as.integer64(10:1), 1:3, 8:11, method=1L), c(1L, 2L, 3L, NA_integer_))
 })