diff --git a/CHANGES.txt b/CHANGES.txt index 7699940bb5..cb51088c7a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0-beta5 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392) * Release StreamingTombstoneHistogramBuilder spool when switching writers (CASSANDRA-14834) * Correct memtable on-heap size calculations to match actual use (CASSANDRA-16318) * Fix client notifications in CQL protocol v5 (CASSANDRA-16353) diff --git a/build.xml b/build.xml index d818f44d99..4f636f1022 100644 --- a/build.xml +++ b/build.xml @@ -125,11 +125,11 @@ - - - - - + + + + + @@ -631,9 +631,9 @@ - - - + + + diff --git a/doc/source/new/auditlogging.rst b/doc/source/new/auditlogging.rst index 0842810823..9938fdb937 100644 --- a/doc/source/new/auditlogging.rst +++ b/doc/source/new/auditlogging.rst @@ -395,7 +395,7 @@ List the files/directories and some ``.cq4`` files should get listed. These are total 28 -rw-rw-r--. 1 ec2-user ec2-user 83886080 Aug 2 03:01 20190802-02.cq4 -rw-rw-r--. 1 ec2-user ec2-user 83886080 Aug 2 03:01 20190802-03.cq4 - -rw-rw-r--. 1 ec2-user ec2-user 65536 Aug 2 03:01 directory-listing.cq4t + -rw-rw-r--. 1 ec2-user ec2-user 65536 Aug 2 03:01 metadata.cq4t The ``auditlogviewer`` tool is used to dump audit logs. Run the ``auditlogviewer`` tool. Audit log files directory path is a required argument. The output should be similar to the following output. diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml index 23427ee5b3..9daa299161 100644 --- a/ide/nbproject/project.xml +++ b/ide/nbproject/project.xml @@ -7,7 +7,7 @@ .. - ${project.dir}/lib/HdrHistogram-2.1.9.jar:${project.dir}/lib/ST4-4.0.8.jar:${project.dir}/lib/airline-0.8.jar:${project.dir}/lib/antlr-runtime-3.5.2.jar:${project.dir}/lib/asm-7.1.jar:${project.dir}/lib/caffeine-2.3.5.jar:${project.dir}/lib/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/lib/chronicle-bytes-1.16.3.jar:${project.dir}/lib/chronicle-core-1.16.4.jar:${project.dir}/lib/chronicle-queue-4.16.3.jar:${project.dir}/lib/chronicle-threads-1.16.0.jar:${project.dir}/lib/chronicle-wire-1.16.1.jar:${project.dir}/lib/commons-cli-1.1.jar:${project.dir}/lib/commons-codec-1.9.jar:${project.dir}/lib/commons-lang3-3.11.jar:${project.dir}/lib/commons-math3-3.2.jar:${project.dir}/lib/concurrent-trees-2.4.0.jar:${project.dir}/lib/ecj-4.6.1.jar:${project.dir}/lib/guava-27.0-jre.jar:${project.dir}/lib/high-scale-lib-1.0.6.jar:${project.dir}/lib/hppc-0.8.1.jar:${project.dir}/lib/j2objc-annotations-1.3.jar:${project.dir}/lib/jackson-annotations-2.9.10.jar:${project.dir}/lib/jackson-core-2.9.10.jar:${project.dir}/lib/jackson-databind-2.9.10.4.jar:${project.dir}/lib/jamm-0.3.2.jar:${project.dir}/lib/javax.inject.jar:${project.dir}/lib/jbcrypt-0.3m.jar:${project.dir}/lib/jcl-over-slf4j-1.7.25.jar:${project.dir}/lib/jcommander-1.30.jar:${project.dir}/lib/jctools-core-3.1.0.jar:${project.dir}/lib/jflex-1.6.0.jar:${project.dir}/lib/jna-5.6.0.jar:${project.dir}/lib/json-simple-1.1.jar:${project.dir}/lib/jstackjunit-0.0.1.jar:${project.dir}/lib/jvm-attach-api-1.5.jar:${project.dir}/lib/log4j-over-slf4j-1.7.25.jar:${project.dir}/lib/logback-classic-1.2.3.jar:${project.dir}/lib/logback-core-1.2.3.jar:${project.dir}/lib/lz4-java-1.7.1.jar:${project.dir}/lib/metrics-core-3.1.5.jar:${project.dir}/lib/metrics-jvm-3.1.5.jar:${project.dir}/lib/metrics-logback-3.1.5.jar:${project.dir}/lib/mxdump-0.14.jar:${project.dir}/lib/netty-all-4.1.54.Final.jar:${project.dir}/lib/netty-tcnative-boringssl-static-2.0.34.Final.jar:${project.dir}/lib/ohc-core-0.5.1.jar:${project.dir}/lib/ohc-core-j8-0.5.1.jar:${project.dir}/lib/psjava-0.1.19.jar:${project.dir}/lib/reporter-config-base-3.0.3.jar:${project.dir}/lib/reporter-config3-3.0.3.jar:${project.dir}/lib/sigar-1.6.4.jar:${project.dir}/lib/sjk-cli-0.14.jar:${project.dir}/lib/sjk-core-0.14.jar:${project.dir}/lib/sjk-json-0.14.jar:${project.dir}/lib/sjk-stacktrace-0.14.jar:${project.dir}/lib/slf4j-api-1.7.25.jar:${project.dir}/lib/snakeyaml-1.26.jar:${project.dir}/lib/snappy-java-1.1.2.6.jar:${project.dir}/lib/snowball-stemmer-1.3.0.581.1.jar:${project.dir}/lib/stream-2.5.2.jar:${project.dir}/lib/zstd-jni-1.3.8-5.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/animal-sniffer-annotations-1.14.jar:${project.dir}/build/lib/jars/ant-1.9.7.jar:${project.dir}/build/lib/jars/ant-junit-1.9.7.jar:${project.dir}/build/lib/jars/ant-launcher-1.9.7.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/apache-rat-0.10.jar:${project.dir}/build/lib/jars/apache-rat-core-0.10.jar:${project.dir}/build/lib/jars/apache-rat-tasks-0.10.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/awaitility-4.0.3.jar:${project.dir}/build/lib/jars/byte-buddy-1.10.5.jar:${project.dir}/build/lib/jars/byte-buddy-agent-1.10.5.jar:${project.dir}/build/lib/jars/byteman-4.0.6.jar:${project.dir}/build/lib/jars/byteman-bmunit-4.0.6.jar:${project.dir}/build/lib/jars/byteman-install-4.0.6.jar:${project.dir}/build/lib/jars/byteman-submit-4.0.6.jar:${project.dir}/build/lib/jars/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/build/lib/jars/checker-qual-2.0.0.jar:${project.dir}/build/lib/jars/commons-beanutils-1.7.0.jar:${project.dir}/build/lib/jars/commons-beanutils-core-1.8.0.jar:${project.dir}/build/lib/jars/commons-cli-1.2.jar:${project.dir}/build/lib/jars/commons-codec-1.4.jar:${project.dir}/build/lib/jars/commons-collections-3.2.1.jar:${project.dir}/build/lib/jars/commons-compress-1.5.jar:${project.dir}/build/lib/jars/commons-configuration-1.6.jar:${project.dir}/build/lib/jars/commons-digester-1.8.jar:${project.dir}/build/lib/jars/commons-el-1.0.jar:${project.dir}/build/lib/jars/commons-httpclient-3.0.1.jar:${project.dir}/build/lib/jars/commons-io-2.2.jar:${project.dir}/build/lib/jars/commons-lang-2.4.jar:${project.dir}/build/lib/jars/commons-math-2.1.jar:${project.dir}/build/lib/jars/commons-math3-3.2.jar:${project.dir}/build/lib/jars/commons-net-1.4.1.jar:${project.dir}/build/lib/jars/compile-command-annotations-1.2.0.jar:${project.dir}/build/lib/jars/dtest-api-0.0.6.jar:${project.dir}/build/lib/jars/ecj-4.6.1.jar:${project.dir}/build/lib/jars/error_prone_annotations-2.0.18.jar:${project.dir}/build/lib/jars/ftplet-api-1.0.0.jar:${project.dir}/build/lib/jars/ftpserver-core-1.0.0.jar:${project.dir}/build/lib/jars/ftpserver-deprecated-1.0.0-M2.jar:${project.dir}/build/lib/jars/guava-23.5-android.jar:${project.dir}/build/lib/jars/hadoop-core-1.0.3.jar:${project.dir}/build/lib/jars/hadoop-minicluster-1.0.3.jar:${project.dir}/build/lib/jars/hadoop-test-1.0.3.jar:${project.dir}/build/lib/jars/hamcrest-2.1.jar:${project.dir}/build/lib/jars/hamcrest-core-1.3.jar:${project.dir}/build/lib/jars/hsqldb-1.8.0.10.jar:${project.dir}/build/lib/jars/j2objc-annotations-1.1.jar:${project.dir}/build/lib/jars/jackson-annotations-2.7.0.jar:${project.dir}/build/lib/jars/jackson-core-2.7.9.jar:${project.dir}/build/lib/jars/jackson-core-asl-1.0.1.jar:${project.dir}/build/lib/jars/jackson-databind-2.7.9.3.jar:${project.dir}/build/lib/jars/jackson-mapper-asl-1.0.1.jar:${project.dir}/build/lib/jars/jacocoagent.jar:${project.dir}/build/lib/jars/jasper-compiler-5.5.12.jar:${project.dir}/build/lib/jars/jasper-runtime-5.5.12.jar:${project.dir}/build/lib/jars/java-allocation-instrumenter-3.1.0.jar:${project.dir}/build/lib/jars/javassist-3.26.0-GA.jar:${project.dir}/build/lib/jars/jcommander-1.30.jar:${project.dir}/build/lib/jars/jersey-core-1.0.jar:${project.dir}/build/lib/jars/jersey-server-1.0.jar:${project.dir}/build/lib/jars/jets3t-0.7.1.jar:${project.dir}/build/lib/jars/jetty-6.1.26.jar:${project.dir}/build/lib/jars/jetty-util-6.1.26.jar:${project.dir}/build/lib/jars/jffi-1.2.16-native.jar:${project.dir}/build/lib/jars/jffi-1.2.16.jar:${project.dir}/build/lib/jars/jmh-core-1.21.jar:${project.dir}/build/lib/jars/jmh-generator-annprocess-1.21.jar:${project.dir}/build/lib/jars/jna-4.1.0.jar:${project.dir}/build/lib/jars/jnr-constants-0.9.9.jar:${project.dir}/build/lib/jars/jnr-ffi-2.1.7.jar:${project.dir}/build/lib/jars/jnr-posix-3.0.44.jar:${project.dir}/build/lib/jars/jnr-x86asm-1.0.2.jar:${project.dir}/build/lib/jars/jopt-simple-4.6.jar:${project.dir}/build/lib/jars/jsp-2.1-6.1.14.jar:${project.dir}/build/lib/jars/jsp-api-2.1-6.1.14.jar:${project.dir}/build/lib/jars/jsr305-2.0.2.jar:${project.dir}/build/lib/jars/jsr311-api-1.0.jar:${project.dir}/build/lib/jars/junit-4.12.jar:${project.dir}/build/lib/jars/jvm-attach-api-1.5.jar:${project.dir}/build/lib/jars/kfs-0.3.jar:${project.dir}/build/lib/jars/metrics-core-3.2.2.jar:${project.dir}/build/lib/jars/mina-core-2.0.0-M5.jar:${project.dir}/build/lib/jars/mockito-core-3.2.4.jar:${project.dir}/build/lib/jars/mxdump-0.14.jar:${project.dir}/build/lib/jars/objenesis-2.6.jar:${project.dir}/build/lib/jars/ohc-core-0.5.1.jar:${project.dir}/build/lib/jars/ohc-core-j8-0.5.1.jar:${project.dir}/build/lib/jars/org.jacoco.agent-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.ant-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.core-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.report-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/oro-2.0.8.jar:${project.dir}/build/lib/jars/psjava-0.1.19.jar:${project.dir}/build/lib/jars/quicktheories-0.25.jar:${project.dir}/build/lib/jars/reflections-0.9.12.jar:${project.dir}/build/lib/jars/servlet-api-2.5-6.1.14.jar:${project.dir}/build/lib/jars/sjk-cli-0.14.jar:${project.dir}/build/lib/jars/sjk-core-0.14.jar:${project.dir}/build/lib/jars/sjk-hflame-0.14.jar:${project.dir}/build/lib/jars/sjk-jfr-standalone-0.7.jar:${project.dir}/build/lib/jars/sjk-jfr5-0.5.jar:${project.dir}/build/lib/jars/sjk-jfr6-0.7.jar:${project.dir}/build/lib/jars/sjk-json-0.14.jar:${project.dir}/build/lib/jars/sjk-nps-0.5.jar:${project.dir}/build/lib/jars/sjk-stacktrace-0.14.jar:${project.dir}/build/lib/jars/slf4j-api-1.7.25.jar:${project.dir}/build/lib/jars/xmlenc-0.52.jar: + ${project.dir}/lib/HdrHistogram-2.1.9.jar:${project.dir}/lib/ST4-4.0.8.jar:${project.dir}/lib/airline-0.8.jar:${project.dir}/lib/antlr-runtime-3.5.2.jar:${project.dir}/lib/asm-7.1.jar:${project.dir}/lib/caffeine-2.3.5.jar:${project.dir}/lib/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/lib/chronicle-bytes-2.20.111.jar:${project.dir}/lib/chronicle-core-2.20.126.jar:${project.dir}/lib/chronicle-queue-5.20.123.jar:${project.dir}/lib/chronicle-threads-2.20.111.jar:${project.dir}/lib/chronicle-wire-2.20.117.jar:${project.dir}/lib/commons-cli-1.1.jar:${project.dir}/lib/commons-codec-1.9.jar:${project.dir}/lib/commons-lang3-3.11.jar:${project.dir}/lib/commons-math3-3.2.jar:${project.dir}/lib/concurrent-trees-2.4.0.jar:${project.dir}/lib/ecj-4.6.1.jar:${project.dir}/lib/guava-27.0-jre.jar:${project.dir}/lib/high-scale-lib-1.0.6.jar:${project.dir}/lib/hppc-0.8.1.jar:${project.dir}/lib/j2objc-annotations-1.3.jar:${project.dir}/lib/jackson-annotations-2.9.10.jar:${project.dir}/lib/jackson-core-2.9.10.jar:${project.dir}/lib/jackson-databind-2.9.10.4.jar:${project.dir}/lib/jamm-0.3.2.jar:${project.dir}/lib/javax.inject.jar:${project.dir}/lib/jbcrypt-0.3m.jar:${project.dir}/lib/jcl-over-slf4j-1.7.25.jar:${project.dir}/lib/jcommander-1.30.jar:${project.dir}/lib/jctools-core-3.1.0.jar:${project.dir}/lib/jflex-1.6.0.jar:${project.dir}/lib/jna-5.6.0.jar:${project.dir}/lib/json-simple-1.1.jar:${project.dir}/lib/jstackjunit-0.0.1.jar:${project.dir}/lib/jvm-attach-api-1.5.jar:${project.dir}/lib/log4j-over-slf4j-1.7.25.jar:${project.dir}/lib/logback-classic-1.2.3.jar:${project.dir}/lib/logback-core-1.2.3.jar:${project.dir}/lib/lz4-java-1.7.1.jar:${project.dir}/lib/metrics-core-3.1.5.jar:${project.dir}/lib/metrics-jvm-3.1.5.jar:${project.dir}/lib/metrics-logback-3.1.5.jar:${project.dir}/lib/mxdump-0.14.jar:${project.dir}/lib/netty-all-4.1.58.Final.jar:${project.dir}/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar:${project.dir}/lib/ohc-core-0.5.1.jar:${project.dir}/lib/ohc-core-j8-0.5.1.jar:${project.dir}/lib/psjava-0.1.19.jar:${project.dir}/lib/reporter-config-base-3.0.3.jar:${project.dir}/lib/reporter-config3-3.0.3.jar:${project.dir}/lib/sigar-1.6.4.jar:${project.dir}/lib/sjk-cli-0.14.jar:${project.dir}/lib/sjk-core-0.14.jar:${project.dir}/lib/sjk-json-0.14.jar:${project.dir}/lib/sjk-stacktrace-0.14.jar:${project.dir}/lib/slf4j-api-1.7.25.jar:${project.dir}/lib/snakeyaml-1.26.jar:${project.dir}/lib/snappy-java-1.1.2.6.jar:${project.dir}/lib/snowball-stemmer-1.3.0.581.1.jar:${project.dir}/lib/stream-2.5.2.jar:${project.dir}/lib/zstd-jni-1.3.8-5.jar:${project.dir}/build/lib/jars/ST4-4.0.8.jar:${project.dir}/build/lib/jars/animal-sniffer-annotations-1.14.jar:${project.dir}/build/lib/jars/ant-1.9.7.jar:${project.dir}/build/lib/jars/ant-junit-1.9.7.jar:${project.dir}/build/lib/jars/ant-launcher-1.9.7.jar:${project.dir}/build/lib/jars/antlr-3.5.2.jar:${project.dir}/build/lib/jars/antlr-runtime-3.5.2.jar:${project.dir}/build/lib/jars/apache-rat-0.10.jar:${project.dir}/build/lib/jars/apache-rat-core-0.10.jar:${project.dir}/build/lib/jars/apache-rat-tasks-0.10.jar:${project.dir}/build/lib/jars/assertj-core-3.15.0.jar:${project.dir}/build/lib/jars/awaitility-4.0.3.jar:${project.dir}/build/lib/jars/byte-buddy-1.10.5.jar:${project.dir}/build/lib/jars/byte-buddy-agent-1.10.5.jar:${project.dir}/build/lib/jars/byteman-4.0.6.jar:${project.dir}/build/lib/jars/byteman-bmunit-4.0.6.jar:${project.dir}/build/lib/jars/byteman-install-4.0.6.jar:${project.dir}/build/lib/jars/byteman-submit-4.0.6.jar:${project.dir}/build/lib/jars/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/build/lib/jars/checker-qual-2.0.0.jar:${project.dir}/build/lib/jars/commons-beanutils-1.7.0.jar:${project.dir}/build/lib/jars/commons-beanutils-core-1.8.0.jar:${project.dir}/build/lib/jars/commons-cli-1.2.jar:${project.dir}/build/lib/jars/commons-codec-1.4.jar:${project.dir}/build/lib/jars/commons-collections-3.2.1.jar:${project.dir}/build/lib/jars/commons-compress-1.5.jar:${project.dir}/build/lib/jars/commons-configuration-1.6.jar:${project.dir}/build/lib/jars/commons-digester-1.8.jar:${project.dir}/build/lib/jars/commons-el-1.0.jar:${project.dir}/build/lib/jars/commons-httpclient-3.0.1.jar:${project.dir}/build/lib/jars/commons-io-2.2.jar:${project.dir}/build/lib/jars/commons-lang-2.4.jar:${project.dir}/build/lib/jars/commons-math-2.1.jar:${project.dir}/build/lib/jars/commons-math3-3.2.jar:${project.dir}/build/lib/jars/commons-net-1.4.1.jar:${project.dir}/build/lib/jars/compile-command-annotations-1.2.0.jar:${project.dir}/build/lib/jars/dtest-api-0.0.6.jar:${project.dir}/build/lib/jars/ecj-4.6.1.jar:${project.dir}/build/lib/jars/error_prone_annotations-2.0.18.jar:${project.dir}/build/lib/jars/ftplet-api-1.0.0.jar:${project.dir}/build/lib/jars/ftpserver-core-1.0.0.jar:${project.dir}/build/lib/jars/ftpserver-deprecated-1.0.0-M2.jar:${project.dir}/build/lib/jars/guava-23.5-android.jar:${project.dir}/build/lib/jars/hadoop-core-1.0.3.jar:${project.dir}/build/lib/jars/hadoop-minicluster-1.0.3.jar:${project.dir}/build/lib/jars/hadoop-test-1.0.3.jar:${project.dir}/build/lib/jars/hamcrest-2.1.jar:${project.dir}/build/lib/jars/hamcrest-core-1.3.jar:${project.dir}/build/lib/jars/hsqldb-1.8.0.10.jar:${project.dir}/build/lib/jars/j2objc-annotations-1.1.jar:${project.dir}/build/lib/jars/jackson-annotations-2.7.0.jar:${project.dir}/build/lib/jars/jackson-core-2.7.9.jar:${project.dir}/build/lib/jars/jackson-core-asl-1.0.1.jar:${project.dir}/build/lib/jars/jackson-databind-2.7.9.3.jar:${project.dir}/build/lib/jars/jackson-mapper-asl-1.0.1.jar:${project.dir}/build/lib/jars/jacocoagent.jar:${project.dir}/build/lib/jars/jasper-compiler-5.5.12.jar:${project.dir}/build/lib/jars/jasper-runtime-5.5.12.jar:${project.dir}/build/lib/jars/java-allocation-instrumenter-3.1.0.jar:${project.dir}/build/lib/jars/javassist-3.26.0-GA.jar:${project.dir}/build/lib/jars/jcommander-1.30.jar:${project.dir}/build/lib/jars/jersey-core-1.0.jar:${project.dir}/build/lib/jars/jersey-server-1.0.jar:${project.dir}/build/lib/jars/jets3t-0.7.1.jar:${project.dir}/build/lib/jars/jetty-6.1.26.jar:${project.dir}/build/lib/jars/jetty-util-6.1.26.jar:${project.dir}/build/lib/jars/jffi-1.2.16-native.jar:${project.dir}/build/lib/jars/jffi-1.2.16.jar:${project.dir}/build/lib/jars/jmh-core-1.21.jar:${project.dir}/build/lib/jars/jmh-generator-annprocess-1.21.jar:${project.dir}/build/lib/jars/jna-4.1.0.jar:${project.dir}/build/lib/jars/jnr-constants-0.9.9.jar:${project.dir}/build/lib/jars/jnr-ffi-2.1.7.jar:${project.dir}/build/lib/jars/jnr-posix-3.0.44.jar:${project.dir}/build/lib/jars/jnr-x86asm-1.0.2.jar:${project.dir}/build/lib/jars/jopt-simple-4.6.jar:${project.dir}/build/lib/jars/jsp-2.1-6.1.14.jar:${project.dir}/build/lib/jars/jsp-api-2.1-6.1.14.jar:${project.dir}/build/lib/jars/jsr305-2.0.2.jar:${project.dir}/build/lib/jars/jsr311-api-1.0.jar:${project.dir}/build/lib/jars/junit-4.12.jar:${project.dir}/build/lib/jars/jvm-attach-api-1.5.jar:${project.dir}/build/lib/jars/kfs-0.3.jar:${project.dir}/build/lib/jars/metrics-core-3.2.2.jar:${project.dir}/build/lib/jars/mina-core-2.0.0-M5.jar:${project.dir}/build/lib/jars/mockito-core-3.2.4.jar:${project.dir}/build/lib/jars/mxdump-0.14.jar:${project.dir}/build/lib/jars/objenesis-2.6.jar:${project.dir}/build/lib/jars/ohc-core-0.5.1.jar:${project.dir}/build/lib/jars/ohc-core-j8-0.5.1.jar:${project.dir}/build/lib/jars/org.jacoco.agent-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.ant-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.core-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/org.jacoco.report-0.7.5.201505241946.jar:${project.dir}/build/lib/jars/oro-2.0.8.jar:${project.dir}/build/lib/jars/psjava-0.1.19.jar:${project.dir}/build/lib/jars/quicktheories-0.25.jar:${project.dir}/build/lib/jars/reflections-0.9.12.jar:${project.dir}/build/lib/jars/servlet-api-2.5-6.1.14.jar:${project.dir}/build/lib/jars/sjk-cli-0.14.jar:${project.dir}/build/lib/jars/sjk-core-0.14.jar:${project.dir}/build/lib/jars/sjk-hflame-0.14.jar:${project.dir}/build/lib/jars/sjk-jfr-standalone-0.7.jar:${project.dir}/build/lib/jars/sjk-jfr5-0.5.jar:${project.dir}/build/lib/jars/sjk-jfr6-0.7.jar:${project.dir}/build/lib/jars/sjk-json-0.14.jar:${project.dir}/build/lib/jars/sjk-nps-0.5.jar:${project.dir}/build/lib/jars/sjk-stacktrace-0.14.jar:${project.dir}/build/lib/jars/slf4j-api-1.7.25.jar:${project.dir}/build/lib/jars/xmlenc-0.52.jar: diff --git a/lib/chronicle-bytes-1.16.3.jar b/lib/chronicle-bytes-1.16.3.jar deleted file mode 100644 index 1b7c3a022a..0000000000 Binary files a/lib/chronicle-bytes-1.16.3.jar and /dev/null differ diff --git a/lib/chronicle-bytes-2.20.111.jar b/lib/chronicle-bytes-2.20.111.jar new file mode 100644 index 0000000000..dc66d19ad8 Binary files /dev/null and b/lib/chronicle-bytes-2.20.111.jar differ diff --git a/lib/chronicle-core-1.16.4.jar b/lib/chronicle-core-1.16.4.jar deleted file mode 100644 index 0275a72c30..0000000000 Binary files a/lib/chronicle-core-1.16.4.jar and /dev/null differ diff --git a/lib/chronicle-core-2.20.126.jar b/lib/chronicle-core-2.20.126.jar new file mode 100644 index 0000000000..3712f98f65 Binary files /dev/null and b/lib/chronicle-core-2.20.126.jar differ diff --git a/lib/chronicle-queue-4.16.3.jar b/lib/chronicle-queue-4.16.3.jar deleted file mode 100644 index 1def472f24..0000000000 Binary files a/lib/chronicle-queue-4.16.3.jar and /dev/null differ diff --git a/lib/chronicle-queue-5.20.123.jar b/lib/chronicle-queue-5.20.123.jar new file mode 100644 index 0000000000..4ce235e3e5 Binary files /dev/null and b/lib/chronicle-queue-5.20.123.jar differ diff --git a/lib/chronicle-threads-1.16.0.jar b/lib/chronicle-threads-1.16.0.jar deleted file mode 100644 index b1f122861b..0000000000 Binary files a/lib/chronicle-threads-1.16.0.jar and /dev/null differ diff --git a/lib/chronicle-threads-2.20.111.jar b/lib/chronicle-threads-2.20.111.jar new file mode 100644 index 0000000000..908508874c Binary files /dev/null and b/lib/chronicle-threads-2.20.111.jar differ diff --git a/lib/chronicle-wire-1.16.1.jar b/lib/chronicle-wire-1.16.1.jar deleted file mode 100644 index 720d2428c1..0000000000 Binary files a/lib/chronicle-wire-1.16.1.jar and /dev/null differ diff --git a/lib/chronicle-wire-2.20.117.jar b/lib/chronicle-wire-2.20.117.jar new file mode 100644 index 0000000000..5bd7083b6d Binary files /dev/null and b/lib/chronicle-wire-2.20.117.jar differ diff --git a/lib/licenses/chronicle-bytes-1.16.3.txt b/lib/licenses/chronicle-bytes-2.20.111.txt similarity index 100% rename from lib/licenses/chronicle-bytes-1.16.3.txt rename to lib/licenses/chronicle-bytes-2.20.111.txt diff --git a/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt b/lib/licenses/chronicle-core-2.20.126.txt similarity index 100% rename from lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt rename to lib/licenses/chronicle-core-2.20.126.txt diff --git a/lib/licenses/netty-tcnative-2.0.34.txt b/lib/licenses/chronicle-queue-5.20.123.txt similarity index 100% rename from lib/licenses/netty-tcnative-2.0.34.txt rename to lib/licenses/chronicle-queue-5.20.123.txt diff --git a/lib/licenses/chronicle-queue-4.16.3.txt b/lib/licenses/chronicle-threads-2.20.111.txt similarity index 100% rename from lib/licenses/chronicle-queue-4.16.3.txt rename to lib/licenses/chronicle-threads-2.20.111.txt diff --git a/lib/licenses/chronicle-wire-1.16.1.txt b/lib/licenses/chronicle-wire-1.16.1.txt deleted file mode 100644 index d8a262ea0f..0000000000 --- a/lib/licenses/chronicle-wire-1.16.1.txt +++ /dev/null @@ -1,14 +0,0 @@ - -== Copyright 2016 higherfrequencytrading.com - -Licensed 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. diff --git a/lib/licenses/chronicle-threads-1.16.0.txt b/lib/licenses/chronicle-wire-2.20.117.txt similarity index 100% rename from lib/licenses/chronicle-threads-1.16.0.txt rename to lib/licenses/chronicle-wire-2.20.117.txt diff --git a/lib/licenses/netty-4.1.54.txt b/lib/licenses/netty-all-4.1.58.txt similarity index 100% rename from lib/licenses/netty-4.1.54.txt rename to lib/licenses/netty-all-4.1.58.txt diff --git a/lib/licenses/netty-tcnative-boringssl-static-2.0.36.txt b/lib/licenses/netty-tcnative-boringssl-static-2.0.36.txt new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/lib/licenses/netty-tcnative-boringssl-static-2.0.36.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/lib/netty-all-4.1.54.Final.jar b/lib/netty-all-4.1.58.Final.jar similarity index 82% rename from lib/netty-all-4.1.54.Final.jar rename to lib/netty-all-4.1.58.Final.jar index 5b9d4d9365..846c83e486 100644 Binary files a/lib/netty-all-4.1.54.Final.jar and b/lib/netty-all-4.1.58.Final.jar differ diff --git a/lib/netty-tcnative-boringssl-static-2.0.34.Final.jar b/lib/netty-tcnative-boringssl-static-2.0.34.Final.jar deleted file mode 100644 index ae902f585d..0000000000 Binary files a/lib/netty-tcnative-boringssl-static-2.0.34.Final.jar and /dev/null differ diff --git a/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar b/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar new file mode 100644 index 0000000000..62506375d2 Binary files /dev/null and b/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar differ diff --git a/src/java/org/apache/cassandra/tools/AuditLogViewer.java b/src/java/org/apache/cassandra/tools/AuditLogViewer.java index f1a6e3723a..dd0e839832 100644 --- a/src/java/org/apache/cassandra/tools/AuditLogViewer.java +++ b/src/java/org/apache/cassandra/tools/AuditLogViewer.java @@ -32,7 +32,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import net.openhft.chronicle.core.io.IORuntimeException; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.queue.impl.single.SingleChronicleQueue; @@ -76,7 +76,7 @@ public class AuditLogViewer Pauser pauser = Pauser.millis(100); List tailers = pathList.stream() .distinct() - .map(path -> ChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()) + .map(path -> SingleChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()) .map(SingleChronicleQueue::createTailer) .collect(Collectors.toList()); boolean hadWork = true; diff --git a/src/java/org/apache/cassandra/utils/binlog/BinLog.java b/src/java/org/apache/cassandra/utils/binlog/BinLog.java index 31108c7067..f6229543cc 100644 --- a/src/java/org/apache/cassandra/utils/binlog/BinLog.java +++ b/src/java/org/apache/cassandra/utils/binlog/BinLog.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.wire.WireOut; @@ -123,7 +123,7 @@ public class BinLog implements Runnable Preconditions.checkNotNull(path, "path was null"); Preconditions.checkNotNull(options.roll_cycle, "roll_cycle was null"); Preconditions.checkArgument(options.max_queue_weight > 0, "max_queue_weight must be > 0"); - ChronicleQueueBuilder builder = ChronicleQueueBuilder.single(path.toFile()); + SingleChronicleQueueBuilder builder = SingleChronicleQueueBuilder.single(path.toFile()); builder.rollCycle(RollCycles.valueOf(options.roll_cycle)); sampleQueue = new WeightedQueue<>(options.max_queue_weight); diff --git a/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java b/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java index a450cbf1e0..ea1bbbd41a 100644 --- a/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java +++ b/test/unit/org/apache/cassandra/audit/BinAuditLoggerTest.java @@ -26,7 +26,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; import org.apache.cassandra.config.DatabaseDescriptor; @@ -74,7 +74,7 @@ public class BinAuditLoggerTest extends CQLTester ResultSet rs = session.execute(pstmt.bind(1)); assertEquals(1, rs.all().size()); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptTailer tailer = queue.createTailer(); assertTrue(tailer.readDocument(wire -> { diff --git a/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java b/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java index 04baa09718..73be0b493e 100644 --- a/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java +++ b/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java @@ -38,7 +38,7 @@ import org.junit.Test; import io.netty.buffer.Unpooled; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.wire.ValueIn; @@ -227,7 +227,7 @@ public class FullQueryLoggerTest extends CQLTester assertTrue(new File(tempDir.toFile(), "foobar").createNewFile()); configureFQL(); assertEquals(tempDir.toFile().listFiles().length, 1); - assertEquals("directory-listing.cq4t", tempDir.toFile().listFiles()[0].getName()); + assertEquals("metadata.cq4t", tempDir.toFile().listFiles()[0].getName()); } @Test @@ -316,7 +316,7 @@ public class FullQueryLoggerTest extends CQLTester private boolean checkForQueries(List queries) { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptTailer tailer = queue.createTailer(); List expectedQueries = new LinkedList<>(queries); @@ -427,7 +427,7 @@ public class FullQueryLoggerTest extends CQLTester private void assertRoundTripQuery(@Nullable String keyspace) { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptTailer tailer = queue.createTailer(); assertTrue(tailer.readDocument(wire -> @@ -466,7 +466,7 @@ public class FullQueryLoggerTest extends CQLTester Util.spinAssertEquals(true, () -> { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { return queue.createTailer().readingDocument().isPresent(); } @@ -490,7 +490,7 @@ public class FullQueryLoggerTest extends CQLTester Util.spinAssertEquals(true, () -> { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { return queue.createTailer().readingDocument().isPresent(); } @@ -502,7 +502,7 @@ public class FullQueryLoggerTest extends CQLTester private void assertRoundTripBatch(@Nullable String keyspace) { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptTailer tailer = queue.createTailer(); assertTrue(tailer.readDocument(wire -> { diff --git a/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java b/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java index ed230880c5..5c0cb9daef 100644 --- a/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java +++ b/test/unit/org/apache/cassandra/tools/AuditLogViewerTest.java @@ -37,7 +37,7 @@ import org.junit.Test; import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.wire.WireOut; @@ -161,7 +161,7 @@ public class AuditLogViewerTest records.add("Test foo bar 1"); records.add("Test foo bar 2"); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptAppender appender = queue.acquireAppender(); @@ -179,7 +179,7 @@ public class AuditLogViewerTest @Test (expected = IORuntimeException.class) public void testRejectFutureVersionRecord() { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptAppender appender = queue.acquireAppender(); appender.writeDocument(createFutureRecord()); @@ -200,7 +200,7 @@ public class AuditLogViewerTest records.add("Test foo bar 1"); records.add("Test foo bar 2"); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptAppender appender = queue.acquireAppender(); @@ -222,7 +222,7 @@ public class AuditLogViewerTest @Test (expected = IORuntimeException.class) public void testRejectUnknownTypeRecord() { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptAppender appender = queue.acquireAppender(); appender.writeDocument(createUnknownTypeRecord()); @@ -243,7 +243,7 @@ public class AuditLogViewerTest records.add("Test foo bar 1"); records.add("Test foo bar 2"); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptAppender appender = queue.acquireAppender(); diff --git a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java index dbce6a9f67..9ca24b02f9 100644 --- a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java +++ b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.wire.WireOut; @@ -473,7 +473,7 @@ public class BinLogTest List readBinLogRecords(Path path) { List records = new ArrayList(); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) + try (ChronicleQueue queue = SingleChronicleQueueBuilder.single(path.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) { ExcerptTailer tailer = queue.createTailer(); while (true) diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java index d12871727e..1a53332b14 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/ResultStore.java @@ -31,7 +31,7 @@ import net.openhft.chronicle.bytes.BytesStore; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptAppender; import net.openhft.chronicle.wire.ReadMarshallable; import net.openhft.chronicle.wire.ValueIn; @@ -105,9 +105,9 @@ public class ResultStore public ResultStore(List resultPaths, File queryFilePath) { - queues = resultPaths.stream().map(path -> ChronicleQueueBuilder.single(path).build()).collect(Collectors.toList()); + queues = resultPaths.stream().map(path -> SingleChronicleQueueBuilder.single(path).build()).collect(Collectors.toList()); appenders = queues.stream().map(ChronicleQueue::acquireAppender).collect(Collectors.toList()); - queryStoreQueue = queryFilePath != null ? ChronicleQueueBuilder.single(queryFilePath).build() : null; + queryStoreQueue = queryFilePath != null ? SingleChronicleQueueBuilder.single(queryFilePath).build() : null; queryStoreAppender = queryStoreQueue != null ? queryStoreQueue.acquireAppender() : null; } diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java index 2375296420..83095d2ed4 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Compare.java @@ -32,7 +32,7 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import org.apache.cassandra.fqltool.FQLQueryIterator; import org.apache.cassandra.fqltool.ResultHandler; @@ -64,10 +64,10 @@ public class Compare implements Runnable { List readQueues = null; try (ResultHandler rh = new ResultHandler(arguments, null, null); - ChronicleQueue queryQ = ChronicleQueueBuilder.single(querylog).readOnly(true).build(); + ChronicleQueue queryQ = SingleChronicleQueueBuilder.single(querylog).readOnly(true).build(); FQLQueryIterator queries = new FQLQueryIterator(queryQ.createTailer(), 1)) { - readQueues = arguments.stream().map(s -> ChronicleQueueBuilder.single(s).readOnly(true).build()).collect(Collectors.toList()); + readQueues = arguments.stream().map(s -> SingleChronicleQueueBuilder.single(s).readOnly(true).build()).collect(Collectors.toList()); List> its = readQueues.stream().map(q -> new StoredResultSetIterator(q.createTailer())).collect(Collectors.toList()); while (queries.hasNext()) rh.handleResults(queries.next(), resultSets(its)); diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java index dfc3b0944b..f26f0f92ad 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Dump.java @@ -33,7 +33,7 @@ import io.netty.buffer.Unpooled; import net.openhft.chronicle.bytes.Bytes; import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import net.openhft.chronicle.queue.ExcerptTailer; import net.openhft.chronicle.queue.RollCycles; import net.openhft.chronicle.threads.Pauser; @@ -137,7 +137,7 @@ public class Dump implements Runnable //Backoff strategy for spinning on the queue, not aggressive at all as this doesn't need to be low latency Pauser pauser = Pauser.millis(100); - List queues = arguments.stream().distinct().map(path -> ChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()).collect(Collectors.toList()); + List queues = arguments.stream().distinct().map(path -> SingleChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()).collect(Collectors.toList()); List tailers = queues.stream().map(ChronicleQueue::createTailer).collect(Collectors.toList()); boolean hadWork = true; while (hadWork) diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java index a567101776..492e6ac1bf 100644 --- a/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java +++ b/tools/fqltool/src/org/apache/cassandra/fqltool/commands/Replay.java @@ -34,7 +34,7 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; +import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder; import org.apache.cassandra.fqltool.FQLQuery; import org.apache.cassandra.fqltool.FQLQueryIterator; import org.apache.cassandra.fqltool.QueryReplayer; @@ -119,7 +119,7 @@ public class Replay implements Runnable try { - readQueues = arguments.stream().map(s -> ChronicleQueueBuilder.single(s).readOnly(true).build()).collect(Collectors.toList()); + readQueues = arguments.stream().map(s -> SingleChronicleQueueBuilder.single(s).readOnly(true).build()).collect(Collectors.toList()); iterators = readQueues.stream().map(ChronicleQueue::createTailer).map(tailer -> new FQLQueryIterator(tailer, readAhead)).collect(Collectors.toList()); try (MergeIterator> iter = MergeIterator.get(iterators, FQLQuery::compareTo, new Reducer()); QueryReplayer replayer = new QueryReplayer(iter, targetHosts, resultPaths, filters, queryStorePath))