You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2023/08/14 12:28:16 UTC
[cassandra] branch trunk updated (9f2005cd57 -> d3a7387836)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 9f2005cd57 Merge branch 'cassandra-5.0' into trunk
new 89fe2223b4 Update trunk to version 5.1
new d3a7387836 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:
.build/run-tests.sh | 26 +++++++++++++++++-----
.circleci/config.yml | 2 +-
.circleci/config.yml.FREE | 2 +-
.circleci/config.yml.PAID | 2 +-
.circleci/config_template.yml | 2 +-
NEWS.txt | 13 +++++++++++
build.xml | 2 +-
debian/changelog | 2 +-
.../CompactionHistorySystemTableUpgradeTest.java | 24 ++++----------------
.../upgrade/MixedModeTTLOverflowUpgradeTest.java | 4 +++-
.../upgrade/MixedModeWritetimeOrTTLTest.java | 4 +++-
.../distributed/upgrade/UpgradeTestBase.java | 4 ++++
12 files changed, 53 insertions(+), 34 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d3a7387836ff16127647a470ce37b88518f604d7
Merge: 9f2005cd57 89fe2223b4
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Mon Aug 14 14:25:26 2023 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Update trunk to version 5.1
.build/run-tests.sh | 26 +++++++++++++++++-----
.circleci/config.yml | 2 +-
.circleci/config.yml.FREE | 2 +-
.circleci/config.yml.PAID | 2 +-
.circleci/config_template.yml | 2 +-
NEWS.txt | 13 +++++++++++
build.xml | 2 +-
debian/changelog | 2 +-
.../CompactionHistorySystemTableUpgradeTest.java | 24 ++++----------------
.../upgrade/MixedModeTTLOverflowUpgradeTest.java | 4 +++-
.../upgrade/MixedModeWritetimeOrTTLTest.java | 4 +++-
.../distributed/upgrade/UpgradeTestBase.java | 4 ++++
12 files changed, 53 insertions(+), 34 deletions(-)
diff --cc .build/run-tests.sh
index fd6a7da21d,4a0cecfa33..53dfb32867
--- a/.build/run-tests.sh
+++ b/.build/run-tests.sh
@@@ -74,16 -74,30 +74,31 @@@ _timeout_for()
}
_build_all_dtest_jars() {
- pushd $TMP_DIR >/dev/null
- rm -fR ${TMP_DIR}/cassandra-dtest-jars
- until git clone --quiet --depth 1 --no-single-branch https://github.com/apache/cassandra.git cassandra-dtest-jars ; do echo "git clone failed… trying again… " ; done
++
+ # build the dtest-jar for the branch under test. remember to `ant clean` if you want a new dtest jar built
+ dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
+ if [ -f "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ] ; then
+ echo "Skipping dtest jar build for branch under test as ${DIST_DIR}/dtest-${dtest_jar_version}.jar already exists"
+ else
+ ant jar dtest-jar ${ANT_TEST_OPTS} -Dbuild.dir=${TMP_DIR}/cassandra-dtest-jars/build
+ cp "${TMP_DIR}/cassandra-dtest-jars/build/dtest-${dtest_jar_version}.jar" ${DIST_DIR}/
+ fi
+
+ if [ -d ${TMP_DIR}/cassandra-dtest-jars ] && [ "https://github.com/apache/cassandra.git" == "$(git -C ${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then
+ until git -C ${TMP_DIR}/cassandra-dtest-jars fetch --quiet origin ; do echo "git pull failed… trying again… " ; done
+ else
+ rm -fR ${TMP_DIR}/cassandra-dtest-jars
+ pushd $TMP_DIR >/dev/null
+ until git clone --quiet --depth 1 --no-single-branch https://github.com/apache/cassandra.git cassandra-dtest-jars ; do echo "git clone failed… trying again… " ; done
+ popd >/dev/null
+ fi
# cassandra-4 branches need CASSANDRA_USE_JDK11 to allow jdk11
[ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true
pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
- for branch in cassandra-4.0 cassandra-4.1 trunk ; do
- git checkout $branch
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
++ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
+ git checkout --quiet $branch
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
if [ -f "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ] ; then
echo "Skipping dtest jar build for branch ${branch} as ${DIST_DIR}/dtest-${dtest_jar_version}.jar already exists"
diff --cc .circleci/config.yml
index 0c247fbc85,2b3e22fa07..52c4b590ee
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -5070,7 -5070,7 +5070,7 @@@ jobs
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
- for branch in cassandra-4.0 cassandra-4.1 trunk; do
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
++ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
diff --cc .circleci/config.yml.FREE
index 0c247fbc85,2b3e22fa07..52c4b590ee
--- a/.circleci/config.yml.FREE
+++ b/.circleci/config.yml.FREE
@@@ -5070,7 -5070,7 +5070,7 @@@ jobs
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
- for branch in cassandra-4.0 cassandra-4.1 trunk; do
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
++ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
diff --cc .circleci/config.yml.PAID
index 8e8e89c95c,f1140ae605..94519e1353
--- a/.circleci/config.yml.PAID
+++ b/.circleci/config.yml.PAID
@@@ -5070,7 -5070,7 +5070,7 @@@ jobs
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
- for branch in cassandra-4.0 cassandra-4.1 trunk; do
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
++ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
diff --cc .circleci/config_template.yml
index b8ed8cbbcb,b4e638b3d4..92e91daa34
--- a/.circleci/config_template.yml
+++ b/.circleci/config_template.yml
@@@ -2901,7 -2901,7 +2901,7 @@@ commands
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
- for branch in cassandra-4.0 cassandra-4.1 trunk; do
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
++ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
diff --cc NEWS.txt
index 6e986522a7,6e986522a7..b642685f79
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -66,6 -66,6 +66,19 @@@ restore snapshots created with the prev
using the provided 'sstableupgrade' tool.
++5.1
++===
++
++New features
++------------
++
++Upgrading
++---------
++
++Deprecation
++-----------
++
++
5.0
===
diff --cc build.xml
index 7c7efc0a5d,243667d451..b36ce1b5c8
--- a/build.xml
+++ b/build.xml
@@@ -32,7 -32,7 +32,7 @@@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="5.0"/>
- <property name="base.version" value="5.0-alpha1"/>
++ <property name="base.version" value="5.1"/>
<property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --cc debian/changelog
index cdb1af9772,cdb1af9772..4a2fc47012
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--cassandra (5.0) UNRELEASED; urgency=medium
++cassandra (5.1) UNRELEASED; urgency=medium
* New release
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java
index 73e92dd423,73e92dd423..a7b23ce5ce
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactionHistorySystemTableUpgradeTest.java
@@@ -19,36 -19,36 +19,18 @@@
package org.apache.cassandra.distributed.upgrade;
import com.google.common.collect.ImmutableMap;
--import com.google.common.collect.Lists;
++import org.junit.Test;
--import com.vdurmont.semver4j.Semver;
import org.apache.cassandra.db.compaction.OperationType;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.tools.ToolRunner;
--import org.junit.Test;
--import org.junit.runner.RunWith;
--import org.junit.runners.Parameterized;
--import org.junit.runners.Parameterized.Parameter;
--import org.junit.runners.Parameterized.Parameters;
--
--import java.util.ArrayList;
--
import static org.apache.cassandra.db.compaction.CompactionHistoryTabularData.COMPACTION_TYPE_PROPERTY;
import static org.apache.cassandra.tools.ToolRunner.invokeNodetoolJvmDtest;
import static org.apache.cassandra.tools.nodetool.CompactionHistoryTest.assertCompactionHistoryOutPut;
--@RunWith(Parameterized.class)
public class CompactionHistorySystemTableUpgradeTest extends UpgradeTestBase
{
-- @Parameter
-- public Semver version;
--
-- @Parameters()
-- public static ArrayList<Semver> versions()
-- {
-- return Lists.newArrayList(v30, v3X, v40, v41);
-- }
@Test
public void compactionHistorySystemTableTest() throws Throwable
@@@ -56,7 -56,7 +38,9 @@@
new TestCase()
.nodes(1)
.nodesToUpgrade(1)
-- .upgradesToCurrentFrom(version)
++ // all upgrades from v40 to current, excluding v50 -> v51
++ .singleUpgradeToCurrentFrom(v40)
++ .singleUpgradeToCurrentFrom(v41)
.setup((cluster) -> {
//create table
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tb (" +
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTest.java
index 49ad956e07,49ad956e07..fed751e26e
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTest.java
@@@ -119,7 -119,7 +119,9 @@@ public class MixedModeTTLOverflowUpgrad
new TestCase()
.nodes(2)
.nodesToUpgradeOrdered(1, 2)
-- .upgradesToCurrentFrom(v40)
++ // all upgrades from v40 to current, excluding v50 -> v51
++ .singleUpgradeToCurrentFrom(v40)
++ .singleUpgradeToCurrentFrom(v41)
.setup(cluster -> {
cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (k int PRIMARY KEY, v int)"));
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java
index 295ffd2987,295ffd2987..4c559c2eef
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeWritetimeOrTTLTest.java
@@@ -45,7 -45,7 +45,9 @@@ public class MixedModeWritetimeOrTTLTes
new TestCase()
.nodes(2)
.nodesToUpgradeOrdered(1, 2)
-- .upgradesToCurrentFrom(v30)
++ // all upgrades from v40 to current, excluding v50 -> v51
++ .singleUpgradeToCurrentFrom(v40)
++ .singleUpgradeToCurrentFrom(v41)
.setup(cluster -> {
ICoordinator coordinator = cluster.coordinator(1);
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
index 3f8f4d47c8,3f8f4d47c8..5ee8780204
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
@@@ -92,6 -92,6 +92,7 @@@ public class UpgradeTestBase extends Di
public static final Semver v40 = new Semver("4.0-alpha1", SemverType.LOOSE);
public static final Semver v41 = new Semver("4.1-alpha1", SemverType.LOOSE);
public static final Semver v50 = new Semver("5.0-alpha1", SemverType.LOOSE);
++ public static final Semver v51 = new Semver("5.1-alpha1", SemverType.LOOSE);
protected static final SimpleGraph<Semver> SUPPORTED_UPGRADE_PATHS = new SimpleGraph.Builder<Semver>()
.addEdge(v30, v3X)
@@@ -101,7 -101,7 +102,10 @@@
.addEdge(v3X, v41)
.addEdge(v40, v41)
.addEdge(v40, v50)
++ .addEdge(v40, v51)
.addEdge(v41, v50)
++ .addEdge(v41, v51)
++ .addEdge(v50, v51)
.build();
// the last is always the current
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org