(cassandra) branch trunk updated (8f7c23be85 -> 32b146dc63)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8f7c23be85 Merge branch 'cassandra-5.0' into trunk new c3a18e36d1 Minor bugs in generate.sh -d new 32b146dc63 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/config.yml | 81 --- .circleci/config.yml.FREE | 81 --- .circleci/config.yml.PAID | 81 --- .circleci/generate.sh | 47 ++- 4 files changed, 25 insertions(+), 265 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 32b146dc632341124f8da9bef69de5cdf3bd2d0e Merge: 8f7c23be85 c3a18e36d1 Author: Bereng AuthorDate: Wed Mar 20 08:07:39 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Minor bugs in generate.sh -d .circleci/config.yml | 81 --- .circleci/config.yml.FREE | 81 --- .circleci/config.yml.PAID | 81 --- .circleci/generate.sh | 47 ++- 4 files changed, 25 insertions(+), 265 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Minor bugs in generate.sh -d
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-5.0 by this push: new c3a18e36d1 Minor bugs in generate.sh -d c3a18e36d1 is described below commit c3a18e36d12a9fa55aa1a0687d6a58b5ebebe768 Author: Bereng AuthorDate: Tue Mar 12 08:52:53 2024 +0100 Minor bugs in generate.sh -d patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova for CASSANDRA-19458 --- .circleci/config.yml | 81 --- .circleci/config.yml.FREE | 81 --- .circleci/config.yml.PAID | 81 --- .circleci/generate.sh | 47 ++- 4 files changed, 25 insertions(+), 265 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fce7a0fef..8ac77b306c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9499,12 +9499,6 @@ workflows: requires: - start_j11_jvm_dtests_latest_vnode - j11_build -- start_j11_jvm_dtests_latest_vnode_repeat: -type: approval -- j11_jvm_dtests_latest_vnode_repeat: -requires: -- start_j11_jvm_dtests_latest_vnode_repeat -- j11_build - start_j17_jvm_dtests: type: approval - j17_jvm_dtests: @@ -9517,12 +9511,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j11_build -- start_j17_jvm_dtests_latest_vnode_repeat: -type: approval -- j17_jvm_dtests_latest_vnode_repeat: -requires: -- start_j17_jvm_dtests_latest_vnode_repeat -- j11_build - start_j11_simulator_dtests: type: approval - j11_simulator_dtests: @@ -9619,18 +9607,6 @@ workflows: requires: - start_j17_utests_latest - j11_build -- start_j11_utests_latest_repeat: -type: approval -- j11_utests_latest_repeat: -requires: -- start_j11_utests_latest_repeat -- j11_build -- start_j17_utests_latest_repeat: -type: approval -- j17_utests_latest_repeat: -requires: -- start_j17_utests_latest_repeat -- j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@ -9697,12 +9673,6 @@ workflows: requires: - start_j11_dtests_latest - j11_build -- start_j11_dtests_latest_repeat: -type: approval -- j11_dtests_latest_repeat: -requires: -- start_j11_dtests_latest_repeat -- j11_build - start_j17_dtests: type: approval - j17_dtests: @@ -9721,12 +9691,6 @@ workflows: requires: - start_j17_dtests_latest - j11_build -- start_j17_dtests_latest_repeat: -type: approval -- j17_dtests_latest_repeat: -requires: -- start_j17_dtests_latest_repeat -- j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -9829,9 +9793,6 @@ workflows: - j11_utests_latest: requires: - j11_build -- j11_utests_latest_repeat: -requires: -- j11_build - j11_simulator_dtests: requires: - j11_build @@ -9841,18 +9802,12 @@ workflows: - j11_jvm_dtests_latest_vnode: requires: - j11_build -- j11_jvm_dtests_latest_vnode_repeat: -requires: -- j11_build - j17_jvm_dtests: requires: - j11_build - j17_jvm_dtests_latest_vnode: requires: - j11_build -- j17_jvm_dtests_latest_vnode_repeat: -requires: -- j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -9874,9 +9829,6 @@ workflows: - j17_utests_latest: requires: - j11_build -- j17_utests_latest_repeat: -requires: -- j11_build - start_utests_long: type: approval - j11_utests_long: @@ -9954,9 +9906,6 @@ workflows: - j11_dtests_latest: requires: - j11_build -- j11_dtests_latest_repeat: -requires: -- j11_build - j17_dtests: requires: - j11_build @@ -9966,9 +9915,6 @@ workflows: - j17_dtests_latest: requires: - j11_build -- j17_dtests_latest_repeat: -requires: -- j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -10064,12 +10010,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j17_build -- start_j17_jvm_dtests_latest_vnode_repeat: -type: approval -- j17_jvm_dtests_latest_vnode_repeat: -requires: -- start_j17_jvm_dtests_latest_vnode_repeat -- j17_build - start_j17_cqlshlib_tests: type: approval
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e8e7861f142d7e6cb178a0c1126d458956862460 Merge: 5d4bcc797a 451b0c010f Author: Bereng AuthorDate: Mon Mar 11 08:08:34 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest .../cassandra/tools/nodetool/UpgradeSSTable.java | 27 +- 1 file changed, 21 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new 451b0c010f Test failure:
org.apache.cassandra.distributed.test.UpgradeSSTablesTest
451b0c010f is described below
commit 451b0c010f0997d7bf9e3f4687bf9e75e2ebb004
Author: Bereng
AuthorDate: Tue Feb 13 11:11:19 2024 +0100
Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest
patch by Berenguer Blasi; reviewed by Brandon Williams, Stefan Miklosovic
for CASSANDRA-18635
---
.../cassandra/tools/nodetool/UpgradeSSTable.java | 27 +-
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java
b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java
index cc94d8b54b..fb881bf106 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java
@@ -24,6 +24,9 @@ import io.airlift.airline.Option;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import org.apache.cassandra.db.compaction.CompactionInterruptedException;
import org.apache.cassandra.tools.NodeProbe;
import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
@@ -56,13 +59,25 @@ public class UpgradeSSTable extends NodeToolCmd
for (String keyspace : keyspaces)
{
-try
-{
-probe.upgradeSSTables(probe.output().out, keyspace,
!includeAll, maxSSTableTimestamp, jobs, tableNames);
-}
-catch (Exception e)
+for (int retries = 0; retries < 5; retries++)
{
-throw new RuntimeException("Error occurred during enabling
auto-compaction", e);
+try
+{
+if (retries > 0)
+Thread.sleep(500);
+probe.upgradeSSTables(probe.output().out, keyspace,
!includeAll, maxSSTableTimestamp, jobs, tableNames);
+break;
+}
+catch (RuntimeException cie)
+{
+// Spin retry. See CASSANDRA-18635
+if (ExceptionUtils.indexOfThrowable(cie,
CompactionInterruptedException.class) != -1 && retries == 4)
+throw (cie);
+}
+catch (Exception e)
+{
+throw new RuntimeException("Error occurred during enabling
auto-compaction", e);
+}
}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (5d4bcc797a -> e8e7861f14)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5d4bcc797a Avoid exposing intermediate state while replaying log during startup new 451b0c010f Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest new e8e7861f14 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/tools/nodetool/UpgradeSSTable.java | 27 +- 1 file changed, 21 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (8b429c8ef9 -> 6e72cf0ee5)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8b429c8ef9 Merge branch 'cassandra-5.0' into trunk new ebe07db602 Test Failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading new 6e72cf0ee5 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../distributed/test/UpgradeSSTablesTest.java | 58 +++--- 1 file changed, 50 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Test Failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new ebe07db602 Test Failure:
org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading
ebe07db602 is described below
commit ebe07db6023493b4f0a1968af439fee1e664dbaf
Author: Bereng
AuthorDate: Tue Mar 5 11:29:56 2024 +0100
Test Failure:
org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-19398
---
.../distributed/test/UpgradeSSTablesTest.java | 58 +++---
1 file changed, 50 insertions(+), 8 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java
b/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java
index 2bdcaf16c6..76c6c189c4 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/UpgradeSSTablesTest.java
@@ -50,10 +50,11 @@ import static
org.apache.cassandra.utils.concurrent.CountDownLatch.newCountDownL
public class UpgradeSSTablesTest extends TestBaseImpl
{
+
@Test
public void upgradeSSTablesInterruptsOngoingCompaction() throws Throwable
{
-try (ICluster cluster =
init(builder().withNodes(1).start()))
+try (ICluster cluster =
init(builder().withNodes(1).withInstanceInitializer(CompactionLatchByteman::install).start()))
{
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v text, PRIMARY KEY (pk, ck));");
cluster.get(1).acceptsOnInstance((String ks) -> {
@@ -79,10 +80,15 @@ public class UpgradeSSTablesTest extends TestBaseImpl
LogAction logAction = cluster.get(1).logs();
logAction.mark();
+
Future future = cluster.get(1).asyncAcceptsOnInstance((String
ks) -> {
ColumnFamilyStore cfs =
Keyspace.open(ks).getColumnFamilyStore("tbl");
CompactionManager.instance.submitMaximal(cfs,
FBUtilities.nowInSeconds(), false, OperationType.COMPACTION);
}).apply(KEYSPACE);
+
+Assert.assertTrue(cluster.get(1).callOnInstance(() ->
CompactionLatchByteman.starting.awaitUninterruptibly(1, TimeUnit.MINUTES)));
+cluster.get(1).runOnInstance(() -> {
+CompactionLatchByteman.start.decrement();});
Assert.assertEquals(0, cluster.get(1).nodetool("upgradesstables",
"-a", KEYSPACE, "tbl"));
future.get();
Assert.assertFalse(logAction.grep("Compaction
interrupted").getResult().isEmpty());
@@ -136,7 +142,7 @@ public class UpgradeSSTablesTest extends TestBaseImpl
@Test
public void cleanupDoesNotInterruptUpgradeSSTables() throws Throwable
{
-try (ICluster cluster =
init(builder().withNodes(1).withInstanceInitializer(BB::install).start()))
+try (ICluster cluster =
init(builder().withNodes(1).withInstanceInitializer(UpgradeSStablesLatchByteman::install).start()))
{
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v text, PRIMARY KEY (pk, ck));");
@@ -160,12 +166,12 @@ public class UpgradeSSTablesTest extends TestBaseImpl
LogAction logAction = cluster.get(1).logs();
logAction.mark();
-// Start upgradingsstables - use BB to pause once inside
ActiveCompactions.beginCompaction
+// Start upgradingsstables - use UpgradeSStablesLatchByteman to
pause once inside ActiveCompactions.beginCompaction
Thread upgradeThread = new Thread(() -> {
cluster.get(1).nodetool("upgradesstables", "-a", KEYSPACE,
"tbl");
});
upgradeThread.start();
-Assert.assertTrue(cluster.get(1).callOnInstance(() ->
BB.starting.awaitUninterruptibly(1, TimeUnit.MINUTES)));
+Assert.assertTrue(cluster.get(1).callOnInstance(() ->
UpgradeSStablesLatchByteman.starting.awaitUninterruptibly(1,
TimeUnit.MINUTES)));
// Start a scrub and make sure that it fails, log check later to
make sure it was
// because it cannot cancel the active upgrade sstables
@@ -173,7 +179,7 @@ public class UpgradeSSTablesTest extends TestBaseImpl
// Now resume the upgrade sstables so test can shut down
cluster.get(1).runOnInstance(() -> {
-BB.start.decrement();
+UpgradeSStablesLatchByteman.start.decrement();
});
upgradeThread.join();
@@ -186,7 +192,7 @@ public class UpgradeSSTablesTest
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6e72cf0ee51a090ece17ff2981e4d101fd9f63f6 Merge: 8b429c8ef9 ebe07db602 Author: Bereng AuthorDate: Wed Mar 6 09:33:14 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test Failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest.truncateWhileUpgrading .../distributed/test/UpgradeSSTablesTest.java | 58 +++--- 1 file changed, 50 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (ce963bc991 -> c26be50107)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from ce963bc991 Merge branch 'cassandra-5.0' into trunk new ab25cae4c5 Skinny dev circle workflow new c26be50107 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 88 +-- 1 file changed, 86 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Skinny dev circle workflow
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new ab25cae4c5 Skinny dev circle workflow
ab25cae4c5 is described below
commit ab25cae4c568312a4a2a5798296b7e97300306fd
Author: Bereng
AuthorDate: Wed Feb 21 09:27:42 2024 +0100
Skinny dev circle workflow
patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova, Stefan
Miklosovic for CASSANDRA-19414
---
.circleci/generate.sh | 88 +--
1 file changed, 86 insertions(+), 2 deletions(-)
diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index 1352f5839f..98cc2aec70 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -34,6 +34,8 @@ print_help()
echo " -a Generate the config.yml, config.yml.FREE and config.yml.PAID
expanded configuration"
echo " files from the main config_template.yml reusable configuration
file."
echo " Use this for permanent changes in config.yml that will be
committed to the main repo."
+ echo " -d Minimal development checks only. Sanity check during your dev
before sending it to review for speed and cost reductions."
+ echo " Submitting cleaning pre-commit clean CI run is still a
requirement when the patch is ready for review"
echo " -f Generate config.yml for tests compatible with the CircleCI free
tier resources"
echo " -p Generate config.yml for tests compatible with the CircleCI paid
tier resources"
echo " -b Specify the base git branch for comparison when determining
changed tests to"
@@ -80,15 +82,18 @@ print_help()
all=false
free=false
paid=false
+dev_min=false
env_vars=""
has_env_vars=false
check_env_vars=true
detect_changed_tests=true
-while getopts "e:afpib:s" opt; do
+while getopts "e:afpdib:s" opt; do
case $opt in
a ) all=true
detect_changed_tests=false
;;
+ d ) dev_min=true
+ ;;
f ) free=true
;;
p ) paid=true
@@ -253,7 +258,7 @@ if $has_env_vars; then
fi
# Define function to remove unneeded jobs.
-# The first argument is the file name, and the second arguemnt is the job name.
+# The first argument is the file name, and the second argument is the job name.
delete_job()
{
delete_yaml_block()
@@ -332,8 +337,87 @@ delete_repeated_jobs()
fi
}
+# Update the workflow names
+rename_workflow()
+{
+ file="$BASEDIR/$1"
+ echo "Updating workflow names in the configuration $2 -> $3"
+
+ sed -Ei.bak "s/$2/$3/g" "$file"
+}
+
+# Define function to leave only a single config run for each test group.
+# This builds a minimal sanity check config for dev only for time and cost
purposes.
+# The first and only argument is the file name.
+build_dev_min_jobs()
+{
+ delete_job "$1" "j11_cqlsh_dtests_py311_offheap"
+ delete_job "$1" "j11_cqlsh_dtests_py38_offheap"
+ delete_job "$1" "j17_cqlsh_dtests_py311_offheap"
+ delete_job "$1" "j17_cqlsh_dtests_py38_offheap"
+ delete_job "$1" "j11_cqlsh_dtests_py311_vnode"
+ delete_job "$1" "j11_cqlsh_dtests_py38_vnode"
+ delete_job "$1" "j11_cqlsh_dtests_py38"
+ delete_job "$1" "j11_cqlshlib_cython_tests"
+ delete_job "$1" "j17_cqlsh_dtests_py311_vnode"
+ delete_job "$1" "j17_cqlsh_dtests_py311"
+ delete_job "$1" "j17_cqlsh_dtests_py38_vnode"
+ delete_job "$1" "j17_cqlsh_dtests_py38"
+ delete_job "$1" "j17_cqlshlib_tests"
+ delete_job "$1" "j17_cqlshlib_cython_tests"
+ delete_job "$1" "j11_dtests_vnode"
+ delete_job "$1" "j11_dtests_large_vnode"
+ delete_job "$1" "j11_dtests_offheap"
+ delete_job "$1" "j17_dtests_vnode"
+ delete_job "$1" "j17_dtests_large"
+ delete_job "$1" "j17_dtests_large_vnode"
+ delete_job "$1" "j17_dtests_offheap"
+ delete_job "$1" "j17_dtests"
+ delete_job "$1" "j11_jvm_dtests_vnode"
+ delete_job "$1" "j17_jvm_dtests_vnode"
+ delete_job "$1" "j17_jvm_dtests"
+ delete_job "$1" "j11_utests_oa"
+ delete_job "$1" "j11_utests_cdc"
+ delete_job "$1" "j11_utests_compression"
+ delete_job "$1" "j11_utests_fqltool"
+ delete_job "$1" "j11_utests_long"
+ delete_job &quo
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c26be50107f9489ceb49531f2b914b30267a48bf Merge: ce963bc991 ab25cae4c5 Author: Bereng AuthorDate: Wed Feb 28 08:01:21 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Skinny dev circle workflow .circleci/generate.sh | 88 +-- 1 file changed, 86 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: Test Failure: dtest-upgrade.upgrade_tests.upgrade_through_versions_test.*
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new aec94d67 Test Failure: dtest-upgrade.upgrade_tests.upgrade_through_versions_test.* aec94d67 is described below commit aec94d67f63fcb62ec02ec448402b6fec8fdc9a9 Author: Bereng AuthorDate: Thu Feb 22 10:44:43 2024 +0100 Test Failure: dtest-upgrade.upgrade_tests.upgrade_through_versions_test.* patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova for CASSANDRA-19409 Co-authored-by: Berenguer Blasi Co-authored-by: Ekaterina Dimitrova --- pytest.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pytest.ini b/pytest.ini index 6054229a..79d18eca 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,10 +1,9 @@ [pytest] -addopts = --show-capture=stdout +addopts = --show-capture=stdout --timeout=900 python_files = test_*.py *_test.py *_tests.py junit_suite_name = Cassandra dtests log_level = INFO log_format = %(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s -timeout = 900 markers = since vnodes - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (95fcefede2 -> 612c9638dc)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 95fcefede2 Merge branch 'cassandra-4.0' into cassandra-4.1 new dee7947422 Bug in generate.sh removal of jobs new 612c9638dc Merge branch 'cassandra-4.0' into cassandra-4.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated: Bug in generate.sh removal of jobs
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new dee7947422 Bug in generate.sh removal of jobs
dee7947422 is described below
commit dee7947422637988fa65f2e09e8d8750eeb56255
Author: Bereng
AuthorDate: Mon Feb 19 07:34:36 2024 +0100
Bug in generate.sh removal of jobs
---
.circleci/generate.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index 1e5742d5c6..f578ce992e 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -255,8 +255,8 @@ delete_job()
sed -Ei.bak "/^- ${2}/d" "$1"
}
file="$BASEDIR/$1"
- delete_yaml_block "$file" "${2}"
- delete_yaml_block "$file" "start_${2}"
+ delete_yaml_block "$file" "${2}:"
+ delete_yaml_block "$file" "start_${2}:"
}
# Define function to remove any unneeded repeated jobs.
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 81e253b1665ea8cee12f4e81dcaa7325c2f2e223 Merge: ec9a553f7d 939fbfa63f Author: Bereng AuthorDate: Mon Feb 26 07:49:03 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Bug in generate.sh removal of jobs .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (53cd2d8286 -> 939fbfa63f)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 53cd2d8286 Fix VectorMemoryIndex#update logic to compare vectors Fix Index view new dee7947422 Bug in generate.sh removal of jobs new 612c9638dc Merge branch 'cassandra-4.0' into cassandra-4.1 new 939fbfa63f Merge branch 'cassandra-4.1' into cassandra-5.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 939fbfa63f890608d1c83d28166909141a2474a2 Merge: 53cd2d8286 612c9638dc Author: Bereng AuthorDate: Mon Feb 26 07:46:34 2024 +0100 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Bug in generate.sh removal of jobs .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (ec9a553f7d -> 81e253b166)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from ec9a553f7d Merge branch 'cassandra-5.0' into trunk new dee7947422 Bug in generate.sh removal of jobs new 612c9638dc Merge branch 'cassandra-4.0' into cassandra-4.1 new 939fbfa63f Merge branch 'cassandra-4.1' into cassandra-5.0 new 81e253b166 Merge branch 'cassandra-5.0' into trunk The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 612c9638dc53289e9e4cded17f3a5268176013b8 Merge: 95fcefede2 dee7947422 Author: Bereng AuthorDate: Mon Feb 26 07:44:55 2024 +0100 Merge branch 'cassandra-4.0' into cassandra-4.1 * cassandra-4.0: Bug in generate.sh removal of jobs .circleci/generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (997302d8a9 -> 1a971dab7e)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 997302d8a9 Merge branch 'cassandra-5.0' into trunk new 1086d10965 In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE new 1a971dab7e Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/java/org/apache/cassandra/gms/Gossiper.java | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new 1086d10965 In-jvm dtest RepairTest fails with
storage_compatibility_mode: NONE
1086d10965 is described below
commit 1086d1096573830302f9689e5c9d8264945110bb
Author: Bereng
AuthorDate: Wed Jan 31 08:29:25 2024 +0100
In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE
Patch by Berenguer Blasi; reviewed by brandonwilliams for CASSANDRA-19085
---
src/java/org/apache/cassandra/gms/Gossiper.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java
b/src/java/org/apache/cassandra/gms/Gossiper.java
index dc0ecb7368..adf465de21 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -643,6 +643,7 @@ public class Gossiper implements
IFailureDetectionEventListener, GossiperMBean,
VersionedValue shutdown =
remoteState.getApplicationState(ApplicationState.STATUS_WITH_PORT);
if (shutdown == null)
throw new AssertionError("Remote shutdown sent but missing
STATUS_WITH_PORT; " + remoteState);
+remoteState.getHeartBeatState().forceHighestPossibleVersionUnsafe();
endpointStateMap.put(endpoint, remoteState);
markDead(endpoint, remoteState);
FailureDetector.instance.forceConviction(endpoint);
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1a971dab7ee91a610d037b97ff5808cda7ed0b25 Merge: 997302d8a9 1086d10965 Author: Bereng AuthorDate: Wed Feb 7 08:31:49 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE src/java/org/apache/cassandra/gms/Gossiper.java | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: Test Failure: bootstrap_test.TestBootstrap.* Take 2
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6821227d Test Failure: bootstrap_test.TestBootstrap.* Take 2
6821227d is described below
commit 6821227d935acffad3b1a1e38429d96ca592e45b
Author: Bereng
AuthorDate: Wed Jan 24 10:16:58 2024 +0100
Test Failure: bootstrap_test.TestBootstrap.* Take 2
patch by Berenguer Blasi; reviewed by Brandon Williams and Marcus Eriksson
for CASSANDRA-19097
---
bootstrap_test.py | 30 +-
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index b7dac242..ec01b892 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -251,6 +251,11 @@ class BootstrapTester(Tester):
cluster = self.cluster
cluster.set_environment_variable('CASSANDRA_TOKEN_PREGENERATION_DISABLED',
'True')
cluster.populate(3)
+if cluster.version() <= '5.0':
+# Nodes need to be started one by one pre-TCM, not all at once.
See CASSANDRA-19097
+cluster.nodelist()[0].start(wait_for_binary_proto=True)
+cluster.nodelist()[1].start(wait_for_binary_proto=True)
+cluster.nodelist()[2].start(wait_for_binary_proto=True)
cluster.start()
node1 = cluster.nodes['node1']
@@ -258,7 +263,7 @@ class BootstrapTester(Tester):
session = self.patient_cql_connection(node1)
stress_table = 'keyspace1.standard1'
-query = SimpleStatement("SELECT * FROM %s" % (stress_table),
consistency_level=ConsistencyLevel.ALL)
+query = SimpleStatement("SELECT * FROM %s" % (stress_table))
original_rows = list(session.execute(query))
node4 = new_node(cluster)
@@ -518,7 +523,12 @@ class BootstrapTester(Tester):
"""
cluster = self.cluster
cluster.set_environment_variable('CASSANDRA_TOKEN_PREGENERATION_DISABLED',
'True')
-cluster.populate(2).start()
+cluster.populate(2)
+if cluster.version() <= '5.0':
+# Nodes need to be started one by one pre-TCM, not all at once.
See CASSANDRA-19097
+cluster.nodelist()[0].start(wait_for_binary_proto=True)
+cluster.nodelist()[1].start(wait_for_binary_proto=True)
+cluster.start()
(node1, node2) = cluster.nodelist()
node1.stress(['write', 'n=1K', 'no-warmup', '-schema',
'replication(factor=2)',
@@ -527,7 +537,7 @@ class BootstrapTester(Tester):
session = self.patient_exclusive_cql_connection(node2)
stress_table = 'keyspace1.standard1'
-query = SimpleStatement("SELECT * FROM %s" % stress_table,
consistency_level=ConsistencyLevel.ALL)
+query = SimpleStatement("SELECT * FROM %s" % stress_table)
original_rows = list(session.execute(query))
# Add a new node
@@ -620,6 +630,11 @@ class BootstrapTester(Tester):
cluster = self.cluster
cluster.set_environment_variable('CASSANDRA_TOKEN_PREGENERATION_DISABLED',
'True')
cluster.populate(3)
+if cluster.version() <= '5.0':
+# Nodes need to be started one by one pre-TCM, not all at once.
See CASSANDRA-19097
+cluster.nodelist()[0].start(wait_for_binary_proto=True)
+cluster.nodelist()[1].start(wait_for_binary_proto=True)
+cluster.nodelist()[2].start(wait_for_binary_proto=True)
cluster.start()
stress_table = 'keyspace1.standard1'
@@ -629,7 +644,7 @@ class BootstrapTester(Tester):
node1.stress(['write', 'n=10K', 'no-warmup', '-rate', 'threads=8'])
session = self.patient_cql_connection(node1)
-query = SimpleStatement("SELECT * FROM {}".format(stress_table),
consistency_level=ConsistencyLevel.ALL)
+query = SimpleStatement("SELECT * FROM {}".format(stress_table))
original_rows = list(session.execute(query))
# Add a new node, bootstrap=True ensures that it is not a seed
@@ -655,6 +670,11 @@ class BootstrapTester(Tester):
cluster = self.cluster
cluster.set_environment_variable('CASSANDRA_TOKEN_PREGENERATION_DISABLED',
'True')
cluster.populate(3)
+if cluster.version() <= '5.0':
+# Nodes need to be started one by one pre-TCM, not all at once.
See CASSANDRA-19097
+cluster.nodelist()[0].start(wait_for_binary_proto=True)
+cluster.nodelist()[1].start(wait_for_binary_proto=True)
+cluster.nodelist()[2].start(wait_for_binary_proto=True)
cluster.start()
stress_table = 'keyspace1.standard1'
@@ -664,7 +684,7 @@ class BootstrapTester(Tester):
node1.stress(['write', 'n=10K', 'no-warmup', '-rate', 'threads=8'])
(cassandra-dtest) branch trunk updated: Test Failure: bootstrap_test.TestBootstrap.*
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 15895d64 Test Failure: bootstrap_test.TestBootstrap.*
15895d64 is described below
commit 15895d64238bc5e6d4469a07131110d5ad168c71
Author: Bereng
AuthorDate: Wed Jan 17 10:07:16 2024 +0100
Test Failure: bootstrap_test.TestBootstrap.*
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-19097
---
bootstrap_test.py | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 85e3779b..b7dac242 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -11,6 +11,7 @@ from distutils.version import LooseVersion
from cassandra import ConsistencyLevel
from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.query import SimpleStatement
from ccmlib.node import NodeError, TimeoutError, ToolError, Node
import pytest
@@ -257,13 +258,14 @@ class BootstrapTester(Tester):
session = self.patient_cql_connection(node1)
stress_table = 'keyspace1.standard1'
-original_rows = list(session.execute("SELECT * FROM %s" %
(stress_table,)))
+query = SimpleStatement("SELECT * FROM %s" % (stress_table),
consistency_level=ConsistencyLevel.ALL)
+original_rows = list(session.execute(query))
node4 = new_node(cluster)
node4.start(wait_for_binary_proto=True)
session = self.patient_exclusive_cql_connection(node4)
-new_rows = list(session.execute("SELECT * FROM %s" % (stress_table,)))
+new_rows = list(session.execute(query))
assert original_rows == new_rows
@since('3.0')
@@ -525,7 +527,8 @@ class BootstrapTester(Tester):
session = self.patient_exclusive_cql_connection(node2)
stress_table = 'keyspace1.standard1'
-original_rows = list(session.execute("SELECT * FROM %s" %
stress_table))
+query = SimpleStatement("SELECT * FROM %s" % stress_table,
consistency_level=ConsistencyLevel.ALL)
+original_rows = list(session.execute(query))
# Add a new node
node3 = new_node(cluster, bootstrap=False)
@@ -533,7 +536,7 @@ class BootstrapTester(Tester):
node3.repair()
node1.cleanup()
-current_rows = list(session.execute("SELECT * FROM %s" % stress_table))
+current_rows = list(session.execute(query))
assert original_rows == current_rows
def test_local_quorum_bootstrap(self):
@@ -626,14 +629,15 @@ class BootstrapTester(Tester):
node1.stress(['write', 'n=10K', 'no-warmup', '-rate', 'threads=8'])
session = self.patient_cql_connection(node1)
-original_rows = list(session.execute("SELECT * FROM
{}".format(stress_table,)))
+query = SimpleStatement("SELECT * FROM {}".format(stress_table),
consistency_level=ConsistencyLevel.ALL)
+original_rows = list(session.execute(query))
# Add a new node, bootstrap=True ensures that it is not a seed
node4 = new_node(cluster, bootstrap=True)
node4.start(wait_for_binary_proto=True)
session = self.patient_cql_connection(node4)
-assert original_rows == list(session.execute("SELECT * FROM
{}".format(stress_table,)))
+assert original_rows == list(session.execute(query))
# Stop the new node and wipe its data
node4.stop(gently=gently)
@@ -660,14 +664,15 @@ class BootstrapTester(Tester):
node1.stress(['write', 'n=10K', 'no-warmup', '-rate', 'threads=8'])
session = self.patient_cql_connection(node1)
-original_rows = list(session.execute("SELECT * FROM
{}".format(stress_table,)))
+query = SimpleStatement("SELECT * FROM {}".format(stress_table),
consistency_level=ConsistencyLevel.ALL)
+original_rows = list(session.execute(query))
# Add a new node, bootstrap=True ensures that it is not a seed
node4 = new_node(cluster, bootstrap=True)
node4.start(wait_for_binary_proto=True)
session = self.patient_cql_connection(node4)
-assert original_rows == list(session.execute("SELECT * FROM
{}".format(stress_table,)))
+assert original_rows == list(session.execute(query))
# Decommission the new node and wipe its data
node4.decommission()
@@ -742,7 +747,7 @@ class BootstrapTester(Tester):
node1.flush()
session = self.patient_cql_connection(node1)
-original_rows = list(session.execute("SELECT * FROM
{}".format(stress_table,)))
+original_rows = list(session.execute("SELECT * FROM
{}".format
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a42f922eed50d63d853c7bc054aee81f32c0b7d4 Merge: 14911e628b 666f7df803 Author: Bereng AuthorDate: Thu Jan 18 07:12:35 2024 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Enhanced usage of test method names in CQLTester for better test debugging test/unit/org/apache/cassandra/cql3/CQLTester.java | 49 +++--- ...tabilityTest.java => JMXCompatibilityTest.java} | 3 +- 2 files changed, 45 insertions(+), 7 deletions(-) diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java index 965474a9c0,be3aa01dff..04b9b7b7e7 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@@ -177,8 -184,13 +181,13 @@@ import static org.apache.cassandra.conf import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_REUSE_PREPARED; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_ROW_CACHE_SIZE; import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_USE_PREPARED; + import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.AGGREGATE; + import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.FUNCTION; + import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.MATERIALIZED_VIEW; + import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TABLE; + import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TYPE; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Enhanced usage of test method names in CQLTester for better test debugging
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new 666f7df803 Enhanced usage of test method names in CQLTester for better
test debugging
666f7df803 is described below
commit 666f7df8034fbb10843be7ed61f869cc881c28c5
Author: Bereng
AuthorDate: Mon Jan 15 09:35:22 2024 +0100
Enhanced usage of test method names in CQLTester for better test debugging
patch by Berenguer Blasi, Benjamin Lerer; reviewed by Benjamin Lerer for
CASSANDRA-19050
Co-authored-by: Benjamin Lerer
Co-authored-by: Berenguer Blasi
---
test/unit/org/apache/cassandra/cql3/CQLTester.java | 49 +++---
...tabilityTest.java => JMXCompatibilityTest.java} | 3 +-
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java
b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 63f297dd51..be3aa01dff 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -39,6 +39,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -65,11 +66,14 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,6 +184,11 @@ import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_DRIVE
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_REUSE_PREPARED;
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_ROW_CACHE_SIZE;
import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_USE_PREPARED;
+import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.AGGREGATE;
+import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.FUNCTION;
+import static
org.apache.cassandra.cql3.SchemaElement.SchemaElementType.MATERIALIZED_VIEW;
+import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TABLE;
+import static org.apache.cassandra.cql3.SchemaElement.SchemaElementType.TYPE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -197,6 +206,12 @@ public abstract class CQLTester
protected static final Logger logger =
LoggerFactory.getLogger(CQLTester.class);
+// We make the test method name available and also use it when creating
KS, table,...
+@Rule
+public final TestName testName = new TestName();
+// Some tests use hardcoded constants so we may want to disable it
+protected static volatile boolean decorateCQLWithTestNames = true;
+
public static final String KEYSPACE = "cql_test_keyspace";
public static final String KEYSPACE_PER_TEST = "cql_test_keyspace_alt";
protected static final boolean USE_PREPARED_VALUES =
TEST_USE_PREPARED.getBoolean();
@@ -903,14 +918,14 @@ public abstract class CQLTester
protected String createTypeName()
{
-String typeName = String.format("type_%02d",
seqNumber.getAndIncrement());
+String typeName = createSchemaElementName(TYPE, null);
types.add(typeName);
return typeName;
}
protected String createFunctionName(String keyspace)
{
-return String.format("%s.function_%02d", keyspace,
seqNumber.getAndIncrement());
+return createSchemaElementName(FUNCTION, keyspace);
}
protected void registerFunction(String functionName, String argTypes)
@@ -935,7 +950,7 @@ public abstract class CQLTester
protected String createAggregateName(String keyspace)
{
-return String.format("%s.aggregate_%02d", keyspace,
seqNumber.getAndIncrement());
+return createSchemaElementName(AGGREGATE, keyspace);
}
protected void registerAggregate(String aggregateName, String argTypes)
@@ -983,11 +998,27 @@ public abstract class CQLTester
protected String createKeyspaceName()
{
-String currentKeyspace = String.format("keyspace_%02d",
seqNumber.getAndIncrement());
+String currentKeyspace =
createSchemaElementName(SchemaElement.SchemaElementType.KEYSPACE, null);
keyspaces.add(currentKeyspace);
return curren
(cassandra) branch trunk updated (14911e628b -> a42f922eed)
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 14911e628b Merge branch 'cassandra-5.0' into trunk
new 666f7df803 Enhanced usage of test method names in CQLTester for better
test debugging
new a42f922eed Merge branch 'cassandra-5.0' into trunk
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/unit/org/apache/cassandra/cql3/CQLTester.java | 49 +++---
...tabilityTest.java => JMXCompatibilityTest.java} | 3 +-
2 files changed, 45 insertions(+), 7 deletions(-)
rename test/unit/org/apache/cassandra/tools/{JMXCompatabilityTest.java =>
JMXCompatibilityTest.java} (99%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated: Test failure: dtest-novnode.disk_balance_test.TestDiskBalance.test_disk_balance_stress
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git The following commit(s) were added to refs/heads/trunk by this push: new 365085bb Test failure: dtest-novnode.disk_balance_test.TestDiskBalance.test_disk_balance_stress 365085bb is described below commit 365085bbd76ee717e265598fd83c6f4c39e1f1e6 Author: Bereng AuthorDate: Thu Nov 23 08:35:59 2023 +0100 Test failure: dtest-novnode.disk_balance_test.TestDiskBalance.test_disk_balance_stress Patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova, Michael Semb Wever for CASSANDRA-18947 --- disk_balance_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/disk_balance_test.py b/disk_balance_test.py index ceadf98a..1921f1aa 100644 --- a/disk_balance_test.py +++ b/disk_balance_test.py @@ -43,6 +43,7 @@ class TestDiskBalance(Tester): node1.stress(['write', 'n=50k', 'no-warmup', '-rate', 'threads=100', '-schema', 'replication(factor=3)', 'compaction(strategy=SizeTieredCompactionStrategy,enabled=false)']) cluster.flush() +cluster.stop() # make sure the data directories are balanced: for node in cluster.nodelist(): self.assert_balanced(node) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (5c44922a5a -> 6cac24f581)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5c44922a5a Merge branch 'cassandra-4.0' into cassandra-4.1 new 3ba6de70c7 Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest new 6cac24f581 Merge branch 'cassandra-4.0' into cassandra-4.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/db/commitlog/CommitLogSegment.java | 2 +- .../commitlog/CommitLogSegmentManagerCDCTest.java | 54 -- 2 files changed, 30 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4083166870d115cb76247722ebe1166f20649715
Merge: ed5a224283 f48de8343c
Author: Bereng
AuthorDate: Mon Nov 20 07:38:31 2023 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Test failure:
org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest
.../cassandra/db/commitlog/CommitLogSegment.java | 2 +-
.../commitlog/CommitLogSegmentManagerCDCTest.java | 54 --
2 files changed, 30 insertions(+), 26 deletions(-)
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 04a2c2c336,04a2c2c336..7a346acfd6
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@@ -61,7 -61,7 +61,7 @@@ public abstract class CommitLogSegmen
{
private final static long idBase;
--private CDCState cdcState = CDCState.PERMITTED;
++private volatile CDCState cdcState = CDCState.PERMITTED;
public enum CDCState
{
PERMITTED,
diff --cc
test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
index e964efa2d8,e964efa2d8..6fe3d0743b
---
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
+++
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
@@@ -42,7 -42,7 +42,6 @@@ import org.apache.cassandra.db.Keyspace
import org.apache.cassandra.db.RowUpdateBuilder;
import org.apache.cassandra.db.commitlog.CommitLogSegment.CDCState;
import org.apache.cassandra.exceptions.CDCWriteException;
--import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.schema.TableMetadata;
public class CommitLogSegmentManagerCDCTest extends CQLTester
@@@ -87,11 -87,11 +86,10 @@@
.forceBlockingFlush(ColumnFamilyStore.FlushReason.UNIT_TESTS);
CommitLog.instance.forceRecycleAllSegments();
cdcMgr.awaitManagementTasksCompletion();
--Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawCount() > 0);
++Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawFiles().length > 0);
// Simulate a CDC consumer reading files then deleting them
--for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).tryList())
--FileUtils.deleteWithConfirm(f);
++deleteCDCRawFiles();
// Update size tracker to reflect deleted files. Should flip flag
on current allocatingFrom to allow.
cdcMgr.updateCDCTotalSize();
@@@ -204,7 -204,7 +202,7 @@@
BufferedReader in = new BufferedReader(new FileReader(cdcIndexFile));
String input = in.readLine();
input = in.readLine();
--Assert.assertTrue("Expected COMPLETED in index file, got: " + input,
input.equals("COMPLETED"));
++Assert.assertEquals("Expected COMPLETED in index file, got: " +
input, "COMPLETED", input);
in.close();
}
@@@ -272,13 -272,13 +270,12 @@@
// Build up a list of expected index files after replay and then
clear out cdc_raw
List oldData = parseCDCIndexData();
--for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).tryList())
--FileUtils.deleteWithConfirm(f.absolutePath());
++deleteCDCRawFiles();
try
{
Assert.assertEquals("Expected 0 files in CDC folder after
deletion. ",
--0, new
File(DatabaseDescriptor.getCDCLogLocation()).tryList().length);
++0, getCDCRawFiles().length);
}
finally
{
@@@ -293,7 -293,7 +290,7 @@@
// Rough sanity check -> should be files there now.
Assert.assertTrue("Expected non-zero number of files in CDC folder
after restart.",
-- new
File(DatabaseDescriptor.getCDCLogLocation()).tryList().length > 0);
++ getCDCRawFiles().length > 0);
// Confirm all the old indexes in old are present and >= the original
offset, as we flag the entire segment
// as cdc written on a replay.
@@@ -307,6 -307,6 +304,7 @@@
{
Assert.assertTrue("New CDC index file expected to have >=
offset in old.", ncid.offset >= cid.offset);
found = true;
++break;
}
}
if (!found)
@@@ -327,7 -327,7 +325,10 @@@
for (CDCIndexData cid : oldData)
{
if (cid.fileName.equals(ncid.fileName))
++{
(cassandra) branch trunk updated (ed5a224283 -> 4083166870)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from ed5a224283 Merge branch 'cassandra-5.0' into trunk new 3ba6de70c7 Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest new 6cac24f581 Merge branch 'cassandra-4.0' into cassandra-4.1 new f48de8343c Merge branch 'cassandra-4.1' into cassandra-5.0 new 4083166870 Merge branch 'cassandra-5.0' into trunk The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/db/commitlog/CommitLogSegment.java | 2 +- .../commitlog/CommitLogSegmentManagerCDCTest.java | 54 -- 2 files changed, 30 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6cac24f581e9f6b719f3c0f9bc5c9df2e03c682a
Merge: 5c44922a5a 3ba6de70c7
Author: Bereng
AuthorDate: Mon Nov 20 07:35:51 2023 +0100
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
Test failure:
org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest
.../cassandra/db/commitlog/CommitLogSegment.java | 2 +-
.../commitlog/CommitLogSegmentManagerCDCTest.java | 54 --
2 files changed, 30 insertions(+), 26 deletions(-)
diff --cc
test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
index 3789b51714,21962c8b7b..9ad386ecbe
---
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
+++
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
@@@ -78,17 -94,13 +77,16 @@@ public class CommitLogSegmentManagerCDC
execute("INSERT INTO %s (idx, data) VALUES (1, '1');");
// Confirm that, on flush+recyle, we see files show up in cdc_raw
-
Keyspace.open(keyspace()).getColumnFamilyStore(currentTable()).forceBlockingFlush();
+CommitLogSegmentManagerCDC cdcMgr =
(CommitLogSegmentManagerCDC)CommitLog.instance.segmentManager;
+Keyspace.open(keyspace())
+.getColumnFamilyStore(currentTable())
+
.forceBlockingFlush(ColumnFamilyStore.FlushReason.UNIT_TESTS);
CommitLog.instance.forceRecycleAllSegments();
cdcMgr.awaitManagementTasksCompletion();
- Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawCount() > 0);
+ Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawFiles().length > 0);
// Simulate a CDC consumer reading files then deleting them
- for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).tryList())
- FileUtils.deleteWithConfirm(f);
+ deleteCDCRawFiles();
// Update size tracker to reflect deleted files. Should flip flag
on current allocatingFrom to allow.
cdcMgr.updateCDCTotalSize();
@@@ -336,9 -375,9 +337,9 @@@
List results = new ArrayList<>();
try
{
- for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).tryList())
+ for (File f : getCDCRawFiles())
{
-if (f.getName().contains("_cdc.idx"))
+if (f.name().contains("_cdc.idx"))
results.add(new CDCIndexData(f));
}
}
@@@ -356,16 -395,13 +357,12 @@@
CDCIndexData(File f) throws IOException
{
- String line = "";
+ String line;
-try (BufferedReader br = new BufferedReader(new
InputStreamReader(new FileInputStream(f
+try (BufferedReader br = new BufferedReader(new FileReader(f)))
{
line = br.readLine();
}
- catch (Exception e)
- {
- throw e;
- }
-
-fileName = f.getName();
+fileName = f.name();
offset = Integer.parseInt(line);
}
@@@ -407,107 -440,16 +401,117 @@@
}
}
+private void testWithNonblockingMode(Testable test) throws Throwable
+{
+boolean original = DatabaseDescriptor.getCDCBlockWrites();
+CommitLog.instance.setCDCBlockWrites(false);
+try
+{
+test.run();
+}
+finally
+{
+CommitLog.instance.setCDCBlockWrites(original);
+}
+}
+
+private void testWithCDCSpaceInMb(int size, Testable test) throws
Throwable
+{
+int origSize = (int) DatabaseDescriptor.getCDCTotalSpace() / 1024 /
1024;
+DatabaseDescriptor.setCDCTotalSpaceInMiB(size);
+try
+{
+test.run();
+}
+finally
+{
+DatabaseDescriptor.setCDCTotalSpaceInMiB(origSize);
+}
+}
+
+private String createTableAndBulkWrite() throws Throwable
+{
+return
createTableAndBulkWrite(DatabaseDescriptor.getCommitLogSegmentSize() / 3);
+}
+
+private String createTableAndBulkWrite(int mutationSize) throws Throwable
+{
+String tableName = createTable("CREATE TABLE %s (idx int, data text,
primary key(idx)) WITH cdc=true;");
+bulkWrite(tableName, mutationSize);
+return tableName;
+}
+
+private void bulkWrite(String tableName) throws Throwable
+{
+bulkWrite(tableName, DatabaseDescriptor.getCommitLogSegmentSize() /
3);
+}
+
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f48de8343cd8be5ba6ba970251ddb8520b489611 Merge: b7b2aa5de5 6cac24f581 Author: Bereng AuthorDate: Mon Nov 20 07:37:14 2023 +0100 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated: Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 3ba6de70c7 Test failure:
org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest
3ba6de70c7 is described below
commit 3ba6de70c74c842d0104dbd2dcef41c857198314
Author: Bereng
AuthorDate: Fri Nov 17 09:09:00 2023 +0100
Test failure:
org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18948
---
.../cassandra/db/commitlog/CommitLogSegment.java | 2 +-
.../commitlog/CommitLogSegmentManagerCDCTest.java | 67 --
2 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 64b815e3de..c46cc629d0 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -59,7 +59,7 @@ public abstract class CommitLogSegment
{
private final static long idBase;
-private CDCState cdcState = CDCState.PERMITTED;
+private volatile CDCState cdcState = CDCState.PERMITTED;
public enum CDCState
{
PERMITTED,
diff --git
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
index 4128b7122e..21962c8b7b 100644
---
a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
+++
b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDCTest.java
@@ -35,7 +35,6 @@ import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.RowUpdateBuilder;
import org.apache.cassandra.db.commitlog.CommitLogSegment.CDCState;
import org.apache.cassandra.exceptions.CDCWriteException;
-import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.schema.TableMetadata;
public class CommitLogSegmentManagerCDCTest extends CQLTester
@@ -68,7 +67,7 @@ public class CommitLogSegmentManagerCDCTest extends CQLTester
TableMetadata cfm = currentTableMetadata();
// Confirm that logic to check for whether or not we can allocate new
CDC segments works
-Integer originalCDCSize = DatabaseDescriptor.getCDCSpaceInMB();
+int originalCDCSize = DatabaseDescriptor.getCDCSpaceInMB();
try
{
DatabaseDescriptor.setCDCSpaceInMB(32);
@@ -98,11 +97,10 @@ public class CommitLogSegmentManagerCDCTest extends
CQLTester
Keyspace.open(keyspace()).getColumnFamilyStore(currentTable()).forceBlockingFlush();
CommitLog.instance.forceRecycleAllSegments();
cdcMgr.awaitManagementTasksCompletion();
-Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawCount() > 0);
+Assert.assertTrue("Expected files to be moved to overflow.",
getCDCRawFiles().length > 0);
// Simulate a CDC consumer reading files then deleting them
-for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).listFiles())
-FileUtils.deleteWithConfirm(f);
+deleteCDCRawFiles();
// Update size tracker to reflect deleted files. Should flip flag
on current allocatingFrom to allow.
cdcMgr.updateCDCTotalSize();
@@ -115,7 +113,7 @@ public class CommitLogSegmentManagerCDCTest extends
CQLTester
}
@Test
-public void testSegmentFlaggingOnCreation() throws Throwable
+public void testSegmentFlaggingOnCreation()
{
CommitLogSegmentManagerCDC cdcMgr =
(CommitLogSegmentManagerCDC)CommitLog.instance.segmentManager;
String ct = createTable("CREATE TABLE %s (idx int, data text, primary
key(idx)) WITH cdc=true;");
@@ -143,16 +141,13 @@ public class CommitLogSegmentManagerCDCTest extends
CQLTester
cdcMgr.awaitManagementTasksCompletion();
// Delete all files in cdc_raw
-for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).listFiles())
-f.delete();
+deleteCDCRawFiles();
cdcMgr.updateCDCTotalSize();
// Confirm cdc update process changes flag on active segment
expectCurrentCDCState(CDCState.PERMITTED);
// Clear out archived CDC files
-for (File f : new
File(DatabaseDescriptor.getCDCLogLocation()).listFiles()) {
-FileUtils.deleteWithConfirm(f);
-}
+deleteCDCRawFiles();
}
finally
{
@@ -179,8 +174,8 @@ public class CommitLogSegmentManagerCDCTest extends
CQLTester
// Read index value an
(cassandra) branch cassandra-5.0 updated (b7b2aa5de5 -> f48de8343c)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from b7b2aa5de5 Fix DiskSpaceMetricsTest.testFlushSize new 3ba6de70c7 Test failure: org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDCTest new 6cac24f581 Merge branch 'cassandra-4.0' into cassandra-4.1 new f48de8343c Merge branch 'cassandra-4.1' into cassandra-5.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (30e0b55f93 -> 0a09c12975)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 30e0b55f93 Merge branch 'cassandra-5.0' into trunk new 0e4c2f4bef Default to nb instead of nc for sstable formats new 0a09c12975 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CASSANDRA-14092.txt| 2 +- NEWS.txt | 4 +-- conf/cassandra.yaml| 2 +- conf/jvm-server.options| 4 +-- .../managing/tools/sstable/sstablemetadata.adoc| 2 +- .../managing/tools/sstable/sstablepartitions.adoc | 34 +++--- .../cassandra/io/sstable/format/SSTableReader.java | 2 +- .../cassandra/io/sstable/format/Version.java | 4 +-- .../cassandra/io/sstable/format/big/BigFormat.java | 16 +- .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 12 .../test/microbench/DeletionTimeDeSerBench.java| 6 ++-- .../cassandra/io/sstable/LegacySSTableTest.java| 2 +- .../format/big/VersionSupportedFeaturesTest.java | 6 ++-- .../sstable/metadata/MetadataSerializerTest.java | 5 +++- 14 files changed, 52 insertions(+), 49 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated: Default to nb instead of nc for sstable formats
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-5.0 by this push: new 0e4c2f4bef Default to nb instead of nc for sstable formats 0e4c2f4bef is described below commit 0e4c2f4befa22caa68b34f95d0169b4685bc7e0d Author: Bereng AuthorDate: Tue Nov 7 07:24:57 2023 +0100 Default to nb instead of nc for sstable formats patch by Berenguer Blasi; reviewed by Francisco Guerrero, Jacek Lewandowski, Michael Semb Wever for CASSANDRA-19010 --- CASSANDRA-14092.txt| 2 +- NEWS.txt | 4 +-- conf/cassandra.yaml| 2 +- conf/jvm-server.options| 4 +-- .../managing/tools/sstable/sstablemetadata.adoc| 2 +- .../managing/tools/sstable/sstablepartitions.adoc | 34 +++--- .../cassandra/io/sstable/format/SSTableReader.java | 2 +- .../cassandra/io/sstable/format/Version.java | 4 +-- .../cassandra/io/sstable/format/big/BigFormat.java | 16 +- .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 12 .../test/microbench/DeletionTimeDeSerBench.java| 6 ++-- .../cassandra/io/sstable/LegacySSTableTest.java| 2 +- .../format/big/VersionSupportedFeaturesTest.java | 6 ++-- .../sstable/metadata/MetadataSerializerTest.java | 5 +++- 14 files changed, 52 insertions(+), 49 deletions(-) diff --git a/CASSANDRA-14092.txt b/CASSANDRA-14092.txt index 90667cfe75..cdf3c6a2f6 100644 --- a/CASSANDRA-14092.txt +++ b/CASSANDRA-14092.txt @@ -4,7 +4,7 @@ CASSANDRA-14092: MAXIMUM TTL EXPIRATION DATE The maximum expiration timestamp that can be represented by the storage engine has been raised to 2106-02-07T06:28:13+00:00 from the previous 2038-01-19T03:14:06+00:00, which means that INSERTS using TTL that would expire after this date are not currently supported. Notice that on previous versions <5.0 -or when 5.0 is ran in compatibility mode (<="nc" sstable formats) the limit stays at at 2038-01-19T03:14:06+00:00. +or when 5.0 is ran in compatibility mode (<="oa" sstable formats) the limit stays at at 2038-01-19T03:14:06+00:00. There is a new yaml property storage_compatibility_mode that determines the Cassandra major version we want to stay compatible with. Its default is CASSANDRA_4, which means that diff --git a/NEWS.txt b/NEWS.txt index 7a47bf0b45..d9cb7460d1 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -4,7 +4,7 @@ PLEASE READ: MAXIMUM TTL EXPIRATION DATE NOTICE (CASSANDRA-14092 & CASSANDRA-142 The maximum expiration timestamp that can be represented by the storage engine has been raised to 2106-02-07T06:28:13+00:00 (2038-01-19T03:14:06+00:00 if in compatibility mode -with Cassandra <5.0, sstable version <=nc), which means that inserts with TTL that expire after +with Cassandra <5.0, sstable version <=oa), which means that inserts with TTL that expire after this date are not currently supported. By default, INSERTS with TTL exceeding the maximum supported date are rejected, but it's possible to choose a different expiration overflow policy. See CASSANDRA-14092.txt for more details. @@ -165,7 +165,7 @@ New features - On virtual tables, it is not strictly necessary to specify `ALLOW FILTERING` for select statements which would normally require it, except `system_views.system_logs`. - More accurate skipping of sstables in read path due to better handling of min/max clustering and lower bound; - SSTable format has been bumped to 'nc' because there are new fields in stats metadata\ + SSTable format has been bumped to 'oa' because there are new fields in stats metadata\ - Added MaxSSTableSize and MaxSSTableDuration metrics to TableMetrics. The former returns the size of the biggest SSTable of a table or 0 when there is not any SSTable. The latter returns the maximum duration, computed as `maxTimestamp - minTimestamp`, effectively non-zero for SSTables produced by TimeWindowCompactionStrategy. diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index fb6f454bb9..dd153e6b5c 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -2089,7 +2089,7 @@ drop_compact_storage_enabled: false # The chosen storage compatiblity mode will determine the versions of the written sstables, commitlogs, hints, # etc. Those storage elements will use the higher minor versions of the major version that corresponds to the # Cassandra version we want to stay compatible with. For example, if we want to stay compatible with Cassandra 4.0 -# or 4.1, the value of this property should be 4, and that will make us use 'nc' sstables. +# or 4.1, the value of this property should be 4, and that will make us use 'oa' sstables. # # This will
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0a09c12975a8bcbca23255f22e36a8002ecd213b Merge: 30e0b55f93 0e4c2f4bef Author: Bereng AuthorDate: Mon Nov 13 09:27:23 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Default to nb instead of nc for sstable formats CASSANDRA-14092.txt| 2 +- NEWS.txt | 4 +-- conf/cassandra.yaml| 2 +- conf/jvm-server.options| 4 +-- .../managing/tools/sstable/sstablemetadata.adoc| 2 +- .../managing/tools/sstable/sstablepartitions.adoc | 34 +++--- .../cassandra/io/sstable/format/SSTableReader.java | 2 +- .../cassandra/io/sstable/format/Version.java | 4 +-- .../cassandra/io/sstable/format/big/BigFormat.java | 16 +- .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 12 .../test/microbench/DeletionTimeDeSerBench.java| 6 ++-- .../cassandra/io/sstable/LegacySSTableTest.java| 2 +- .../format/big/VersionSupportedFeaturesTest.java | 6 ++-- .../sstable/metadata/MetadataSerializerTest.java | 5 +++- 14 files changed, 52 insertions(+), 49 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9a09c1e6b2654a432775e27e5b18ce0f61e0355 Merge: 91f5562241 25da086336 Author: Bereng AuthorDate: Mon Oct 16 12:24:16 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test failure: org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11 .../apache/cassandra/tools/nodetool/ForceCompactionTest.java | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --cc test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java index 04d369ec6d,ed438b2ca2..878433d702 --- a/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java @@@ -22,7 -22,8 +22,10 @@@ import java.util.ArrayList import java.util.Collection; import java.util.List; import java.util.Random; + import java.util.concurrent.TimeUnit; + ++import org.apache.cassandra.Util; + import org.junit.Before; import org.junit.Test; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated: Test failure: org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new 25da086336 Test failure:
org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
25da086336 is described below
commit 25da08633693eef83844ea7591baa3192d18a162
Author: Bereng
AuthorDate: Wed Sep 27 10:04:40 2023 +0200
Test failure:
org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-18881
---
.../apache/cassandra/tools/nodetool/ForceCompactionTest.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git
a/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
b/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
index 04d369ec6d..ed438b2ca2 100644
--- a/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
+++ b/test/unit/org/apache/cassandra/tools/nodetool/ForceCompactionTest.java
@@ -22,12 +22,14 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
+import org.apache.cassandra.Util;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
@@ -237,6 +239,7 @@ public class ForceCompactionTest extends CQLTester
ColumnFamilyStore cfs = getCurrentColumnFamilyStore();
if (cfs != null)
{
+cfs.forceMajorCompaction();
cfs.forceCompactionKeysIgnoringGcGrace(partitionKeysIgnoreGcGrace);
}
}
@@ -245,11 +248,15 @@ public class ForceCompactionTest extends CQLTester
{
// Get sstables
ColumnFamilyStore cfs =
Keyspace.open(keyspace()).getColumnFamilyStore(currentTable());
-Collection sstables = cfs.getLiveSSTables();
// always run a major compaction before calling this
-assertTrue(sstables.size() == 1);
+Util.spinAssertEquals("Too many sstables: " +
cfs.getLiveSSTables().toString(),
+ Boolean.TRUE,
+ () -> cfs.getLiveSSTables().size() == 1,
+ 60,
+ TimeUnit.SECONDS);
+Collection sstables = cfs.getLiveSSTables();
SSTableReader sstable = sstables.iterator().next();
int actualPurgedTombstoneCount = 0;
try (ISSTableScanner scanner = sstable.getScanner())
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (91f5562241 -> a9a09c1e6b)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 91f5562241 Merge branch 'cassandra-5.0' into trunk new 25da086336 Test failure: org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11 new a9a09c1e6b Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/cassandra/tools/nodetool/ForceCompactionTest.java | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2e600017ee08351fe07ecf74b24354994a00501f Merge: b8f36f0cba bd6e9a004c Author: Bereng AuthorDate: Thu Oct 5 09:26:23 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated: Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 9ccec3dc8c Test failure:
junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest
9ccec3dc8c is described below
commit 9ccec3dc8c94fe9797c2855ccfb43b47532843fd
Author: Bereng
AuthorDate: Thu Sep 14 10:55:19 2023 +0200
Test failure:
junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest
Patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova for
CASSANDRA-18707
---
.../cassandra/distributed/impl/AbstractCluster.java | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index f57f2b76e2..4d693ff856 100644
---
a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++
b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@ -674,9 +674,14 @@ public abstract class AbstractCluster
implements ICluster {
-try (SchemaChangeMonitor monitor = new SchemaChangeMonitor())
+try (SchemaChangeMonitor monitor = new
SchemaChangeMonitor(waitSchemaAgreementAmount, unit))
{
if (ignoreStoppedInstances)
monitor.ignoreStoppedInstances();
@@ -788,9 +793,17 @@ public abstract class AbstractCluster
implements ICluster
[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b5bfd1e314139ff3f271f495934a292fa0e4e195 Merge: 29c3136763 9ccec3dc8c Author: Bereng AuthorDate: Thu Oct 5 09:23:41 2023 +0200 Merge branch 'cassandra-4.0' into cassandra-4.1 * cassandra-4.0: Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated (7e65d04e9c -> bd6e9a004c)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7e65d04e9c Merge branch 'cassandra-4.1' into cassandra-5.0 new 9ccec3dc8c Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest new b5bfd1e314 Merge branch 'cassandra-4.0' into cassandra-4.1 new bd6e9a004c Merge branch 'cassandra-4.1' into cassandra-5.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bd6e9a004c96fdbb98168d39512ac6502ba0fbbf Merge: 7e65d04e9c b5bfd1e314 Author: Bereng AuthorDate: Thu Oct 5 09:24:56 2023 +0200 Merge branch 'cassandra-4.1' into cassandra-5.0 * cassandra-4.1: Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (b8f36f0cba -> 2e600017ee)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from b8f36f0cba Merge branch 'cassandra-5.0' into trunk new 9ccec3dc8c Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest new b5bfd1e314 Merge branch 'cassandra-4.0' into cassandra-4.1 new bd6e9a004c Merge branch 'cassandra-4.1' into cassandra-5.0 new 2e600017ee Merge branch 'cassandra-5.0' into trunk The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (29c3136763 -> b5bfd1e314)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 29c3136763 Merge branch 'cassandra-4.0' into cassandra-4.1 new 9ccec3dc8c Test failure: junit.framework.TestSuite.org.apache.cassandra.distributed.test.CASMultiDCTest new b5bfd1e314 Merge branch 'cassandra-4.0' into cassandra-4.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/distributed/impl/AbstractCluster.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Javadoc BigFormat
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9aa2109803 Javadoc BigFormat
9aa2109803 is described below
commit 9aa2109803a6dd53db36b058e89e7b431762ded2
Author: Bereng
AuthorDate: Thu Aug 24 11:19:57 2023 +0200
Javadoc BigFormat
patch by Berenguer Blasi; reviewed by Ling Mao, Stefan Miklosovic for
CASSANDRA-18786
---
.../cassandra/io/sstable/format/big/BigFormat.java | 97 +-
.../io/sstable/indexsummary/IndexSummary.java | 2 +
2 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
index 4de58b4b6b..d40d6a6f07 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
@@ -38,13 +38,14 @@ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
+import org.apache.cassandra.db.memtable.Flushing;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.Component;
-import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.GaugeProvider;
import org.apache.cassandra.io.sstable.IScrubber;
import org.apache.cassandra.io.sstable.MetricsProviders;
+import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.filter.BloomFilterMetrics;
import org.apache.cassandra.io.sstable.format.AbstractSSTableFormat;
import org.apache.cassandra.io.sstable.format.SSTableFormat;
@@ -66,7 +67,99 @@ import org.apache.cassandra.utils.Pair;
import static
org.apache.cassandra.io.sstable.format.SSTableFormat.Components.DATA;
/**
- * Legacy bigtable format
+ * Legacy bigtable format. Components and approximate lifecycle:
+ *
+ * {@link SSTableFormat.Components}
+ *
+ * {@link Components#ALL_COMPONENTS}
+ *
+ *
+ * {@link Components#SUMMARY}: When searching for a PK we go here for a
first approximation on where to look in the index file. It is
+ * a small sampling of the Index entries intended for a first fast
search in-memory.
+ *
+ * {@link org.apache.cassandra.io.sstable.indexsummary.IndexSummary}
+ *
+ * {@link IndexSummaryComponent}
+ *
+ *
+ *
+ * {@link Components#PRIMARY_INDEX}: We'll land here in the approximate
area where to look for the PK thanks to the Summary. Now we'll search for
+ * the exact PK to get it's exact position in the data file.
+ *
+ * {@link BigTableWriter#indexWriter}
+ *
+ * {@link RowIndexEntry}
+ *
+ * {@link org.apache.cassandra.io.sstable.IndexInfo}
+ *
+ * {@link org.apache.cassandra.io.sstable.format.IndexComponent}
+ *
+ *
+ *
+ * {@link Components#DATA}: The actual data/partitions file as an array
or partitions. Each partition has the form:
+ *
+ * A partition header
+ * Maybe a static row
+ * Rows or range tombstone
+ *
+ * I.e. upon flush {@link Flushing.FlushRunnable#writeSortedContents}
+ *
+ * Down to {@link
org.apache.cassandra.io.sstable.format.SortedTableWriter#startPartition}
+ *
+ * Down to {@link
org.apache.cassandra.io.sstable.format.SortedTablePartitionWriter#start}
+ *
+ * {@link org.apache.cassandra.io.sstable.format.DataComponent}
+ *
+ *
+ *
+ * {@link Components#STATS}: Stats on the data such as min timestamps to
later vint encode TTL, markForDeleteAt, etc
+ *
+ * {@link org.apache.cassandra.db.rows.EncodingStats}
+ *
+ * {@link org.apache.cassandra.io.sstable.format.StatsComponent}
+ *
+ *
+ *
+ * {@link Components#COMPRESSION_INFO}: Contains compresion metadata
+ *
+ * {@link org.apache.cassandra.io.compress.CompressedSequentialWriter}
+ *
+ * {@link org.apache.cassandra.io.compress.CompressionMetadata}
+ *
+ * {@link
org.apache.cassandra.io.sstable.format.CompressionInfoComponent}
+ *
+ *
+ *
+ * {@link Components#DIGEST}: The digest supporting the compression
+ *
+ * {@link org.apache.cassandra.io.compress.CompressedSequentialWriter}
+ *
+ * {@link org.apache.cassandra.io.util.ChecksumWriter}
+ *
+ *
+ *
+ * {@link Components#FILTER}: Bloom filter for data files
+ *
+ * {@link org.apache.cassandra.io.sstable.format.FilterComponent}
+ *
+ * {@link
[cassandra-dtest] branch trunk updated: Flaky upgrade_through_versions_test
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new ec3866d9 Flaky upgrade_through_versions_test
ec3866d9 is described below
commit ec3866d9aec0288b6ac479078e298a05c5df6d23
Author: Bereng
AuthorDate: Wed Sep 13 08:10:57 2023 +0200
Flaky upgrade_through_versions_test
Patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-17296
---
upgrade_tests/upgrade_through_versions_test.py | 34 +-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index 9fc35fc0..d88249f9 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -15,7 +15,7 @@ from collections import defaultdict, namedtuple
from multiprocessing import Process, Queue
from queue import Empty, Full
-from cassandra import ConsistencyLevel, WriteTimeout, DriverException
+from cassandra import ConsistencyLevel, WriteTimeout, DriverException,
OperationTimedOut
from cassandra.query import SimpleStatement
from dtest import Tester
@@ -60,6 +60,7 @@ def data_writer(tester, to_verify_queue,
verification_done_queue, rewrite_probab
signal.signal(signal.SIGTERM, handle_sigterm)
+timeout_retries = 0
while running:
try:
key = None
@@ -86,6 +87,13 @@ def data_writer(tester, to_verify_queue,
verification_done_queue, rewrite_probab
logger.error("Error in data writer process!", dex)
shutdown_gently()
raise
+except OperationTimedOut:
+if timeout_retries > 2:
+shutdown_gently()
+raise
+timeout_retries += 1
+time.sleep(1)
+continue
except Exception as ex:
logger.error("Error in data writer process!", ex)
shutdown_gently()
@@ -124,6 +132,7 @@ def data_checker(tester, to_verify_queue,
verification_done_queue):
signal.signal(signal.SIGTERM, handle_sigterm)
+timeout_retries = 0
while running:
try:
# here we could block, but if the writer process terminates early
with an empty queue
@@ -143,6 +152,13 @@ def data_checker(tester, to_verify_queue,
verification_done_queue):
logger.error("Error in data checker process!", dex)
shutdown_gently()
raise
+except OperationTimedOut:
+if timeout_retries > 2:
+shutdown_gently()
+raise
+timeout_retries += 1
+time.sleep(1)
+continue
except Exception as ex:
logger.error("Error in data checker process!", ex)
shutdown_gently()
@@ -194,6 +210,7 @@ def counter_incrementer(tester, to_verify_queue,
verification_done_queue, rewrit
signal.signal(signal.SIGTERM, handle_sigterm)
+timeout_retries = 0
while running:
try:
key = None
@@ -219,6 +236,13 @@ def counter_incrementer(tester, to_verify_queue,
verification_done_queue, rewrit
logger.error("Error in counter incrementer process!", dex)
shutdown_gently()
raise
+except OperationTimedOut:
+if timeout_retries > 2:
+shutdown_gently()
+raise
+timeout_retries += 1
+time.sleep(1)
+continue
except Exception as ex:
logger.error("Error in counter incrementer process!", ex)
shutdown_gently()
@@ -257,6 +281,7 @@ def counter_checker(tester, to_verify_queue,
verification_done_queue):
signal.signal(signal.SIGTERM, handle_sigterm)
+timeout_retries = 0
while running:
try:
# here we could block, but if the writer process terminates early
with an empty queue
@@ -275,6 +300,13 @@ def counter_checker(tester, to_verify_queue,
verification_done_queue):
logger.error("Error in counter verifier process!", dex)
shutdown_gently()
raise
+except OperationTimedOut:
+if timeout_retries > 2:
+shutdown_gently()
+raise
+timeout_retries += 1
+time.sleep(1)
+continue
except Exception as ex:
logger.error("Error in counter verifier process!", ex)
shutdown_gently()
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (c2a4caa730 -> 9f0f1f7c47)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from c2a4caa730 Merge branch 'cassandra-5.0' into trunk new 4bfca2badb IDEA to mark unused imports as error new 9f0f1f7c47 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ide/idea/inspectionProfiles/Project_Default.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9f0f1f7c4767e60edc88f3c1ef2007513728e9aa Merge: c2a4caa730 4bfca2badb Author: Bereng AuthorDate: Tue Sep 19 06:36:00 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: IDEA to mark unused imports as error ide/idea/inspectionProfiles/Project_Default.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated: IDEA to mark unused imports as error
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-5.0 by this push: new 4bfca2badb IDEA to mark unused imports as error 4bfca2badb is described below commit 4bfca2badb3284657a65d8910a4f77eaf7689b31 Author: Bereng AuthorDate: Fri Sep 15 09:24:07 2023 +0200 IDEA to mark unused imports as error patch by Berenguer Blasi; reviewed by Caleb Rackliffe, Francisco Guerrero, Jacek Lewandowski, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18853 --- ide/idea/inspectionProfiles/Project_Default.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ide/idea/inspectionProfiles/Project_Default.xml b/ide/idea/inspectionProfiles/Project_Default.xml index 2edbb703c9..d9c8f1c09c 100644 --- a/ide/idea/inspectionProfiles/Project_Default.xml +++ b/ide/idea/inspectionProfiles/Project_Default.xml @@ -129,5 +129,6 @@ + - \ No newline at end of file + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (abe09cff34 -> bd7dc322d8)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from abe09cff34 Clean up obsolete functions and simplify cql_version handling in cqlsh new 52a8d2947a Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest new bd7dc322d8 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/java/org/apache/cassandra/gms/Gossiper.java| 13 + .../operations/InsertUpdateIfConditionTest.java| 57 ++ 2 files changed, 28 insertions(+), 42 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bd7dc322d81d2d6f49fc355fbf86916c90e135d8 Merge: abe09cff34 52a8d2947a Author: Bereng AuthorDate: Mon Sep 4 09:21:06 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest src/java/org/apache/cassandra/gms/Gossiper.java| 13 + .../operations/InsertUpdateIfConditionTest.java| 57 ++ 2 files changed, 28 insertions(+), 42 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated: Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new 52a8d2947a Flaky test:
org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
52a8d2947a is described below
commit 52a8d2947a7509baec05a5b6f6c1377219e3a051
Author: Bereng
AuthorDate: Tue Aug 29 10:53:09 2023 +0200
Flaky test:
org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18393
---
src/java/org/apache/cassandra/gms/Gossiper.java| 13 +
.../operations/InsertUpdateIfConditionTest.java| 57 ++
2 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java
b/src/java/org/apache/cassandra/gms/Gossiper.java
index 5f104673d1..5f90b2f2c4 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -2484,21 +2484,12 @@ public class Gossiper implements
IFailureDetectionEventListener, GossiperMBean
* Returns {@code true} if there are nodes on version lower than the
provided version
*/
public boolean isUpgradingFromVersionLowerThan(CassandraVersion
referenceVersion)
-{
-return isUpgradingFromVersionLowerThanC17653(referenceVersion).left;
-}
-
-/* TODO: Aux method for debug purposes on fixing C17653. To be removed*/
-@VisibleForTesting
-public Pair
isUpgradingFromVersionLowerThanC17653(CassandraVersion referenceVersion)
{
CassandraVersion v = upgradeFromVersionMemoized.get();
if (CassandraVersion.NULL_VERSION.equals(v) && scheduledGossipTask ==
null)
-return Pair.create(false, v);
-
-boolean res = v != null && v.compareTo(referenceVersion) < 0;
+return false;
-return Pair.create(res, v);
+return v != null && v.compareTo(referenceVersion) < 0;
}
private boolean nodesAgreeOnSchema(Collection nodes)
diff --git
a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
index 531c1f6c02..c57f61d6eb 100644
---
a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
+++
b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
@@ -37,7 +37,6 @@ import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.SchemaKeyspaceTables;
import org.apache.cassandra.utils.CassandraVersion;
-import org.apache.cassandra.utils.Pair;
import static java.lang.String.format;
import static org.junit.Assert.assertEquals;
@@ -64,18 +63,14 @@ public class InsertUpdateIfConditionTest extends CQLTester
{
ServerTestUtils.daemonInitialization();
return Arrays.asList(new Object[]{ "3.0", (Runnable) () -> {
- Pair res =
Gossiper.instance.isUpgradingFromVersionLowerThanC17653(new
CassandraVersion("3.11"));
- assertTrue(debugMsgCASSANDRA17653(res),
res.left);
+
assertTrue(Gossiper.instance.isUpgradingFromVersionLowerThan(new
CassandraVersion("3.11")));
} },
new Object[]{ "3.11", (Runnable) () -> {
- Pair res =
Gossiper.instance.isUpgradingFromVersionLowerThanC17653(SystemKeyspace.CURRENT_VERSION);
- assertTrue(debugMsgCASSANDRA17653(res),
res.left);
- res =
Gossiper.instance.isUpgradingFromVersionLowerThanC17653(new
CassandraVersion("3.11"));
- assertFalse(debugMsgCASSANDRA17653(res),
res.left);
+
assertTrue(Gossiper.instance.isUpgradingFromVersionLowerThan(SystemKeyspace.CURRENT_VERSION));
+
assertFalse(Gossiper.instance.isUpgradingFromVersionLowerThan(new
CassandraVersion("3.11")));
} },
new Object[]{
SystemKeyspace.CURRENT_VERSION.toString(), (Runnable) () -> {
- Pair res =
Gossiper.instance.isUpgradingFromVersionLowerThanC17653(SystemKeyspace.CURRENT_VERSION);
- assertFalse(debugMsgCASSANDRA17653(res),
res.left);
+
assertFalse(Gossiper.instance.isUpgradingFromVersionLowerThan(SystemKeyspace.CURRENT_VERSION));
} });
}
@@ -93,8 +88,14 @@ p
[cassandra] branch trunk updated: Add jmh microbenchmarks to eclipse IDE
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new 77cf2185b6 Add jmh microbenchmarks to eclipse IDE 77cf2185b6 is described below commit 77cf2185b6c6261f3a6c3a2e3c8047b028190e8c Author: Bereng AuthorDate: Fri Jul 28 08:05:46 2023 +0200 Add jmh microbenchmarks to eclipse IDE patch by Berenguer Blasi; reviewed by Benjamin Lerer, Maxim Muzafarov for CASSANDRA-18702 --- build.xml | 4 ide/idea-iml-file.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/build.xml b/build.xml index bc9d6eedc5..7c9c68555f 100644 --- a/build.xml +++ b/build.xml @@ -1978,6 +1978,10 @@ + + + + diff --git a/ide/idea-iml-file.xml b/ide/idea-iml-file.xml index e6860f8e0b..01c071a728 100644 --- a/ide/idea-iml-file.xml +++ b/ide/idea-iml-file.xml @@ -35,6 +35,7 @@ + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 64f553bf971c08bcc76b5674648261b782d57623 Merge: f713a6618f 7c355c6a02 Author: Bereng AuthorDate: Thu Aug 17 10:35:33 2023 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Add CASSANDRA-14227 to 5.0 new features page doc/modules/cassandra/pages/new/index.adoc | 1 + 1 file changed, 1 insertion(+) diff --cc doc/modules/cassandra/pages/new/index.adoc index 1a6028c0af,aa82d8f9ae..fcc3d3f3f9 --- a/doc/modules/cassandra/pages/new/index.adoc +++ b/doc/modules/cassandra/pages/new/index.adoc @@@ -14,3 -14,4 +14,4 @@@ This section covers the new features i * https://issues.apache.org/jira/browse/CASSANDRA-17221[Add new Mathematical CQL functions: abs, exp, log, log10 and round] * https://issues.apache.org/jira/browse/CASSANDRA-18060[Added new CQL native scalar functions for collections] ** The new functions are mostly analogous to the existing aggregation functions, but they operate on the elements of collection columns. The new functions are `map_keys`, `map_values`, `collection_count`, `collection_min`, `collection_max`, `collection_sum` and `collection_avg`. -* https://issues.apache.org/jira/browse/CASSANDRA-14227[Extend maximum expiration date (TTL)] ++* https://issues.apache.org/jira/browse/CASSANDRA-14227[Extend maximum expiration date (TTL)] - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-5.0 updated: Add CASSANDRA-14227 to 5.0 new features page
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-5.0 by this push: new 7c355c6a02 Add CASSANDRA-14227 to 5.0 new features page 7c355c6a02 is described below commit 7c355c6a02060f2569ac43ffbb2f7cc7018790fb Author: Bereng AuthorDate: Wed Aug 16 11:32:32 2023 +0200 Add CASSANDRA-14227 to 5.0 new features page patch by Berenguer Blasi; reviewed by Michael Semb Wever for CASSANDRA-18765 --- doc/modules/cassandra/pages/new/index.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/modules/cassandra/pages/new/index.adoc b/doc/modules/cassandra/pages/new/index.adoc index 1a6028c0af..aa82d8f9ae 100644 --- a/doc/modules/cassandra/pages/new/index.adoc +++ b/doc/modules/cassandra/pages/new/index.adoc @@ -14,3 +14,4 @@ This section covers the new features in Apache Cassandra 5.0. * https://issues.apache.org/jira/browse/CASSANDRA-17221[Add new Mathematical CQL functions: abs, exp, log, log10 and round] * https://issues.apache.org/jira/browse/CASSANDRA-18060[Added new CQL native scalar functions for collections] ** The new functions are mostly analogous to the existing aggregation functions, but they operate on the elements of collection columns. The new functions are `map_keys`, `map_values`, `collection_count`, `collection_min`, `collection_max`, `collection_sum` and `collection_avg`. +* https://issues.apache.org/jira/browse/CASSANDRA-14227[Extend maximum expiration date (TTL)] - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (f713a6618f -> 64f553bf97)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from f713a6618f Merge branch 'cassandra-5.0' into trunk new 7c355c6a02 Add CASSANDRA-14227 to 5.0 new features page new 64f553bf97 Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/modules/cassandra/pages/new/index.adoc | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Ninja-fix CHANGES.txt for CASSANDRA-18648
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new a9d1712aec Ninja-fix CHANGES.txt for CASSANDRA-18648 a9d1712aec is described below commit a9d1712aec0f26bb48bb6d084dc40121a296a2e0 Author: Bereng AuthorDate: Fri Jul 28 06:59:56 2023 +0200 Ninja-fix CHANGES.txt for CASSANDRA-18648 Patch by Berenguer Blasi; reviewed by Branimir Lambov, Jacek Lewandowski, Jakub Zytka, Piotr Kolaczkowski for CASSANDRA-18648 --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 3b7d1bc9ff..683010434d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.0 + * Improved DeletionTime serialization (CASSANDRA-18648) * CEP-7: Storage Attached Indexes (CASSANDRA-16052) * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428) * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Improved DeletionTime serialization
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new 2a458ba01d Improved DeletionTime serialization 2a458ba01d is described below commit 2a458ba01dae3b35b62ad2ef361e1acb567c97f0 Author: Bereng AuthorDate: Wed Jun 14 09:41:44 2023 +0200 Improved DeletionTime serialization --- src/java/org/apache/cassandra/db/DeletionTime.java | 95 +- .../io/sstable/format/bti/PartitionIndex.java | 2 +- .../io/sstable/format/bti/RowIndexReader.java | 15 +- .../format/bti/RowIndexReverseIterator.java| 5 +- src/java/org/apache/cassandra/io/tries/Walker.java | 15 +- .../legacy_da_clust/da-1-bti-CompressionInfo.db| Bin 207 -> 207 bytes .../legacy_tables/legacy_da_clust/da-1-bti-Data.db | Bin 8660 -> 8616 bytes .../legacy_da_clust/da-1-bti-Digest.crc32 | 2 +- .../legacy_da_clust/da-1-bti-Partitions.db | Bin 62 -> 62 bytes .../legacy_tables/legacy_da_clust/da-1-bti-Rows.db | Bin 563 -> 508 bytes .../legacy_da_clust/da-1-bti-Statistics.db | Bin 7312 -> 7312 bytes .../da-1-bti-CompressionInfo.db| Bin 199 -> 199 bytes .../legacy_da_clust_counter/da-1-bti-Data.db | Bin 7767 -> 7408 bytes .../legacy_da_clust_counter/da-1-bti-Digest.crc32 | 2 +- .../legacy_da_clust_counter/da-1-bti-Partitions.db | Bin 62 -> 62 bytes .../legacy_da_clust_counter/da-1-bti-Rows.db | Bin 563 -> 508 bytes .../legacy_da_clust_counter/da-1-bti-Statistics.db | Bin 7321 -> 7321 bytes .../legacy_da_simple/da-1-bti-CompressionInfo.db | Bin 47 -> 47 bytes .../legacy_da_simple/da-1-bti-Data.db | Bin 88 -> 79 bytes .../legacy_da_simple/da-1-bti-Digest.crc32 | 2 +- .../legacy_da_simple/da-1-bti-Partitions.db| Bin 59 -> 58 bytes .../legacy_da_simple/da-1-bti-Statistics.db| Bin 4822 -> 4822 bytes .../da-1-bti-CompressionInfo.db| Bin 47 -> 47 bytes .../legacy_da_simple_counter/da-1-bti-Data.db | Bin 140 -> 133 bytes .../legacy_da_simple_counter/da-1-bti-Digest.crc32 | 2 +- .../da-1-bti-Partitions.db | Bin 60 -> 60 bytes .../da-1-bti-Statistics.db | Bin 4831 -> 4831 bytes .../legacy_oa_clust/oa-1-big-CompressionInfo.db| Bin 207 -> 207 bytes .../legacy_tables/legacy_oa_clust/oa-1-big-Data.db | Bin 8630 -> 8609 bytes .../legacy_oa_clust/oa-1-big-Digest.crc32 | 2 +- .../legacy_oa_clust/oa-1-big-Index.db | Bin 157553 -> 157498 bytes .../legacy_oa_clust/oa-1-big-Statistics.db | Bin 7312 -> 7312 bytes .../oa-1-big-CompressionInfo.db| Bin 199 -> 199 bytes .../legacy_oa_clust_counter/oa-1-big-Data.db | Bin 7718 -> 7352 bytes .../legacy_oa_clust_counter/oa-1-big-Digest.crc32 | 2 +- .../legacy_oa_clust_counter/oa-1-big-Index.db | Bin 157553 -> 157498 bytes .../legacy_oa_clust_counter/oa-1-big-Statistics.db | Bin 7321 -> 7321 bytes .../legacy_oa_simple/oa-1-big-CompressionInfo.db | Bin 47 -> 47 bytes .../legacy_oa_simple/oa-1-big-Data.db | Bin 88 -> 78 bytes .../legacy_oa_simple/oa-1-big-Digest.crc32 | 2 +- .../legacy_oa_simple/oa-1-big-Index.db | Bin 26 -> 25 bytes .../legacy_oa_simple/oa-1-big-Statistics.db| Bin 4822 -> 4822 bytes .../oa-1-big-CompressionInfo.db| Bin 47 -> 47 bytes .../legacy_oa_simple_counter/oa-1-big-Data.db | Bin 141 -> 134 bytes .../legacy_oa_simple_counter/oa-1-big-Digest.crc32 | 2 +- .../legacy_oa_simple_counter/oa-1-big-Index.db | Bin 27 -> 27 bytes .../oa-1-big-Statistics.db | Bin 4831 -> 4831 bytes .../test/microbench/DeletionTimeDeSerBench.java| 366 + .../cassandra/db/compaction/CompactionsTest.java | 8 +- .../io/sstable/format/big/RowIndexEntryTest.java | 16 +- .../cassandra/transport/DeletionTimeDeSerTest.java | 97 ++ 51 files changed, 589 insertions(+), 46 deletions(-) diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java b/src/java/org/apache/cassandra/db/DeletionTime.java index 60ac407a76..a0450a0fd1 100644 --- a/src/java/org/apache/cassandra/db/DeletionTime.java +++ b/src/java/org/apache/cassandra/db/DeletionTime.java @@ -195,42 +195,103 @@ public class DeletionTime implements Comparable, IMeasurableMemory return legacySerializer; } -// Serializer for Usigned Integer ldt +/* Serializer for Usigned Integer ldt + * + * ldt is encoded as a uint in seconds since unix epoch, it can go up o 2106-02-07T06:28:13+00:00 only. + * mfda is a positive timestamp. We use the sign bit to encode LIVE DeletionTimes + * Throw IOExc
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6f486f584737fb06f80f32844603e5c68f0a7f06 Merge: 0910901d7b 2af60dced2 Author: Bereng AuthorDate: Fri Jul 14 08:21:42 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Test failure: org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest .../cassandra/distributed/test/ByteBuddyExamplesTest.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (0910901d7b -> 6f486f5847)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 0910901d7b Merge branch 'cassandra-4.1' into trunk new 2af60dced2 Test failure: org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest new 6f486f5847 Merge branch 'cassandra-4.1' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/distributed/test/ByteBuddyExamplesTest.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated: Test failure: org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.1 by this push:
new 2af60dced2 Test failure:
org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest
2af60dced2 is described below
commit 2af60dced2e462c4c76a95a26f90f32fabef71f6
Author: Bereng
AuthorDate: Wed Jul 12 09:32:35 2023 +0200
Test failure:
org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest
---
.../cassandra/distributed/test/ByteBuddyExamplesTest.java | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java
b/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java
index aea3609c84..d6abd35788 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/ByteBuddyExamplesTest.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.distributed.test;
import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
import org.junit.Test;
@@ -28,6 +29,7 @@ import net.bytebuddy.ByteBuddy;
import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
+import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.cql3.QueryOptions;
import org.apache.cassandra.cql3.statements.ModificationStatement;
import org.apache.cassandra.cql3.statements.SelectStatement;
@@ -35,6 +37,7 @@ import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.transport.messages.ResultMessage;
+import org.apache.cassandra.transport.messages.ResultMessage.Rows;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -86,7 +89,7 @@ public class ByteBuddyExamplesTest extends TestBaseImpl
.withInstanceInitializer(BBCountHelper::install)
.start()))
{
-cluster.schemaChange("create table " + KEYSPACE + ".tbl (id int
primary key, t int)");
+cluster.schemaChange("create table " + KEYSPACE + ".tbl (id int
primary key, bytebuddy_test_column int)");
cluster.coordinator(1).execute("select * from " + KEYSPACE +
".tbl;", ConsistencyLevel.ALL);
cluster.coordinator(2).execute("select * from " + KEYSPACE +
".tbl;", ConsistencyLevel.ALL);
cluster.get(1).runOnInstance(() -> {
@@ -115,8 +118,12 @@ public class ByteBuddyExamplesTest extends TestBaseImpl
public static ResultMessage.Rows execute(QueryState state,
QueryOptions options, long queryStartNanoTime, @SuperCall
Callable r) throws Exception
{
-count.incrementAndGet();
-return r.call();
+Rows res = r.call();
+
+if
(res.result.metadata.names.stream().map(ColumnSpecification::toString).collect(Collectors.toList()).contains("bytebuddy_test_column"))
+count.incrementAndGet();
+
+return res;
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra-analytics] branch trunk updated: CASSANDRA-18600 Add NOTICE.txt file
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git The following commit(s) were added to refs/heads/trunk by this push: new cbae09c CASSANDRA-18600 Add NOTICE.txt file cbae09c is described below commit cbae09ca71b9eb9a581b77c23844da21474b095a Author: Francisco Guerrero AuthorDate: Wed Jun 14 11:52:55 2023 -0700 CASSANDRA-18600 Add NOTICE.txt file The NOTICE.txt file is currently missing in the repository. This commit adds the file to comply with ASF's guidance. patch by Francisco Guerrero; reviewed by Dinesh Joshi, Michael Semb Wever, Berenguer Blasi for CASSANDRA-18600 --- NOTICE.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 000..3dd5d8b --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,6 @@ +Apache Cassandra Analytics +Copyright 2023- The Apache Software Foundation + +This product includes software developed by The Apache Software +Foundation (http://www.apache.org/). + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated: Move checkstyle files into .build
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-4.1 by this push: new f7b952387a Move checkstyle files into .build f7b952387a is described below commit f7b952387ae17a5975de2c1da12410eac41559cc Author: Bereng AuthorDate: Wed Jun 21 08:52:05 2023 +0200 Move checkstyle files into .build patch by Berenguer Blasi; reviewed by Stefan Miklosovic for CASSANDRA-18603 --- checkstyle.xml => .build/checkstyle.xml | 0 .../checkstyle_suppressions.xml | 0 checkstyle_test.xml => .build/checkstyle_test.xml | 0 build.xml | 15 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/checkstyle.xml b/.build/checkstyle.xml similarity index 100% rename from checkstyle.xml rename to .build/checkstyle.xml diff --git a/checkstyle_suppressions.xml b/.build/checkstyle_suppressions.xml similarity index 100% rename from checkstyle_suppressions.xml rename to .build/checkstyle_suppressions.xml diff --git a/checkstyle_test.xml b/.build/checkstyle_test.xml similarity index 100% rename from checkstyle_test.xml rename to .build/checkstyle_test.xml diff --git a/build.xml b/build.xml index da21569de7..2756baecd1 100644 --- a/build.xml +++ b/build.xml @@ -40,6 +40,7 @@ + @@ -2325,8 +2326,8 @@ - - + + @@ -2341,8 +2342,8 @@ - - + + @@ -2399,7 +2400,7 @@ - - - + + + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9026f962345e62bdaffd750f2684e120dd7c7ea8 Merge: 7998e22127 f7b952387a Author: Bereng AuthorDate: Mon Jun 26 10:09:40 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Move checkstyle files into .build checkstyle.xml => .build/checkstyle.xml | 0 .../checkstyle_suppressions.xml | 0 checkstyle_test.xml => .build/checkstyle_test.xml | 0 build.xml | 17 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --cc build.xml index c58839e52a,2756baecd1..818761a30e --- a/build.xml +++ b/build.xml @@@ -37,17 -38,9 +37,18 @@@ https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> + + + + + @@@ -2101,8 -2400,7 +2102,8 @@@ - - - - + + + ++ - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (7998e22127 -> 9026f96234)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7998e22127 Enhance nodetool compactionstats with additional metrics new f7b952387a Move checkstyle files into .build new 9026f96234 Merge branch 'cassandra-4.1' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: checkstyle.xml => .build/checkstyle.xml | 0 .../checkstyle_suppressions.xml | 0 checkstyle_test.xml => .build/checkstyle_test.xml | 0 build.xml | 17 + 4 files changed, 9 insertions(+), 8 deletions(-) rename checkstyle.xml => .build/checkstyle.xml (100%) rename checkstyle_suppressions.xml => .build/checkstyle_suppressions.xml (100%) rename checkstyle_test.xml => .build/checkstyle_test.xml (100%) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 43d90928a8cc0f83bba7eede051890981a65fc72 Merge: 41a669a100 b7c00d7d13 Author: Bereng AuthorDate: Wed Jun 14 10:15:02 2023 +0200 Merge branch 'cassandra-4.1' into trunk * cassandra-4.1: Slow builds due to checkstyle checkstyle.xml | 2 ++ checkstyle_test.xml | 2 ++ 2 files changed, 4 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (41a669a100 -> 43d90928a8)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 41a669a100 Deduplicate the MixedMode* upgrade jvm-dtests new b7c00d7d13 Slow builds due to checkstyle new 43d90928a8 Merge branch 'cassandra-4.1' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: checkstyle.xml | 2 ++ checkstyle_test.xml | 2 ++ 2 files changed, 4 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated: Slow builds due to checkstyle
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cassandra-4.1 by this push: new b7c00d7d13 Slow builds due to checkstyle b7c00d7d13 is described below commit b7c00d7d1391d0cfce770da29e570adf0f528fe0 Author: Bereng AuthorDate: Tue Jun 13 13:26:54 2023 +0200 Slow builds due to checkstyle patch by Berenguer Blasi; reviewed by Maxim Muzafarov, Michael Semb Wever for CASSANDRA-18588 --- checkstyle.xml | 2 ++ checkstyle_test.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/checkstyle.xml b/checkstyle.xml index 053cc735ab..1520b0a34c 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -23,6 +23,8 @@ + + diff --git a/checkstyle_test.xml b/checkstyle_test.xml index d237827f44..96de3d548d 100644 --- a/checkstyle_test.xml +++ b/checkstyle_test.xml @@ -23,6 +23,8 @@ + + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (70389abcf7 -> dcb763ec2c)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 70389abcf7 Bti shouldn't be available in compatibility mode new c91e2714b9 Generate.sh -s param to skip autodetection of tests new 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11 new c94eb0e37b Merge branch 'cassandra-3.11' into cassandra-4.0 new 2973a7bdcd Merge branch 'cassandra-4.0' into cassandra-4.1 new dcb763ec2c Merge branch 'cassandra-4.1' into trunk The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 12 +--- .circleci/generate_11_and_17.sh | 12 +--- .circleci/readme.md | 3 +++ 3 files changed, 21 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2973a7bdcd5c0a719ea7d5abb453e010c1a2540b Merge: 2b2d9f9b72 c94eb0e37b Author: Bereng AuthorDate: Mon Jun 12 10:02:20 2023 +0200 Merge branch 'cassandra-4.0' into cassandra-4.1 * cassandra-4.0: Generate.sh -s param to skip autodetection of tests .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .circleci/generate.sh index 2046362370,1e5742d5c6..6e50dec945 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -98,8 -97,12 +102,10 @@@ while getopts "e:afpib:s" opt; d fi has_env_vars=true ;; - b ) BASE_BRANCH="$OPTARG" - ;; i ) check_env_vars=false ;; + s ) detect_changed_tests=false + ;; \?) die "Invalid option: -$OPTARG" ;; esac - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated (2393bb16f3 -> c94eb0e37b)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2393bb16f3 Merge branch 'cassandra-3.11' into cassandra-4.0 new c91e2714b9 Generate.sh -s param to skip autodetection of tests new 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11 new c94eb0e37b Merge branch 'cassandra-3.11' into cassandra-4.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.11 updated (3855c8a194 -> 7de3e61d75)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3855c8a194 Merge branch 'cassandra-3.0' into cassandra-3.11 new c91e2714b9 Generate.sh -s param to skip autodetection of tests new 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit dcb763ec2c1f9ec9807d1f84ed4dc2e075e09de1
Merge: 70389abcf7 2973a7bdcd
Author: Bereng
AuthorDate: Mon Jun 12 10:02:58 2023 +0200
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
Generate.sh -s param to skip autodetection of tests
.circleci/generate.sh | 12 +---
.circleci/generate_11_and_17.sh | 12 +---
.circleci/readme.md | 3 +++
3 files changed, 21 insertions(+), 6 deletions(-)
diff --cc .circleci/generate.sh
index 0c8f4b8223,6e50dec945..1cd8fa09ea
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -96,10 -102,10 +100,12 @@@ while getopts "e:afpib:s" opt; d
fi
has_env_vars=true
;;
+ b ) BASE_BRANCH="$OPTARG"
+ ;;
i ) check_env_vars=false
;;
+ s ) detect_changed_tests=false
+ ;;
\?) die "Invalid option: -$OPTARG"
;;
esac
diff --cc .circleci/generate_11_and_17.sh
index c9c190c4ef,00..4f17017e8d
mode 100755,00..100755
--- a/.circleci/generate_11_and_17.sh
+++ b/.circleci/generate_11_and_17.sh
@@@ -1,321 -1,0 +1,327 @@@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+BASEDIR=`dirname $0`
+BASE_BRANCH=trunk
+set -e
+
+die ()
+{
+ echo "ERROR: $*"
+ print_help
+ exit 1
+}
+
+print_help()
+{
- echo "Usage: $0 [-f|-p|-a|-e|-i|-b]"
++ echo "Usage: $0 [-f|-p|-a|-e|-i|-b|-s]"
+ echo " -a Generate the config_11_and_17.yml, config_11_and_17.yml.FREE
and config_11_and_17.yml.PAID expanded configuration"
+ echo " files from the main config_template.yml reusable configuration
file."
+ echo " Use this for permanent changes in config_11_and_17.yml that
will be committed to the main repo."
+ echo " -f Generate config.yml for tests compatible with the CircleCI free
tier resources"
+ echo " -p Generate config.yml for tests compatible with the CircleCI paid
tier resources"
+ echo " -b Specify the base git branch for comparison when determining
changed tests to"
+ echo " repeat. Defaults to ${BASE_BRANCH}. Note that this option is
not used when"
+ echo " the '-a' option is specified."
++ echo " -s Skip automatic detection of changed tests. Useful when you need
to repeat a few ones,"
++ echo " or when there are too many changed tests for CircleCI."
+ echo " -e Environment variables to be used in the generated
config_11_and_17.yml, e.g.:"
+ echo " -e DTEST_BRANCH=CASSANDRA-8272"
+ echo " -e
DTEST_REPO=https://github.com/adelapena/cassandra-dtest.git;
+ echo " -e REPEATED_TESTS_STOP_ON_FAILURE=false"
+ echo " -e
REPEATED_UTESTS=org.apache.cassandra.cql3.ViewTest#testCountersTable"
+ echo " -e REPEATED_UTESTS_COUNT=500"
+ echo " -e
REPEATED_UTESTS_FQLTOOL=org.apache.cassandra.fqltool.FQLCompareTest"
+ echo " -e REPEATED_UTESTS_FQLTOOL_COUNT=500"
+ echo " -e
REPEATED_UTESTS_LONG=org.apache.cassandra.db.commitlog.CommitLogStressTest"
+ echo " -e REPEATED_UTESTS_LONG_COUNT=100"
+ echo " -e
REPEATED_UTESTS_STRESS=org.apache.cassandra.stress.generate.DistributionGaussianTest"
+ echo " -e REPEATED_UTESTS_STRESS_COUNT=500"
+ echo " -e
REPEATED_SIMULATOR_DTESTS=org.apache.cassandra.simulator.test.TrivialSimulationTest"
+ echo " -e REPEATED_SIMULATOR_DTESTS_COUNT=500"
+ echo " -e
REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest"
+ echo " -e
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c94eb0e37b4e9d64303d7a8b7beca24270e39c05 Merge: 2393bb16f3 7de3e61d75 Author: Bereng AuthorDate: Mon Jun 12 10:01:25 2023 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Generate.sh -s param to skip autodetection of tests .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7de3e61d7533da30c7b43f2d8dac2c5b89f488cc Merge: 3855c8a194 c91e2714b9 Author: Bereng AuthorDate: Mon Jun 12 10:00:24 2023 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Generate.sh -s param to skip autodetection of tests .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .circleci/generate.sh index f6203d8255,94d46f10e0..8e3026a7e5 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -91,10 -95,10 +95,12 @@@ while getopts "e:afpib:s" opt; d fi has_env_vars=true ;; + b ) BASE_BRANCH="$OPTARG" + ;; i ) check_env_vars=false ;; + s ) detect_changed_tests=false + ;; \?) die "Invalid option: -$OPTARG" ;; esac - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (2b2d9f9b72 -> 2973a7bdcd)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2b2d9f9b72 Merge branch 'cassandra-4.0' into cassandra-4.1 new c91e2714b9 Generate.sh -s param to skip autodetection of tests new 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11 new c94eb0e37b Merge branch 'cassandra-3.11' into cassandra-4.0 new 2973a7bdcd Merge branch 'cassandra-4.0' into cassandra-4.1 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.0 updated: Generate.sh -s param to skip autodetection of tests
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new c91e2714b9 Generate.sh -s param to skip autodetection of tests
c91e2714b9 is described below
commit c91e2714b9c43f7959da1b698f2c4e28c94b9b6d
Author: Bereng
AuthorDate: Fri Jun 9 09:47:30 2023 +0200
Generate.sh -s param to skip autodetection of tests
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18553
---
.circleci/generate.sh | 12 +---
.circleci/readme.md | 3 +++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index 40bdd205db..94d46f10e0 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -30,7 +30,7 @@ die ()
print_help()
{
- echo "Usage: $0 [-f|-p|-a|-e|-i|-b]"
+ echo "Usage: $0 [-f|-p|-a|-e|-i|-b|-s]"
echo " -a Generate the config.yml, config.yml.FREE and config.yml.PAID
expanded configuration"
echo " files from the main config_template.yml reusable configuration
file."
echo " Use this for permanent changes in config that will be committed
to the main repo."
@@ -39,6 +39,8 @@ print_help()
echo " -b Specify the base git branch for comparison when determining
changed tests to"
echo " repeat. Defaults to ${BASE_BRANCH}. Note that this option is not
used when"
echo " the '-a' option is specified."
+ echo " -s Skip automatic detection of changed tests. Useful when you need
to repeat a few ones,"
+ echo " or when there are too many changed tests for CircleCI."
echo " -e Environment variables to be used in the generated
config.yml, e.g.:"
echo " -e DTEST_BRANCH=CASSANDRA-8272"
echo " -e
DTEST_REPO=https://github.com/adelapena/cassandra-dtest.git;
@@ -74,9 +76,11 @@ paid=false
env_vars=""
has_env_vars=false
check_env_vars=true
-while getopts "e:afpib:" opt; do
+detect_changed_tests=true
+while getopts "e:afpib:s" opt; do
case $opt in
a ) all=true
+ detect_changed_tests=false
;;
f ) free=true
;;
@@ -93,6 +97,8 @@ while getopts "e:afpib:" opt; do
;;
i ) check_env_vars=false
;;
+ s ) detect_changed_tests=false
+ ;;
\?) die "Invalid option: -$OPTARG"
;;
esac
@@ -173,7 +179,7 @@ elif (!($has_env_vars)); then
fi
# add new or modified tests to the sets of tests to be repeated
-if (!($all)); then
+if $detect_changed_tests; then
# Sanity check that the referenced branch exists
if ! git show ${BASE_BRANCH} -- >&/dev/null; then
echo -e "\n\nUnknown base branch: ${BASE_BRANCH}. Unable to detect changed
tests.\n"
diff --git a/.circleci/readme.md b/.circleci/readme.md
index e65be5158a..302c7f0df7 100644
--- a/.circleci/readme.md
+++ b/.circleci/readme.md
@@ -101,6 +101,9 @@ generate.sh -p \
-e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py \
-e
REPEATED_JVM_UPGRADE_DTESTS=org.apache.cassandra.distributed.upgrade.GroupByTest
```
+If you need to repeat a particular set of tests and avoid automatic detection
of changed tests
+use the -s command line option.
+
For particular Ant test targets that are not included in the regular test
suites, you can
use the `run_repeated_utest` job:
```
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated: Bti shouldn't be available in compatibility mode
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 70389abcf7 Bti shouldn't be available in compatibility mode
70389abcf7 is described below
commit 70389abcf78d913ea77b81cf226b10439f8db385
Author: Bereng
AuthorDate: Tue Jun 6 12:37:56 2023 +0200
Bti shouldn't be available in compatibility mode
Patch by Berenguer Blasi; reviewed by Andrés de la Peña for CASSANDRA-18569
---
.../cassandra/config/DatabaseDescriptor.java | 2 +
.../cassandra/utils/StorageCompatibilityMode.java | 15 +-
.../utils/StorageCompatibilityModeTest.java| 57 ++
3 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 4171bc4887..843511f3b0 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1424,6 +1424,8 @@ public class DatabaseDescriptor
if (selectedFormat == null)
throw new ConfigurationException(String.format("Selected sstable
format '%s' is not available.", selectedFormatName));
+getStorageCompatibilityMode().validateSstableFormat(selectedFormat);
+
return selectedFormat;
}
diff --git a/src/java/org/apache/cassandra/utils/StorageCompatibilityMode.java
b/src/java/org/apache/cassandra/utils/StorageCompatibilityMode.java
index 60dcc55b3f..2969597c23 100644
--- a/src/java/org/apache/cassandra/utils/StorageCompatibilityMode.java
+++ b/src/java/org/apache/cassandra/utils/StorageCompatibilityMode.java
@@ -19,6 +19,9 @@
package org.apache.cassandra.utils;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.io.sstable.format.SSTableFormat;
+import org.apache.cassandra.io.sstable.format.bti.BtiFormat;
/**
* The mode of compatibility with older Cassandra versions.
@@ -33,7 +36,7 @@ public enum StorageCompatibilityMode
CASSANDRA_4(4),
/**
- * Use the storage formats of the current version, but dissabling features
that are not compatible with any
+ * Use the storage formats of the current version, but disabling features
that are not compatible with any
* not-upgraded nodes in the cluster. Use this during rolling upgrades to
a new major Cassandra version. Once all
* nodes have been upgraded, you can set the compatibility to {@link
#NONE}.
*/
@@ -42,7 +45,7 @@ public enum StorageCompatibilityMode
/**
* Don't try to be compatible with older versions. Data will be written
with the most recent format, which might
* prevent a rollback to previous Cassandra versions. Features that are
not compatible with older nodes will be
- * enabled, asuming that all nodes in the cluster are in the same major
version as this node.
+ * enabled, assuming that all nodes in the cluster are in the same major
version as this node.
*/
NONE(Integer.MAX_VALUE);
@@ -67,4 +70,12 @@ public enum StorageCompatibilityMode
{
return this.major < major;
}
+
+public void validateSstableFormat(SSTableFormat selectedFormat)
+{
+if (selectedFormat.name().equals(BtiFormat.NAME) && this ==
StorageCompatibilityMode.CASSANDRA_4)
+throw new ConfigurationException(String.format("Selected sstable
format '%s' is not available when in storage compatibility mode '%s'.",
+
selectedFormat.name(),
+ this));
+}
}
diff --git
a/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java
b/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java
new file mode 100644
index 00..f8684edd62
--- /dev/null
+++ b/test/unit/org/apache/cassandra/utils/StorageCompatibilityModeTest.java
@@ -0,0 +1,57 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+*http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governi
[cassandra-dtest] branch trunk updated: Extend maximum expiration date
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 58820de9 Extend maximum expiration date
58820de9 is described below
commit 58820de92eef140991a3e45f68f9152ae2fbc490
Author: Bereng
AuthorDate: Mon Sep 5 07:23:04 2022 +0200
Extend maximum expiration date
patch by Berenguer Blasi; reviewed by Andrés de la Peña for CASSANDRA-14227
---
ttl_test.py| 21 +++--
upgrade_tests/upgrade_through_versions_test.py | 7 ---
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ttl_test.py b/ttl_test.py
index 96552de2..c7ee5d9a 100644
--- a/ttl_test.py
+++ b/ttl_test.py
@@ -1,5 +1,7 @@
import os
import time
+import datetime
+
import pytest
import logging
@@ -365,8 +367,11 @@ class TestTTL(Tester):
def _base_expiration_overflow_policy_test(self, default_ttl, policy):
"""
Checks that expiration date overflow policy is correctly applied
-@jira_ticket CASSANDRA-14092
+@jira_ticket CASSANDRA-14092 and CASSANDRA-14227
"""
+# Post 5.0 TTL may overflow in 2038 (legacy) or 2106 C14227
+overflow_policy_applies = "NONE" !=
self.cluster.nodelist()[0].get_conf_option("storage_compatibility_mode") \
+ or datetime.date.today().year >= 2086
MAX_TTL = 20 * 365 * 24 * 60 * 60 # 20 years in seconds
default_time_to_live = MAX_TTL if default_ttl else None
self.prepare(default_time_to_live=default_time_to_live)
@@ -384,9 +389,9 @@ class TestTTL(Tester):
try:
result = self.session1.execute_async(query + ";")
result.result()
-if policy == 'REJECT':
+if policy == 'REJECT' and overflow_policy_applies:
pytest.fail("should throw InvalidRequest")
-if self.cluster.version() >= '3.0': # client warn only on 3.0+
+if self.cluster.version() >= '3.0' and overflow_policy_applies: #
client warn only on 3.0+
if policy == 'CAP':
logger.debug("Warning is {}".format(result.warnings[0]))
assert 'exceeds maximum supported expiration' in
result.warnings[0], 'Warning not found'
@@ -399,10 +404,10 @@ class TestTTL(Tester):
self.cluster.flush()
# Data should be present unless policy is reject
-assert_row_count(self.session1, 'ttl_table', 0 if policy == 'REJECT'
else 1)
+assert_row_count(self.session1, 'ttl_table', 0 if (policy == 'REJECT'
and overflow_policy_applies) else 1)
# Check that warning is always logged, unless policy is REJECT
-if policy != 'REJECT':
+if policy != 'REJECT' and overflow_policy_applies:
node1 = self.cluster.nodelist()[0]
prefix = 'default ' if default_ttl else ''
warning = node1.grep_log("Request on table {}.{} with {}ttl of {}
seconds exceeds maximum supported expiration"
@@ -599,7 +604,11 @@ class TestRecoverNegativeExpirationDate(TestHelper):
node.watch_log_for('Loading new SSTables', timeout=10)
logger.debug("Check that there are no rows present")
-assert_row_count(session, 'ttl_table', 0)
+# CASSANDRA-14227 5.0 upwards we have long TTL that can read
overflowed rows
+if self.cluster.version() >= '5.0':
+assert_row_count(session, 'ttl_table', 1)
+else:
+assert_row_count(session, 'ttl_table', 0)
logger.debug("Shutting down node")
self.cluster.stop()
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index 183f2e87..1fc39d7c 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -432,6 +432,7 @@ class TestUpgrade(Tester):
self.upgrade_to_version(version_meta, partial=True,
nodes=(node,), internode_ssl=internode_ssl)
+logger.debug(str(self.fixture_dtest_setup.subprocs))
self._check_on_subprocs(self.fixture_dtest_setup.subprocs)
logger.debug('Successfully upgraded %d of %d nodes to %s' %
(num + 1, len(self.cluster.nodelist()),
version_meta.version))
@@ -488,7 +489,7 @@ class TestUpgrade(Tester):
if not all(subproc_statuses):
message = "A subprocess has terminated early. Subprocess statuses:
"
for s in subprocs:
-message += "{name} (is_alive: {aliveness}),
".format(name=s.name, aliveness=s.is_alive())
+message += "{name} (is
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit eef76dbbed696074d67c7119fe464240a5f2d141 Merge: 530bc10bd0 ff1ffd03da Author: Bereng AuthorDate: Mon Jan 16 07:10:25 2023 +0100 Merge branch 'cassandra-4.1' into trunk .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit de8daabab662c23ee186461601226c236b8df5e0 Merge: b8a87abba4 f384e69482 Author: Bereng AuthorDate: Mon Jan 16 07:05:25 2023 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2c03055715c874846a2970ec6ec13c2dcf8cdf8c Merge: a83de9bcd2 de8daabab6 Author: Bereng AuthorDate: Mon Jan 16 07:07:05 2023 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (5be1038c5d -> ff1ffd03da)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5be1038c5d Streaming progress virtual table lock contention can trigger TCP_USER_TIMEOUT and fail streaming new f384e69482 When generate.sh fails its rc=0 - take 2 new de8daabab6 Merge branch 'cassandra-3.0' into cassandra-3.11 new 2c03055715 Merge branch 'cassandra-3.11' into cassandra-4.0 new ff1ffd03da Merge branch 'cassandra-4.0' into cassandra-4.1 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.11 updated (b8a87abba4 -> de8daabab6)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from b8a87abba4 Do not leak 2015 synthetic memtable Epoch new f384e69482 When generate.sh fails its rc=0 - take 2 new de8daabab6 Merge branch 'cassandra-3.0' into cassandra-3.11 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ff1ffd03dac2509233f8bb857b97f1db1f6dc653 Merge: 5be1038c5d 2c03055715 Author: Bereng AuthorDate: Mon Jan 16 07:08:21 2023 +0100 Merge branch 'cassandra-4.0' into cassandra-4.1 .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.0 updated: When generate.sh fails its rc=0 - take 2
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new f384e69482 When generate.sh fails its rc=0 - take 2
f384e69482 is described below
commit f384e694825a2cd0a95debf30accb153f00e80b0
Author: Bereng
AuthorDate: Fri Jan 13 06:56:37 2023 +0100
When generate.sh fails its rc=0 - take 2
patch by Andres de la Peña and Berenguer Blasi; reviewed by Andres de la
Peña for CASSANDRA-18032
Co-authored-by: Berenguer Blasi
Co-authored-by: Andres de la Peña
---
.circleci/generate.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index ac08687556..5f0606be0c 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -190,7 +190,8 @@ if (!($all)); then
| sed -e "s/\\.java//" \
| sed -e "s,^${2},," \
| tr '/' '.' \
- | grep ${3} )
+ | grep ${3} )\
+ || : # avoid execution interruptions due to grep return codes and
set -e
for test in $tests; do
echo " $test"
has_env_vars=true
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch trunk updated (530bc10bd0 -> eef76dbbed)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 530bc10bd0 Remove ProtocolVersion entirely from the CollectionSerializer ecosystem new f384e69482 When generate.sh fails its rc=0 - take 2 new de8daabab6 Merge branch 'cassandra-3.0' into cassandra-3.11 new 2c03055715 Merge branch 'cassandra-3.11' into cassandra-4.0 new ff1ffd03da Merge branch 'cassandra-4.0' into cassandra-4.1 new eef76dbbed Merge branch 'cassandra-4.1' into trunk The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.0 updated (a83de9bcd2 -> 2c03055715)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a83de9bcd2 Merge branch 'cassandra-3.11' into cassandra-4.0 new f384e69482 When generate.sh fails its rc=0 - take 2 new de8daabab6 Merge branch 'cassandra-3.0' into cassandra-3.11 new 2c03055715 Merge branch 'cassandra-3.11' into cassandra-4.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-4.1 updated (a0c6191238 -> 438346aaa6)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a0c6191238 Merge branch 'cassandra-4.0' into cassandra-4.1 new b8a87abba4 Do not leak 2015 synthetic memtable Epoch new a83de9bcd2 Merge branch 'cassandra-3.11' into cassandra-4.0 new 438346aaa6 Merge branch 'cassandra-4.0' into cassandra-4.1 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/db/SinglePartitionReadCommand.java | 3 +- .../db/compaction/CompactionController.java| 14 +- .../cassandra/db/memtable/AbstractMemtable.java| 19 ++- .../org/apache/cassandra/db/memtable/Memtable.java | 2 + .../db/memtable/ShardedSkipListMemtable.java | 9 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 152 + 6 files changed, 192 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 995c3abc420a6e44a6725616125445a0b024da12
Merge: 1b2e49e97c 438346aaa6
Author: Bereng
AuthorDate: Thu Jan 12 08:21:36 2023 +0100
Merge branch 'cassandra-4.1' into trunk
.../cassandra/db/SinglePartitionReadCommand.java | 3 +-
.../db/compaction/CompactionController.java| 14 +-
.../cassandra/db/memtable/AbstractMemtable.java| 12 +-
.../org/apache/cassandra/db/memtable/Memtable.java | 2 +
.../db/memtable/ShardedSkipListMemtable.java | 9 +-
.../apache/cassandra/db/memtable/TrieMemtable.java | 9 +-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 151 +
7 files changed, 192 insertions(+), 8 deletions(-)
diff --cc src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
index 38249a20d6,ca6dbf6577..8e50456d6b
--- a/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
+++ b/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
@@@ -66,9 -74,16 +76,9 @@@ public abstract class AbstractMemtable
return currentOperations.get();
}
-/**
- * Returns the minTS if one available, otherwise NO_MIN_TIMESTAMP.
- *
- * EncodingStats uses a synthetic epoch TS at 2015. We don't want to leak
that (CASSANDRA-18118) so we return NO_MIN_TIMESTAMP instead.
- *
- * @return The minTS or NO_MIN_TIMESTAMP if none available
- */
public long getMinTimestamp()
{
- return minTimestamp.get();
+ return minTimestamp.get() != EncodingStats.NO_STATS.minTimestamp ?
minTimestamp.get() : NO_MIN_TIMESTAMP;
}
public int getMinLocalDeletionTime()
diff --cc src/java/org/apache/cassandra/db/memtable/TrieMemtable.java
index ae3d2e8ec3,00..ff8d765706
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java
+++ b/src/java/org/apache/cassandra/db/memtable/TrieMemtable.java
@@@ -1,722 -1,0 +1,729 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.db.memtable;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReentrantLock;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterators;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.BufferDecoratedKey;
+import org.apache.cassandra.db.Clustering;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.DataRange;
+import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.db.DeletionInfo;
+import org.apache.cassandra.db.PartitionPosition;
+import org.apache.cassandra.db.RegularAndStaticColumns;
+import org.apache.cassandra.db.Slices;
+import org.apache.cassandra.db.commitlog.CommitLogPosition;
+import org.apache.cassandra.db.filter.ClusteringIndexFilter;
+import org.apache.cassandra.db.filter.ColumnFilter;
+import org.apache.cassandra.db.partitions.AbstractUnfilteredPartitionIterator;
+import org.apache.cassandra.db.partitions.BTreePartitionData;
+import org.apache.cassandra.db.partitions.BTreePartitionUpdater;
+import org.apache.cassandra.db.partitions.ImmutableBTreePartition;
+import org.apache.cassandra.db.partitions.Partition;
+import org.apache.cassandra.db.partitions.PartitionUpdate;
+import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
+import org.apache.cassandra.db.rows.EncodingStats;
+import org.apache.cassandra.db.rows.Row;
+import org.apache.cassandra.db.rows.UnfilteredRowIterator;
+import org.apache.cassandra.db.tries.InMemoryTrie;
+import org.apache.cassandra.db.tries.Trie;
+import org.apache.cassandra.dht.AbstractBounds;
+import org.apache.cassandra.
[cassandra] branch cassandra-4.0 updated (6c65c9e49e -> a83de9bcd2)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6c65c9e49e Merge branch 'cassandra-3.11' into cassandra-4.0 new b8a87abba4 Do not leak 2015 synthetic memtable Epoch new a83de9bcd2 Merge branch 'cassandra-3.11' into cassandra-4.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/java/org/apache/cassandra/db/Memtable.java | 20 +++- .../cassandra/db/SinglePartitionReadCommand.java | 3 ++- .../db/compaction/CompactionController.java | 16 +++- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 9 + 4 files changed, 41 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] branch cassandra-3.11 updated: Do not leak 2015 synthetic memtable Epoch
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new b8a87abba4 Do not leak 2015 synthetic memtable Epoch
b8a87abba4 is described below
commit b8a87abba47441d97b3c85a0473d02919e1c071b
Author: Bereng
AuthorDate: Fri Dec 9 11:13:52 2022 +0100
Do not leak 2015 synthetic memtable Epoch
patch by Berenguer Blasi; reviewed by Caleb Rackliffe for CASSANDRA-18118
---
build.xml| 2 ++
src/java/org/apache/cassandra/db/Memtable.java | 20 +++-
.../cassandra/db/SinglePartitionReadCommand.java | 3 ++-
.../db/compaction/CompactionController.java | 16 +++-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 9 +
5 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 5e15f4923d..590e523fce 100644
--- a/build.xml
+++ b/build.xml
@@ -1227,6 +1227,8 @@
+
+
diff --git a/src/java/org/apache/cassandra/db/Memtable.java
b/src/java/org/apache/cassandra/db/Memtable.java
index ae8b8d3a74..9cfcb2f830 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -66,6 +66,7 @@ public class Memtable implements Comparable
private static final Logger logger =
LoggerFactory.getLogger(Memtable.class);
public static final MemtablePool MEMORY_POOL =
createMemtableAllocatorPool();
+public static final long NO_MIN_TIMESTAMP = -1;
private static MemtablePool createMemtableAllocatorPool()
{
@@ -161,6 +162,16 @@ public class Memtable implements Comparable
this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
}
+@VisibleForTesting
+public Memtable(CFMetaData metadata, long minTimestamp)
+{
+this.initialComparator = metadata.comparator;
+this.cfs = null;
+this.allocator = null;
+this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
+this.minTimestamp = minTimestamp;
+}
+
public MemtableAllocator getAllocator()
{
return allocator;
@@ -387,9 +398,16 @@ public class Memtable implements Comparable
return partitions.get(key);
}
+/**
+ * Returns the minTS if one available, otherwise NO_MIN_TIMESTAMP.
+ *
+ * EncodingStats uses a synthetic epoch TS at 2015. We don't want to leak
that (CASSANDRA-18118) so we return NO_MIN_TIMESTAMP instead.
+ *
+ * @return The minTS or NO_MIN_TIMESTAMP if none available
+ */
public long getMinTimestamp()
{
-return minTimestamp;
+return minTimestamp != EncodingStats.NO_STATS.minTimestamp ?
minTimestamp : NO_MIN_TIMESTAMP;
}
/**
diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index a97243be2f..dfdcc03014 100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@ -713,7 +713,8 @@ public class SinglePartitionReadCommand extends ReadCommand
if (partition == null)
continue;
-minTimestamp = Math.min(minTimestamp,
memtable.getMinTimestamp());
+if (memtable.getMinTimestamp() != Memtable.NO_MIN_TIMESTAMP)
+minTimestamp = Math.min(minTimestamp,
memtable.getMinTimestamp());
@SuppressWarnings("resource") // 'iter' is added to iterators
which is closed on exception, or through the closing of the final merged
iterator
UnfilteredRowIterator iter =
filter.getUnfilteredRowIterator(columnFilter(), partition);
diff --git
a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 84aac09052..19318ff1a9 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -207,7 +207,10 @@ public class CompactionController implements AutoCloseable
}
for (Memtable memtable :
cfStore.getTracker().getView().getAllMemtables())
-minTimestamp = Math.min(minTimestamp, memtable.getMinTimestamp());
+{
+if (memtable.getMinTimestamp() != Memtable.NO_MIN_TIMESTAMP)
+minTimestamp = Math.min(minTimestamp,
memtable.getMinTimestamp());
+}
// At this point, minTimestamp denotes the lowest timestamp of any
relevant
// SSTable or Memtable that contains a constructive value. candidates
contains all the
@@ -281,
[cassandra] branch trunk updated (1b2e49e97c -> 995c3abc42)
This is an automated email from the ASF dual-hosted git repository. bereng pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1b2e49e97c Merge branch 'cassandra-4.1' into trunk new b8a87abba4 Do not leak 2015 synthetic memtable Epoch new a83de9bcd2 Merge branch 'cassandra-3.11' into cassandra-4.0 new 438346aaa6 Merge branch 'cassandra-4.0' into cassandra-4.1 new 995c3abc42 Merge branch 'cassandra-4.1' into trunk The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cassandra/db/SinglePartitionReadCommand.java | 3 +- .../db/compaction/CompactionController.java| 14 +- .../cassandra/db/memtable/AbstractMemtable.java| 12 +- .../org/apache/cassandra/db/memtable/Memtable.java | 2 + .../db/memtable/ShardedSkipListMemtable.java | 9 +- .../apache/cassandra/db/memtable/TrieMemtable.java | 9 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 151 + 7 files changed, 192 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 438346aaa6aa8b57ae6ee31fd6ab18e6369292f3
Merge: a0c6191238 a83de9bcd2
Author: Bereng
AuthorDate: Thu Jan 12 08:19:22 2023 +0100
Merge branch 'cassandra-4.0' into cassandra-4.1
.../cassandra/db/SinglePartitionReadCommand.java | 3 +-
.../db/compaction/CompactionController.java| 14 +-
.../cassandra/db/memtable/AbstractMemtable.java| 19 ++-
.../org/apache/cassandra/db/memtable/Memtable.java | 2 +
.../db/memtable/ShardedSkipListMemtable.java | 9 +-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 152 +
6 files changed, 192 insertions(+), 7 deletions(-)
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 64136b6099,8ac26e8513..963b9fee1c
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -661,19 -605,20 +661,20 @@@ public class SinglePartitionReadComman
InputCollector inputCollector =
iteratorsForPartition(view, controller);
try
{
+SSTableReadMetricsCollector metricsCollector = new
SSTableReadMetricsCollector();
+
for (Memtable memtable : view.memtables)
{
-Partition partition = memtable.getPartition(partitionKey());
-if (partition == null)
+@SuppressWarnings("resource") // 'iter' is added to iterators
which is closed on exception, or through the closing of the final merged
iterator
+UnfilteredRowIterator iter =
memtable.rowIterator(partitionKey(), filter.getSlices(metadata()),
columnFilter(), filter.isReversed(), metricsCollector);
+if (iter == null)
continue;
- minTimestamp = Math.min(minTimestamp,
memtable.getMinTimestamp());
+ if (memtable.getMinTimestamp() != Memtable.NO_MIN_TIMESTAMP)
+ minTimestamp = Math.min(minTimestamp,
memtable.getMinTimestamp());
-@SuppressWarnings("resource") // 'iter' is added to iterators
which is closed on exception, or through the closing of the final merged
iterator
-UnfilteredRowIterator iter =
filter.getUnfilteredRowIterator(columnFilter(), partition);
-
// Memtable data is always considered unrepaired
-
controller.updateMinOldestUnrepairedTombstone(partition.stats().minLocalDeletionTime);
+
controller.updateMinOldestUnrepairedTombstone(memtable.getMinLocalDeletionTime());
inputCollector.addMemtableIterator(RTBoundValidator.validate(iter,
RTBoundValidator.Stage.MEMTABLE, false));
mostRecentPartitionTombstone =
Math.max(mostRecentPartitionTombstone,
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 26dcdd39a6,bb2094f931..0e79fc1b59
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@@ -263,10 -270,14 +266,13 @@@ public class CompactionController exten
for (Memtable memtable : memtables)
{
- if (memtable.rowIterator(key) != null)
+ if (memtable.getMinTimestamp() != Memtable.NO_MIN_TIMESTAMP)
{
- minTimestampSeen = Math.min(minTimestampSeen,
memtable.getMinTimestamp());
- hasTimestamp = true;
-Partition partition = memtable.getPartition(key);
-if (partition != null)
++if (memtable.rowIterator(key) != null)
+ {
-minTimestampSeen = Math.min(minTimestampSeen,
partition.stats().minTimestamp);
++minTimestampSeen = Math.min(minTimestampSeen,
memtable.getMinTimestamp());
+ hasTimestamp = true;
+ }
}
}
diff --cc src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
index 0ac7482e4a,00..ca6dbf6577
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
+++ b/src/java/org/apache/cassandra/db/memtable/AbstractMemtable.java
@@@ -1,221 -1,0 +1,238 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless requir
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a83de9bcd21a032c1dbc6dc323c7e53f828b2cb6
Merge: 6c65c9e49e b8a87abba4
Author: Bereng
AuthorDate: Thu Jan 12 08:17:48 2023 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
src/java/org/apache/cassandra/db/Memtable.java | 20 +++-
.../cassandra/db/SinglePartitionReadCommand.java | 3 ++-
.../db/compaction/CompactionController.java | 16 +++-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 9 +
4 files changed, 41 insertions(+), 7 deletions(-)
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 73f45f7b96,9cfcb2f830..c6eb68ea57
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -169,9 -159,19 +170,19 @@@ public class Memtable implements Compar
this.initialComparator = metadata.comparator;
this.cfs = null;
this.allocator = null;
-this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
+this.columnsCollector = new
ColumnsCollector(metadata.regularAndStaticColumns());
}
+ @VisibleForTesting
-public Memtable(CFMetaData metadata, long minTimestamp)
++public Memtable(TableMetadata metadata, long minTimestamp)
+ {
+ this.initialComparator = metadata.comparator;
+ this.cfs = null;
+ this.allocator = null;
-this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
++this.columnsCollector = new
ColumnsCollector(metadata.regularAndStaticColumns());
+ this.minTimestamp = minTimestamp;
+ }
+
public MemtableAllocator getAllocator()
{
return allocator;
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 266b37d86a,8e8e9c94b7..b1c6599b5b
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@@ -91,6 -96,17 +91,15 @@@ public class ColumnFamilyStoreTes
Keyspace.open(KEYSPACE2).getColumnFamilyStore(CF_STANDARD1).truncateBlocking();
}
+ @Test
+ public void testMemtableTimestamp() throws Throwable
+ {
+ assertEquals(Memtable.NO_MIN_TIMESTAMP,
- (new
Memtable(Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata,
++ (new
Memtable(Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata(),
+EncodingStats.NO_STATS.minTimestamp))
+ .getMinTimestamp());
+ }
+
@Test
// create two sstables, and verify that we only deserialize data from the
most recent one
public void testTimeSortedQuery()
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
