You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2022/10/20 18:21:23 UTC
[cassandra] branch trunk updated (ac68f24512 -> 6f709ca0ec)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from ac68f24512 Call only LoggingSupportFactory in Instance instead ThreadAwareSecurityManager to fix SSTableIdGenerationTest
add ce1584ccc8 Fix ASM bytecode version inconsistency patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi and Benedict Elliot Smith for CASSANDRA-17873
add 1df5dd671e Merge branch 'cassandra-4.0' into cassandra-4.1
new 6f709ca0ec Merge branch 'cassandra-4.1' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
build.xml | 3 +++
.../org/apache/cassandra/cql3/functions/UDFByteCodeVerifier.java | 8 +++++---
src/java/org/apache/cassandra/utils/FBUtilities.java | 3 +++
4 files changed, 12 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6f709ca0ece43209f04c56c13c138ef76e14ba90
Merge: ac68f24512 1df5dd671e
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Thu Oct 20 14:00:06 2022 -0400
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
build.xml | 3 +++
.../org/apache/cassandra/cql3/functions/UDFByteCodeVerifier.java | 8 +++++---
src/java/org/apache/cassandra/utils/FBUtilities.java | 3 +++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 5a6e4a4d51,c72c01af8f..288e8d2755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -95,9 -43,6 +95,10 @@@ Merged from 4.1
* Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder class and deprecate it in favor of withBufferSizeInMiB(int size) (CASSANDRA-17675)
* Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
Merged from 4.0:
++ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
+ * Remove empty cq4 files in log directory to not fail the startup of BinLog (CASSANDRA-17933)
+ * Fix multiple BufferPool bugs (CASSANDRA-16681)
+ * Fix StorageService.getNativeaddress handling of IPv6 addresses (CASSANDRA-17945)
* Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895)
* Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900)
* Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864)
diff --cc build.xml
index e96c559bed,00a19abcdc..f5088e97c8
--- a/build.xml
+++ b/build.xml
@@@ -123,12 -128,33 +123,15 @@@
<property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
<property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" />
<property name="jacoco.finalexecfile" value="${jacoco.export.dir}/jacoco.exec" />
- <property name="jacoco.version" value="0.8.6"/>
- <property name="byteman.version" value="4.0.6"/>
+ <property name="jflex.version" value="1.8.2"/>
<property name="jamm.version" value="0.3.2"/>
<property name="ecj.version" value="4.6.1"/>
- <property name="ohc.version" value="0.5.1"/>
- <property name="asm.version" value="9.1"/>
++ <!-- When updating ASM, please, do consider whether you might need to update also FBUtilities#ASM_BYTECODE_VERSION
++ and the simulator InterceptClasses#BYTECODE_VERSION, in particular if we are looking to provide Cassandra support
++ for newer JDKs (CASSANDRA-17873). -->
+ <property name="asm.version" value="9.3"/>
<property name="allocation-instrumenter.version" value="3.1.0"/>
- <property name="bytebuddy.version" value="1.10.10"/>
- <property name="jflex.version" value="1.8.2"/>
-
- <!-- https://mvnrepository.com/artifact/net.openhft/chronicle-bom/1.16.23 -->
- <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" />
-
- <property name="dtest-api.version" value="0.0.13" />
-
- <condition property="maven-ant-tasks.jar.exists">
- <available file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
- </condition>
-
- <condition property="maven-ant-tasks.jar.local">
- <available file="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
- </condition>
<condition property="is.source.artifact">
<available file="${build.src.java}" type="dir" />
diff --cc src/java/org/apache/cassandra/cql3/functions/UDFByteCodeVerifier.java
index e3b461c045,ab913b4868..e0b18069ee
--- a/src/java/org/apache/cassandra/cql3/functions/UDFByteCodeVerifier.java
+++ b/src/java/org/apache/cassandra/cql3/functions/UDFByteCodeVerifier.java
@@@ -35,6 -35,6 +35,8 @@@ import org.objectweb.asm.Handle
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
++import static org.apache.cassandra.utils.FBUtilities.ASM_BYTECODE_VERSION;
++
/**
* Verifies Java UDF byte code.
* Checks for disallowed method calls (e.g. {@code Object.finalize()}),
@@@ -84,7 -84,7 +86,7 @@@ public final class UDFByteCodeVerifie
{
String clsNameSl = clsName.replace('.', '/');
Set<String> errors = new TreeSet<>(); // it's a TreeSet for unit tests
-- ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM7)
++ ClassVisitor classVisitor = new ClassVisitor(ASM_BYTECODE_VERSION)
{
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value)
{
@@@ -160,7 -160,7 +162,7 @@@
ExecuteImplVisitor(Set<String> errors)
{
- super(Opcodes.ASM5);
- super(Opcodes.ASM7);
++ super(ASM_BYTECODE_VERSION);
this.errors = errors;
}
@@@ -210,7 -210,7 +212,7 @@@
ConstructorVisitor(Set<String> errors)
{
- super(Opcodes.ASM5);
- super(Opcodes.ASM7);
++ super(ASM_BYTECODE_VERSION);
this.errors = errors;
}
diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java
index 6d210ceb47,6d210ceb47..02666ac6cb
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@@ -84,6 -84,6 +84,7 @@@ import org.apache.cassandra.io.util.Fil
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.security.ISslContextFactory;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
++import org.objectweb.asm.Opcodes;
import static org.apache.cassandra.config.CassandraRelevantProperties.LINE_SEPARATOR;
import static org.apache.cassandra.config.CassandraRelevantProperties.USER_HOME;
@@@ -138,6 -138,6 +139,8 @@@ public class FBUtilitie
public static final int MAX_UNSIGNED_SHORT = 0xFFFF;
++ public static final int ASM_BYTECODE_VERSION = Opcodes.ASM7;
++
public static MessageDigest newMessageDigest(String algorithm)
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org