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 2021/01/22 09:07:23 UTC
[cassandra] branch trunk updated: Upgrade netty and chronicle-queue
dependencies to get Auditing and native library loading working on arm64
architectures
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
The following commit(s) were added to refs/heads/trunk by this push:
new 7f1659c Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures
7f1659c is described below
commit 7f1659cd1d46ab8904eee99daefcaaa7a521e00b
Author: zhaorenhai <zh...@hotmail.com>
AuthorDate: Sun Jan 17 21:31:59 2021 +0800
Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures
CASSANDRA-16384 test case AuditLoggerTest fail on aarch64 platform
CASSANDRA-16392 Unable to load the library netty_tcnative_linux_aarch_64
patch by Zhao Renhai (赵 仁海); reviewed by Mick Semb Wever for CASSANDRA-16384,CASSANDRA-16392
---
CHANGES.txt | 1 +
build.xml | 16 ++++++++--------
doc/source/new/auditlogging.rst | 2 +-
ide/nbproject/project.xml | 2 +-
lib/chronicle-bytes-1.16.3.jar | Bin 289991 -> 0 bytes
lib/chronicle-bytes-2.20.111.jar | Bin 0 -> 363107 bytes
lib/chronicle-core-1.16.4.jar | Bin 218599 -> 0 bytes
lib/chronicle-core-2.20.126.jar | Bin 0 -> 344510 bytes
lib/chronicle-queue-4.16.3.jar | Bin 237198 -> 0 bytes
lib/chronicle-queue-5.20.123.jar | Bin 0 -> 331178 bytes
lib/chronicle-threads-1.16.0.jar | Bin 50299 -> 0 bytes
lib/chronicle-threads-2.20.111.jar | Bin 0 -> 77004 bytes
lib/chronicle-wire-1.16.1.jar | Bin 437898 -> 0 bytes
lib/chronicle-wire-2.20.117.jar | Bin 0 -> 664277 bytes
lib/licenses/chronicle-bytes-1.16.3.txt | 14 --------------
...ire-1.16.1.txt => chronicle-bytes-2.20.111.txt} | 0
...eads-1.16.0.txt => chronicle-core-2.20.126.txt} | 0
...ive-2.0.34.txt => chronicle-queue-5.20.123.txt} | 0
...e-4.16.3.txt => chronicle-threads-2.20.111.txt} | 0
....3-SNAPSHOT.txt => chronicle-wire-2.20.117.txt} | 0
.../{netty-4.1.54.txt => netty-all-4.1.58.txt} | 0
... => netty-tcnative-boringssl-static-2.0.36.txt} | 0
...4.1.54.Final.jar => netty-all-4.1.58.Final.jar} | Bin 4318380 -> 4333800 bytes
...etty-tcnative-boringssl-static-2.0.34.Final.jar | Bin 4018015 -> 0 bytes
...etty-tcnative-boringssl-static-2.0.36.Final.jar | Bin 0 -> 4014208 bytes
.../org/apache/cassandra/tools/AuditLogViewer.java | 4 ++--
.../org/apache/cassandra/utils/binlog/BinLog.java | 4 ++--
.../apache/cassandra/audit/BinAuditLoggerTest.java | 4 ++--
.../apache/cassandra/fql/FullQueryLoggerTest.java | 14 +++++++-------
.../apache/cassandra/tools/AuditLogViewerTest.java | 12 ++++++------
.../apache/cassandra/utils/binlog/BinLogTest.java | 4 ++--
.../org/apache/cassandra/fqltool/ResultStore.java | 6 +++---
.../apache/cassandra/fqltool/commands/Compare.java | 6 +++---
.../apache/cassandra/fqltool/commands/Dump.java | 4 ++--
.../apache/cassandra/fqltool/commands/Replay.java | 4 ++--
35 files changed, 42 insertions(+), 55 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 7699940..cb51088 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 d818f44..4f636f1 100644
--- a/build.xml
+++ b/build.xml
@@ -125,11 +125,11 @@
<property name="bytebuddy.version" value="1.10.10"/>
<!-- https://mvnrepository.com/artifact/net.openhft/chronicle-bom/1.16.23 -->
- <property name="chronicle-queue.version" value="4.16.3" />
- <property name="chronicle-core.version" value="1.16.4" />
- <property name="chronicle-bytes.version" value="1.16.3" />
- <property name="chronicle-wire.version" value="1.16.1" />
- <property name="chronicle-threads.version" value="1.16.0" />
+ <property name="chronicle-queue.version" value="5.20.123" />
+ <property name="chronicle-core.version" value="2.20.126" />
+ <property name="chronicle-bytes.version" value="2.20.111" />
+ <property name="chronicle-wire.version" value="2.20.117" />
+ <property name="chronicle-threads.version" value="2.20.111" />
<condition property="maven-ant-tasks.jar.exists">
<available file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
@@ -631,9 +631,9 @@
<dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" />
<dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
<dependency groupId="io.airlift" artifactId="airline" version="0.8" />
- <dependency groupId="io.netty" artifactId="netty-bom" version="4.1.54.Final" type="pom" />
- <dependency groupId="io.netty" artifactId="netty-all" version="4.1.54.Final" />
- <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static" version="2.0.34.Final" />
+ <dependency groupId="io.netty" artifactId="netty-bom" version="4.1.58.Final" type="pom" />
+ <dependency groupId="io.netty" artifactId="netty-all" version="4.1.58.Final" />
+ <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static" version="2.0.36.Final" />
<dependency groupId="net.openhft" artifactId="chronicle-queue" version="${chronicle-queue.version}"/>
<dependency groupId="net.openhft" artifactId="chronicle-core" version="${chronicle-core.version}"/>
<dependency groupId="net.openhft" artifactId="chronicle-bytes" version="${chronicle-bytes.version}"/>
diff --git a/doc/source/new/auditlogging.rst b/doc/source/new/auditlogging.rst
index 0842810..9938fdb 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 23427ee..9daa299 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -7,7 +7,7 @@
<properties>
<property name="project.dir">..</property>
<!-- the compile classpaths should be distinct per compilation unit… but it is kept simple and the build will catch errors -->
- <property name="cassandra.classpath.jars">${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}/li [...]
+ <property name="cassandra.classpath.jars">${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.d [...]
</properties>
<folders>
<source-folder>
diff --git a/lib/chronicle-bytes-1.16.3.jar b/lib/chronicle-bytes-1.16.3.jar
deleted file mode 100644
index 1b7c3a0..0000000
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 0000000..dc66d19
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 0275a72..0000000
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 0000000..3712f98
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 1def472..0000000
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 0000000..4ce235e
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 b1f1228..0000000
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 0000000..9085088
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 720d242..0000000
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 0000000..5bd7083
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-1.16.3.txt
deleted file mode 100644
index d8a262e..0000000
--- a/lib/licenses/chronicle-bytes-1.16.3.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-wire-1.16.1.txt b/lib/licenses/chronicle-bytes-2.20.111.txt
similarity index 100%
rename from lib/licenses/chronicle-wire-1.16.1.txt
rename to lib/licenses/chronicle-bytes-2.20.111.txt
diff --git a/lib/licenses/chronicle-threads-1.16.0.txt b/lib/licenses/chronicle-core-2.20.126.txt
similarity index 100%
rename from lib/licenses/chronicle-threads-1.16.0.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%
copy from lib/licenses/netty-tcnative-2.0.34.txt
copy 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-core-1.16.3-SNAPSHOT.txt b/lib/licenses/chronicle-wire-2.20.117.txt
similarity index 100%
rename from lib/licenses/chronicle-core-1.16.3-SNAPSHOT.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-2.0.34.txt b/lib/licenses/netty-tcnative-boringssl-static-2.0.36.txt
similarity index 100%
rename from lib/licenses/netty-tcnative-2.0.34.txt
rename to lib/licenses/netty-tcnative-boringssl-static-2.0.36.txt
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 5b9d4d9..846c83e 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 ae902f5..0000000
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 0000000..6250637
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 f1a6e37..dd0e839 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<ExcerptTailer> 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 31108c7..f622954 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 a450cbf..ea1bbbd 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 04baa09..73be0b4 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<String> 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<String> 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 ed23088..5c0cb9d 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 dbce6a9..9ca24b0 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<String> readBinLogRecords(Path path)
{
List<String> records = new ArrayList<String>();
- 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 d128717..1a53332 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<File> 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 2375296..83095d2 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<ChronicleQueue> 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<Iterator<ResultHandler.ComparableResultSet>> 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 dfc3b09..f26f0f9 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<ChronicleQueue> queues = arguments.stream().distinct().map(path -> ChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()).collect(Collectors.toList());
+ List<ChronicleQueue> queues = arguments.stream().distinct().map(path -> SingleChronicleQueueBuilder.single(new File(path)).readOnly(true).rollCycle(RollCycles.valueOf(rollCycle)).build()).collect(Collectors.toList());
List<ExcerptTailer> 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 a567101..492e6ac 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<FQLQuery, List<FQLQuery>> iter = MergeIterator.get(iterators, FQLQuery::compareTo, new Reducer());
QueryReplayer replayer = new QueryReplayer(iter, targetHosts, resultPaths, filters, queryStorePath))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org