This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 50a97a0d766cf4949580ccf5c98f3697482ba93c
Merge: 7a6a709 53b0661
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon Apr 19 17:27:59 2021 +0200
Merge branch 'cassandra-2.2' into cassandra-3.0
.build/build-rat.xml | 94 ++++++++++++++++++++++
.circleci/config-2_1.yml | 18 +++++
.circleci/config.yml | 18 +++++
.circleci/generate.sh | 17 ++++
.circleci/readme.md | 20 +++++
.gitignore | 9 ++-
.rat-excludes | 33 --------
CONTRIBUTING.md | 20 +++++
build.xml | 90 +--------------------
debian/cassandra.in.sh | 17 ++++
doc/cql3/CQL.textile | 20 +++++
doc/native_protocol_v3.spec | 17 ++++
doc/native_protocol_v4.spec | 17 ++++
pylib/cqlshlib/test/test_keyspace_init.cql | 18 +++++
redhat/README.md | 20 +++++
redhat/cassandra.in.sh | 17 ++++
redhat/cassandra.spec | 18 +++++
test/conf/commitlog_compression.yaml | 18 +++++
test/data/bloom-filter/ka/foo.cql | 18 +++++
test/resources/byteman/stream_failure.btm | 17 ++++
.../org/apache/cassandra/stress/WorkManager.java | 17 ++++
21 files changed, 411 insertions(+), 122 deletions(-)
diff --cc .circleci/config.yml
index 43e0f34,acfd6c9..d5fc879
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -1,100 -1,26 +1,118 @@@
+ #
+ # 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.
+ #
+
version: 2
jobs:
+ j8_jvm_upgrade_dtests:
+ docker:
+ - image:
apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 1
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Determine distributed Tests to Run
+ command: |
+ # reminder: this code (along with all the steps) is independently
executed on every circle container
+ # so the goal here is to get the circleci script to return the
tests *this* container will run
+ # which we do via the `circleci` cli tool.
+
+ rm -fr ~/cassandra-dtest/upgrade_tests
+ echo "***java tests***"
+
+ # get all of our unit test filenames
+ set -eo pipefail && circleci tests glob
"$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+
+ # split up the unit tests into groups based on the number of
containers we have
+ set -eo pipefail && circleci tests split --split-by=timings
--timings-type=filename --index=${CIRCLE_NODE_INDEX}
--total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt >
/tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
+ set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt |
sed "s;^/home/cassandra/cassandra/test/distributed/;;g" | grep "Test\.java$" |
grep upgrade > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
+ echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
+ cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
+ no_output_timeout: 15m
+ - run:
+ name: Log Environment Information
+ command: |
+ echo '*** id ***'
+ id
+ echo '*** cat /proc/cpuinfo ***'
+ cat /proc/cpuinfo
+ echo '*** free -m ***'
+ free -m
+ echo '*** df -m ***'
+ df -m
+ echo '*** ifconfig -a ***'
+ ifconfig -a
+ echo '*** uname -a ***'
+ uname -a
+ echo '*** mount ***'
+ mount
+ echo '*** env ***'
+ env
+ echo '*** java ***'
+ which java
+ java -version
+ - run:
+ name: Run Unit Tests (testclasslist)
+ command: |
+ set -x
+ export PATH=$JAVA_HOME/bin:$PATH
+ time mv ~/cassandra /tmp
+ cd /tmp/cassandra
+ if [ -d ~/dtest_jars ]; then
+ cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+ fi
+ test_timeout=$(grep 'name="test.distributed.timeout"' build.xml |
awk -F'"' '{print $4}' || true)
+ if [ -z "$test_timeout" ]; then
+ test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
+ fi
+ ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ no_output_timeout: 15m
+ - store_test_results:
+ path: /tmp/cassandra/build/test/output/
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/output
+ destination: junitxml
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/logs
+ destination: logs
+ environment:
+ - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: trunk
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
build:
docker:
- - image:
apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+ - image:
apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
diff --cc build.xml
index c6603a0,52ba87f..a50e9af
--- a/build.xml
+++ b/build.xml
@@@ -1633,42 -1628,41 +1582,6 @@@
<delete dir="${jacoco.export.dir}"/>
</target>
- <!--
- License audit tool
- -->
- <target name="rat-init" depends="maven-ant-tasks-init">
- <artifact:dependencies pathId="rat.classpath">
- <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks"
version="0.6" />
- <remoteRepository refid="central"/>
- <remoteRepository refid="apache"/>
- </artifact:dependencies>
- <typedef uri="antlib:org.apache.rat.anttasks"
classpathref="rat.classpath"/>
- </target>
- <!-- instruments the classes to later create code coverage reports -->
- <target name="cobertura-instrument" depends="build,build-test">
- <taskdef resource="tasks.properties">
- <classpath refid="cobertura.classpath"/>
- <classpath refid="cassandra.classpath"/>
- </taskdef>
--
- <target name="rat-check" depends="rat-init">
- <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
- reportFile="${build.dir}/rat-report.log">
- <fileset dir="." excludesfile=".rat-excludes" />
- </rat:report>
- <condition property="rat.passed">
- <isfileselected file="${build.dir}/rat-report.log">
- <containsregexp expression="^0 Unknown Licenses"/>
- </isfileselected>
- </condition>
- <fail unless="rat.passed">Unknown licenses: See
build/rat-report.log.</fail>
- <delete file="${cobertura.datafile}"/>
-
- <cobertura-instrument todir="${cobertura.classes.dir}"
datafile="${cobertura.datafile}">
- <ignore regex="ch.qos.logback.*"/>
-
- <fileset dir="${build.classes.main}">
- <include name="**/*.class"/>
- <exclude name="**/*Test.class"/>
- <exclude name="**/*TestCase.class"/>
- <exclude name="**/test/*.class"/>
- <!-- cobertura modifies the serialVersionUID of classes. Some of our
unit tests rely on backward
- wire compatability of these classes. It was easier to exlude them
from instrumentation than to
- force their serialVersionUIDs. -->
- <exclude name="**/*Token.class"/>
- <exclude name="${cobertura.excludes}"/>
- </fileset>
-
- </cobertura-instrument>
-- </target>
--
- <target name="rat-write" depends="rat-init">
- <echo>RAT: invoking addLicense to write missing headers</echo>
- <java classname="org.apache.rat.Report" fork="true"
- output="${build.dir}/rat-report.log">
- <classpath refid="rat.classpath" />
- <arg value="-a" />
- <arg value="--force" />
- <arg value="." />
- </java>
- <!-- create both html and xml code coverage reports -->
- <target name="cobertura-report">
- <cobertura-report format="html" destdir="${cobertura.report.dir}"
srcdir="${build.src.java}"
- datafile="${cobertura.datafile}"/>
- <cobertura-report format="xml" destdir="${cobertura.report.dir}"
srcdir="${build.src.java}"
- datafile="${cobertura.datafile}"/>
-- </target>
--
<target name="javadoc" depends="init" description="Create javadoc"
unless="no-javadoc">
<create-javadoc destdir="${javadoc.dir}">
<filesets>
diff --cc doc/cql3/CQL.textile
index 6a05c4f,b689532..de25edb
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1,6 -1,26 +1,26 @@@
+ <!--
+ #
+ # 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.
+ #
+ -->
+
<link rel="StyleSheet" href="CQL.css" type="text/css" media="screen">
-h1. Cassandra Query Language (CQL) v3.3.1
+h1. Cassandra Query Language (CQL) v3.4.0
diff --cc test/data/bloom-filter/ka/foo.cql
index c4aed6a,0000000..1a3ad26
mode 100644,000000..100644
--- a/test/data/bloom-filter/ka/foo.cql
+++ b/test/data/bloom-filter/ka/foo.cql
@@@ -1,64 -1,0 +1,82 @@@
++/*
++# 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.
++*/
++
+create keyspace foo with replication = {'class':'SimpleStrategy',
'replication_factor':1};
+use foo ;
+create table atable ( pk int primary key, val int);
+insert into atable (pk, val) VALUES ( 1,1);
+insert into atable (pk, val) VALUES ( 2,2);
+insert into atable (pk, val) VALUES ( 3,3);
+insert into atable (pk, val) VALUES ( 4,4);
+insert into atable (pk, val) VALUES ( 5,5);
+insert into atable (pk, val) VALUES ( 6,6);
+insert into atable (pk, val) VALUES ( 7,7);
+insert into atable (pk, val) VALUES ( 8,8);
+insert into atable (pk, val) VALUES ( 9,9);
+insert into atable (pk, val) VALUES ( 10,10);
+
+
+
+[
+{"key": "5",
+ "cells": [["","",1428529571195019],
+ ["val","5",1428529571195019]]},
+{"key": "10",
+ "cells": [["","",1428529588242944],
+ ["val","10",1428529588242944]]},
+{"key": "1",
+ "cells": [["","",1428529563371015],
+ ["val","1",1428529563371015]]},
+{"key": "8",
+ "cells": [["","",1428529582362836],
+ ["val","8",1428529582362836]]},
+{"key": "2",
+ "cells": [["","",1428529565275080],
+ ["val","2",1428529565275080]]},
+{"key": "4",
+ "cells": [["","",1428529569331171],
+ ["val","4",1428529569331171]]},
+{"key": "7",
+ "cells": [["","",1428529575898967],
+ ["val","7",1428529575898967]]},
+{"key": "6",
+ "cells": [["","",1428529573027018],
+ ["val","6",1428529573027018]]},
+{"key": "9",
+ "cells": [["","",1428529585667042],
+ ["val","9",1428529585667042]]},
+{"key": "3",
+ "cells": [["","",1428529567379095],
+ ["val","3",1428529567379095]]}
+]
+
+
+
+SSTable: test/data/legacy-sstables/ka/foo/foo-atable-ka-1
+Partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+Bloom Filter FP chance: 0,010000
+Minimum timestamp: 1428529563371015
+Maximum timestamp: 1428529588242944
+SSTable max local deletion time: 2147483647
+Compression ratio: 0.4
+Estimated droppable tombstones: 0.0
+SSTable Level: 0
+Repaired at: 0
+ReplayPosition(segmentId=1428529465658, position=6481)
+Estimated tombstone drop times:%n
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
