This is an automated email from the ASF dual-hosted git repository. frankgh pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git
The following commit(s) were added to refs/heads/trunk by this push: new fc08d45 CASSANDRA-19351 No longer need to synchronize on Schema.instance after Cassandra 4.0.12 fc08d45 is described below commit fc08d45b283e701aa6d558e99cd18318394b0de7 Author: Francisco Guerrero <fran...@apache.org> AuthorDate: Wed Jan 31 14:35:34 2024 -0800 CASSANDRA-19351 No longer need to synchronize on Schema.instance after Cassandra 4.0.12 We no longer need to synchronize on the `Schema.instance` in Analytics after the release of Cassandra 4.0.12, that includes a synchronization fix in https://issues.apache.org/jira/browse/CASSANDRA-18317. This commit cleans up TODOs pending on that code being released. Patch by Francisco Guerrero; Reviewed by Yifan Cai for CASSANDRA-19351 --- CHANGES.txt | 1 + .../org/apache/cassandra/bridge/CassandraBridgeImplementation.java | 4 +--- .../java/org/apache/cassandra/bridge/SSTableWriterImplementation.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b105092..a6578b8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.0 + * No longer need to synchronize on Schema.instance after Cassandra 4.0.12 (CASSANDRA-19351) * Upgrade to Cassandra 4.0.12 and remove RowBufferMode and BatchSize options (CASSANDRA-19334) * Improve logging for bulk writes and on task failures (CASSANDRA-19331) * Allow setting TTL for snapshots created by Analytics bulk reader (CASSANDRA-19273) diff --git a/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/CassandraBridgeImplementation.java b/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/CassandraBridgeImplementation.java index f1274ad..4cad69b 100644 --- a/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/CassandraBridgeImplementation.java +++ b/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/CassandraBridgeImplementation.java @@ -570,9 +570,7 @@ public class CassandraBridgeImplementation extends CassandraBridge builder.withType(statement); } - // TODO: Remove me once CQLSSTableWriter.Builder synchronize on schema (see CASSANDRA-TBD) - // build update schema, we need to synchornize - try (CQLSSTableWriter ssTable = CassandraSchema.apply(s -> builder.build())) + try (CQLSSTableWriter ssTable = builder.build()) { writer.accept(values -> { try diff --git a/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/SSTableWriterImplementation.java b/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/SSTableWriterImplementation.java index 89e14f1..0a7ecde 100644 --- a/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/SSTableWriterImplementation.java +++ b/cassandra-four-zero/src/main/java/org/apache/cassandra/bridge/SSTableWriterImplementation.java @@ -54,9 +54,7 @@ public class SSTableWriterImplementation implements SSTableWriter insertStatement, bufferSizeMB, cassPartitioner); - // TODO: Remove me once CQLSSTableWriter.Builder synchronize on schema (see CASSANDRA-TBD) - // build update schema, we need to synchronize - writer = CassandraSchema.apply(s -> builder.build()); + writer = builder.build(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org