This is an automated email from the ASF dual-hosted git repository.
sarankk 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 bbf96df3 CASSANALYTICS-202: Opening one keyspace instance rebuilds
every keyspace instance in the Cassandra 6.0 bridge (#249)
bbf96df3 is described below
commit bbf96df31e2515e7e4c4f3a594edf260e690f791
Author: Mansi Khara <[email protected]>
AuthorDate: Tue Sep 29 14:08:45 2026 -0400
CASSANALYTICS-202: Opening one keyspace instance rebuilds every keyspace
instance in the Cassandra 6.0 bridge (#249)
Patch by Mansi Khara; Reviewed by Yifan Cai, Bernardo Botella, Saranya
Krishnakumar for CASSANALYTICS-202
---
CHANGES.txt | 1 +
.../org/apache/cassandra/bridge/SchemaUpdater.java | 31 +++++++++++-----------
.../spark/reader/AbstractSchemaBuilder.java | 6 ++---
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 5e6d18b9..7f691430 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.5.0
-----
+ * Opening one keyspace instance rebuilds every keyspace instance in the
Cassandra 6.0 bridge (CASSANALYTICS-202)
* CDC logs NPE for deleted column values (CASSANALYTICS-178)
* Add Cassandra 6.0 support (CASSANALYTICS-37)
* Eliminate redundant filesystem lookups in SSTable direct streaming
(CASSANALYTICS-104)
diff --git
a/cassandra-six-zero-types/src/main/java/org/apache/cassandra/bridge/SchemaUpdater.java
b/cassandra-six-zero-types/src/main/java/org/apache/cassandra/bridge/SchemaUpdater.java
index 5802d4de..e034f826 100644
---
a/cassandra-six-zero-types/src/main/java/org/apache/cassandra/bridge/SchemaUpdater.java
+++
b/cassandra-six-zero-types/src/main/java/org/apache/cassandra/bridge/SchemaUpdater.java
@@ -60,16 +60,19 @@ public class SchemaUpdater
}
/**
- * Creates a keyspace instance for every keyspace of the current cluster
metadata. Use this only when a
- * keyspace has metadata but no instance, which happens when code outside
this class commits it; Cassandra
- * 6.0's {@code Keyspace.openWithoutSSTables} only reads the instance and
no longer creates it.
+ * Creates the instance for a single keyspace, leaving every other
keyspace's instance untouched. Needed when a
+ * keyspace has metadata but no instance. Cassandra 6.0's {@code
Keyspace.openWithoutSSTables} only reads the
+ * instance rather than creating it.
*
- * <p>Passing an empty previous schema replaces every existing instance,
dropping the column family stores
- * it held, so prefer {@link #submit}, which keeps the instances of each
commit.
+ * <p>Targeting one keyspace avoids rebuilding all of them, which
re-registers metrics and can throw
+ * stack-trace-filling exceptions. A bulk job builds schema once per
keyspace, so this only shows up in tests that
+ * open many distinct keyspaces in one JVM.
*/
- public static void openKeyspaceInstances()
+ public static void openKeyspaceInstance(String keyspaceName)
{
-
ClusterMetadata.current().schema.initializeKeyspaceInstances(DistributedSchema.empty(),
false);
+ DistributedSchema current = ClusterMetadata.current().schema;
+ DistributedSchema before = new
DistributedSchema(current.getKeyspaces().without(keyspaceName));
+ current.initializeKeyspaceInstances(before, false);
}
public static void load(SchemaProvider schema, KeyspaceMetadata
keyspaceMetadata)
@@ -90,18 +93,16 @@ public class SchemaUpdater
/**
* Replaces the metadata of an existing keyspace with metadata that holds
fewer tables.
*
- * <p>Cassandra 4.0's {@code Schema.load} added or reloaded, whereas
{@link SchemaTransformations#addKeyspace}
- * only adds and otherwise throws {@code AlreadyExistsException}, so a
caller that means to replace needs a
- * transformation of its own. {@link #submit} is also the wrong follow-up
here: it reports the table in
- * {@code Keyspaces.diff().altered}, which makes {@code
DistributedSchema.initializeKeyspaceInstances} call
- * {@code Keyspace.dropCf} and so initialize {@code CompactionManager},
which throws in client mode where
- * concurrent_compactors is zero. Rebuild the instances from the committed
metadata instead, which leaves the
- * removed table without a column family store and touches no compaction
machinery.
+ * <p>{@link SchemaTransformations#addKeyspace} only adds, throwing {@code
AlreadyExistsException} otherwise, so
+ * replacing needs its own transformation. {@link #submit} is also wrong
here: it reports the table as altered,
+ * which calls {@code Keyspace.dropCf} and initializes {@code
CompactionManager}, throwing in client mode where
+ * concurrent_compactors is zero. {@link #openKeyspaceInstance} reports
the keyspace as created instead, leaving
+ * the removed table without a column family store and touching no
compaction machinery.
*/
public static void removeTables(SchemaProvider schema, KeyspaceMetadata
keyspaceMetadata)
{
schema.submit(replace(keyspaceMetadata));
- openKeyspaceInstances();
+ openKeyspaceInstance(keyspaceMetadata.name);
}
public static void updateTable(SchemaProvider schema, KeyspaceMetadata
keyspaceMetadata, TableMetadata tableMetadata)
diff --git
a/cassandra-six-zero-types/src/main/java/org/apache/cassandra/spark/reader/AbstractSchemaBuilder.java
b/cassandra-six-zero-types/src/main/java/org/apache/cassandra/spark/reader/AbstractSchemaBuilder.java
index aa1c15e8..a8157e0c 100644
---
a/cassandra-six-zero-types/src/main/java/org/apache/cassandra/spark/reader/AbstractSchemaBuilder.java
+++
b/cassandra-six-zero-types/src/main/java/org/apache/cassandra/spark/reader/AbstractSchemaBuilder.java
@@ -365,7 +365,7 @@ public abstract class AbstractSchemaBuilder
keyspaceName,
replicationFactor.getReplicationStrategy().name(), partitioner);
// Create keyspace instance and also initCf (cfs) for the table.
Cassandra 6.0 holds the keyspace
// instances in the cluster metadata, which
Keyspace.openWithoutSSTables only reads.
- SchemaUpdater.openKeyspaceInstances();
+ SchemaUpdater.openKeyspaceInstance(keyspaceName);
}
}
@@ -417,8 +417,8 @@ public abstract class AbstractSchemaBuilder
else
{
// The keyspace has not yet opened, create/open keyspace
instance and also initCf (cfs) for the
- // table. See SchemaUpdater.openKeyspaceInstances.
- SchemaUpdater.openKeyspaceInstances();
+ // table. See SchemaUpdater.openKeyspaceInstance.
+ SchemaUpdater.openKeyspaceInstance(keyspaceName);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
