From c898b5bc041bfdbc093b3af5c37f3f2c68075edd Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Tue, 16 Jul 2024 17:25:34 -0700 Subject: [PATCH 1/9] Update tests.R --- .ci/atime/tests.R | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index fddfb1347..dbf90532d 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -119,6 +119,25 @@ test.list <- atime::atime_test_list( data.table:::setDT(L) }, Slow = "c4a2085e35689a108d67dacb2f8261e4964d7e12", # Parent of the first commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/commit/7cc4da4c1c8e568f655ab5167922dcdb75953801) - Fast = "1872f473b20fdcddc5c1b35d79fe9229cd9a1d15") # Last commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/pull/5427/commits) + Fast = "1872f473b20fdcddc5c1b35d79fe9229cd9a1d15"), # Last commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/pull/5427/commits) + + # Issue reported in: https://github.com/Rdatatable/data.table/issues/4200 + # To be fixed in: https://github.com/Rdatatable/data.table/pull/4558 + "groupby with dogroups #4558" = atime::atime_test( + N = 10^seq(1, 7), + setup = { + d <- data.table( + id3 = sample(c(seq.int(N*0.9), sample(N*0.9, N*0.1, TRUE))), + v1 = sample(5L, N, TRUE), + v2 = sample(5L, N, TRUE) + ) + }, + expr = { + expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) + }, + Before="793f8545c363d222de18ac892bc7abb80154e724",#parent of the PR that introduced the regression(https://github.com/Rdatatable/data.table/commit/4aadde8f5a51cd7c8f3889964e7280432ec65bbc) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724 + Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", #praent of the first commit in the PR (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) + Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302")#second commit in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) + # nolint end: undesirable_operator_linter. From e16f001e22f47930e0abf44fd27491448f6e079c Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Tue, 16 Jul 2024 19:22:28 -0700 Subject: [PATCH 2/9] Update tests.R --- .ci/atime/tests.R | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index dbf90532d..e125f3837 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -108,7 +108,7 @@ test.list <- atime::atime_test_list( # Issue reported in: https://github.com/Rdatatable/data.table/issues/5426 # To be fixed in: https://github.com/Rdatatable/data.table/pull/5427 - "setDT improved in #5427" = atime::atime_test( + "setDT improved fixed in #5427" = atime::atime_test( N = 10^seq(1, 7), setup = { L <- replicate(N, 1, simplify = FALSE) @@ -123,21 +123,21 @@ test.list <- atime::atime_test_list( # Issue reported in: https://github.com/Rdatatable/data.table/issues/4200 # To be fixed in: https://github.com/Rdatatable/data.table/pull/4558 - "groupby with dogroups #4558" = atime::atime_test( - N = 10^seq(1, 7), + "DT[by] fixed in #4558" = atime::atime_test( + N = 10^seq(1, 20), setup = { d <- data.table( - id3 = sample(c(seq.int(N*0.9), sample(N*0.9, N*0.1, TRUE))), - v1 = sample(5L, N, TRUE), - v2 = sample(5L, N, TRUE) + id3 = sample( c(seq.int(N*0.9), sample( N*0.9, N*0.1, TRUE))), + v1 = sample(5L, N, TRUE), + v2 = sample(5L, N, TRUE) ) }, expr = { expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) }, - Before="793f8545c363d222de18ac892bc7abb80154e724",#parent of the PR that introduced the regression(https://github.com/Rdatatable/data.table/commit/4aadde8f5a51cd7c8f3889964e7280432ec65bbc) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724 - Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", #praent of the first commit in the PR (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) - Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302")#second commit in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) + Before="793f8545c363d222de18ac892bc7abb80154e724", # Parent of the PR that introduced the regression(https://github.com/Rdatatable/data.table/commit/4aadde8f5a51cd7c8f3889964e7280432ec65bbc) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724 + Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit(https://github.com/Rdatatable/data.table/pull/4558/commits/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) + Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/tree/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) # nolint end: undesirable_operator_linter. From 951bfcf737d4946b1032da07a5c3314615e7596f Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Wed, 17 Jul 2024 08:20:35 -0700 Subject: [PATCH 3/9] Update to commit links --- .ci/atime/tests.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index e125f3837..ab21ce111 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -135,8 +135,8 @@ test.list <- atime::atime_test_list( expr = { expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) }, - Before="793f8545c363d222de18ac892bc7abb80154e724", # Parent of the PR that introduced the regression(https://github.com/Rdatatable/data.table/commit/4aadde8f5a51cd7c8f3889964e7280432ec65bbc) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724 - Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit(https://github.com/Rdatatable/data.table/pull/4558/commits/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) + Before="793f8545c363d222de18ac892bc7abb80154e724", # This is the link to the Before commit (https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) + Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/tree/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) From 64f908e014118c3b64d9735e8564864e085997ec Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Wed, 17 Jul 2024 08:59:55 -0700 Subject: [PATCH 4/9] Before commits comment updated --- .ci/atime/tests.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index ab21ce111..c63b975bb 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -135,9 +135,9 @@ test.list <- atime::atime_test_list( expr = { expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) }, - Before="793f8545c363d222de18ac892bc7abb80154e724", # This is the link to the Before commit (https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724) as stated here (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) + Before="793f8545c363d222de18ac892bc7abb80154e724", # Commit (https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724) which was Before the regression was introduced as stated in the issue (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression - Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/tree/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) + Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) # nolint end: undesirable_operator_linter. From 6075ca01eec19364ec50f8a3dae42c6c5c27a876 Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Wed, 17 Jul 2024 20:13:17 -0700 Subject: [PATCH 5/9] new comment to the before commit --- .ci/atime/tests.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index c63b975bb..07cba1d39 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -135,7 +135,7 @@ test.list <- atime::atime_test_list( expr = { expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) }, - Before="793f8545c363d222de18ac892bc7abb80154e724", # Commit (https://github.com/Rdatatable/data.table/commit/793f8545c363d222de18ac892bc7abb80154e724) which was Before the regression was introduced as stated in the issue (https://github.com/Rdatatable/data.table/issues/4200#issuecomment-646111420) + Before="905e4d302be0dc326684d7228ece88064321cc00", # Parent of the regression commit (https://github.com/Rdatatable/data.table/commit/c152ced0e5799acee1589910c69c1a2c6586b95d) Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) From 4dbbf0c35b61aaf1e96e435ca044c1644ef22670 Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Thu, 18 Jul 2024 14:17:56 -0700 Subject: [PATCH 6/9] Update tests.R --- .ci/atime/tests.R | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index 07cba1d39..3a3cea1e0 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -135,9 +135,8 @@ test.list <- atime::atime_test_list( expr = { expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) }, - Before="905e4d302be0dc326684d7228ece88064321cc00", # Parent of the regression commit (https://github.com/Rdatatable/data.table/commit/c152ced0e5799acee1589910c69c1a2c6586b95d) - Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression + Before="7a9eaf62ede487625200981018d8692be8c6f134", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/515de90a6068911a148e54343a3503043b8bb87c) in the PR (https://github.com/Rdatatable/data.table/pull/4164/commits) that introduced the regression + Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) - # nolint end: undesirable_operator_linter. From af2fa8479b67cc95a9788a09a8552be154797b09 Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Mon, 29 Jul 2024 09:27:39 -0700 Subject: [PATCH 7/9] Removed extra spacing in some comments --- .ci/atime/tests.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index 3a3cea1e0..cb7c592d9 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -127,7 +127,7 @@ test.list <- atime::atime_test_list( N = 10^seq(1, 20), setup = { d <- data.table( - id3 = sample( c(seq.int(N*0.9), sample( N*0.9, N*0.1, TRUE))), + id3 = sample(c(seq.int(N*0.9), sample( N*0.9, N*0.1, TRUE))), v1 = sample(5L, N, TRUE), v2 = sample(5L, N, TRUE) ) @@ -137,6 +137,6 @@ test.list <- atime::atime_test_list( }, Before="7a9eaf62ede487625200981018d8692be8c6f134", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/515de90a6068911a148e54343a3503043b8bb87c) in the PR (https://github.com/Rdatatable/data.table/pull/4164/commits) that introduced the regression Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression - Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) + Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) # nolint end: undesirable_operator_linter. From ea22668c28c790c65523f5bc311038f11250b028 Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Mon, 29 Jul 2024 10:06:08 -0700 Subject: [PATCH 8/9] Fixed tense error and spacing --- .ci/atime/tests.R | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index cb7c592d9..89259c585 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -108,7 +108,7 @@ test.list <- atime::atime_test_list( # Issue reported in: https://github.com/Rdatatable/data.table/issues/5426 # To be fixed in: https://github.com/Rdatatable/data.table/pull/5427 - "setDT improved fixed in #5427" = atime::atime_test( + "setDT improved in #5427" = atime::atime_test( N = 10^seq(1, 7), setup = { L <- replicate(N, 1, simplify = FALSE) @@ -133,10 +133,10 @@ test.list <- atime::atime_test_list( ) }, expr = { - expr=data.table:::`[.data.table`(d, , (max(v1)-min(v2)), by = id3) + expr=data.table:::`[.data.table`(d, , max(v1) - min(v2), by = id3) }, - Before="7a9eaf62ede487625200981018d8692be8c6f134", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/515de90a6068911a148e54343a3503043b8bb87c) in the PR (https://github.com/Rdatatable/data.table/pull/4164/commits) that introduced the regression - Regression="c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression - Fixed="f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit (https://github.com/Rdatatable/data.table/commit/f750448a2efcd258b3aba57136ee6a95ce56b302) in the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) + Before = "7a9eaf62ede487625200981018d8692be8c6f134", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/515de90a6068911a148e54343a3503043b8bb87c) in the PR (https://github.com/Rdatatable/data.table/pull/4164/commits) that introduced the regression + Regression = "c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression + Fixed = "f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit of the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) ) # nolint end: undesirable_operator_linter. From 1e1f4e08a2563fcc7389d928e7547c7f798956fc Mon Sep 17 00:00:00 2001 From: Doris Amoakohene Date: Mon, 29 Jul 2024 11:01:09 -0700 Subject: [PATCH 9/9] updated fixed commit description --- .ci/atime/tests.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R index 89259c585..7dc0800a8 100644 --- a/.ci/atime/tests.R +++ b/.ci/atime/tests.R @@ -136,7 +136,7 @@ test.list <- atime::atime_test_list( expr=data.table:::`[.data.table`(d, , max(v1) - min(v2), by = id3) }, Before = "7a9eaf62ede487625200981018d8692be8c6f134", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/515de90a6068911a148e54343a3503043b8bb87c) in the PR (https://github.com/Rdatatable/data.table/pull/4164/commits) that introduced the regression - Regression = "c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression - Fixed = "f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit of the PR that fixes the regression(https://github.com/Rdatatable/data.table/pull/4558/commits) + Regression = "c152ced0e5799acee1589910c69c1a2c6586b95d", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/15f0598b9828d3af2eb8ddc9b38e0356f42afe4f) in the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression + Fixed = "f750448a2efcd258b3aba57136ee6a95ce56b302") # Second commit of the PR (https://github.com/Rdatatable/data.table/pull/4558/commits) that fixes the regression ) # nolint end: undesirable_operator_linter.