Merge branch 'palantir-cassandra-2.2.18' into rh/lock-schema-bootstrap

palantir · Dec 11, 2024 · b8f3705 · b8f3705
2 parents 56b2b86 + 71d8357
commit b8f3705
Show file tree

Hide file tree

Showing 68 changed files with 15,979 additions and 12,796 deletions.
diff --git a/build.xml b/build.xml
@@ -790,11 +790,11 @@
       <uptodate property="thriftUpToDate" srcfile="${interface.dir}/cassandra.thrift"
             targetfile="${interface.thrift.gen-java}/org/apache/cassandra/thrift/Cassandra.java" />
     </target>
-    <target name="gen-thrift-java" unless="thriftUpToDate" depends="check-gen-thrift-java"
+    <target name="gen-thrift-java" depends="check-gen-thrift-java"
             description="Generate Thrift Java artifacts">
       <echo>Generating Thrift Java code from ${basedir}/interface/cassandra.thrift...</echo>
       <exec executable="thrift" dir="${basedir}/interface" failonerror="true">
-        <arg line="--gen java:hashcode" />
+        <arg line="--gen java:generated_annotations=undated" />
         <arg line="-o ${interface.thrift.dir}" />
         <arg line="cassandra.thrift" />
       </exec>

diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
@@ -25,7 +25,6 @@
 
 namespace java org.apache.cassandra.thrift
 namespace cpp org.apache.cassandra
-namespace csharp Apache.Cassandra
 namespace py cassandra
 namespace php cassandra
 namespace perl Cassandra

diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java