Make all existing virtual tables use LocalPartitioner

patch by Chris Lohfink; reviewed by Aleksey Yeschenko for CASSANDRA-14640
apache · Aug 14, 2018 · 35750e8 · 35750e8
1 parent ed80659
commit 35750e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Make all existing virtual tables use LocalPartitioner (CASSANDRA-14640)
  * Revert 4.0 GC alg back to CMS (CASANDRA-14636)
  * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627)
  * Update netty to 4.1.128 (CASSANDRA-14633)

diff --git a/src/java/org/apache/cassandra/db/virtual/ClientsTable.java b/src/java/org/apache/cassandra/db/virtual/ClientsTable.java
@@ -20,6 +20,7 @@
 import java.net.InetSocketAddress;
 
 import org.apache.cassandra.db.marshal.*;
+import org.apache.cassandra.dht.LocalPartitioner;
 import org.apache.cassandra.metrics.ClientMetrics;
 import org.apache.cassandra.schema.TableMetadata;
 import org.apache.cassandra.transport.ConnectedClient;
@@ -44,6 +45,7 @@ final class ClientsTable extends AbstractVirtualTable
         super(TableMetadata.builder(keyspace, "clients")
                            .comment("currently connected clients")
                            .kind(TableMetadata.Kind.VIRTUAL)
+                           .partitioner(new LocalPartitioner(InetAddressType.instance))
                            .addPartitionKeyColumn(ADDRESS, InetAddressType.instance)
                            .addClusteringColumn(PORT, Int32Type.instance)
                            .addRegularColumn(HOSTNAME, UTF8Type.instance)

diff --git a/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java b/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java
@@ -22,6 +22,7 @@
 import org.apache.cassandra.db.marshal.LongType;
 import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.dht.LocalPartitioner;
 import org.apache.cassandra.schema.TableMetadata;
 
 final class SSTableTasksTable extends AbstractVirtualTable
@@ -39,6 +40,7 @@ final class SSTableTasksTable extends AbstractVirtualTable
         super(TableMetadata.builder(keyspace, "sstable_tasks")
                            .comment("current sstable tasks")
                            .kind(TableMetadata.Kind.VIRTUAL)
+                           .partitioner(new LocalPartitioner(UTF8Type.instance))
                            .addPartitionKeyColumn(KEYSPACE_NAME, UTF8Type.instance)
                            .addClusteringColumn(TABLE_NAME, UTF8Type.instance)
                            .addClusteringColumn(TASK_ID, UUIDType.instance)

diff --git a/src/java/org/apache/cassandra/db/virtual/VirtualSchemaKeyspace.java b/src/java/org/apache/cassandra/db/virtual/VirtualSchemaKeyspace.java
@@ -22,6 +22,7 @@
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.dht.LocalPartitioner;
 import org.apache.cassandra.schema.ColumnMetadata;
 import org.apache.cassandra.schema.KeyspaceMetadata;
 import org.apache.cassandra.schema.Schema;
@@ -49,6 +50,7 @@ private VirtualKeyspaces(String keyspace)
             super(builder(keyspace, "keyspaces")
                  .comment("virtual keyspace definitions")
                  .kind(TableMetadata.Kind.VIRTUAL)
+                 .partitioner(new LocalPartitioner(UTF8Type.instance))
                  .addPartitionKeyColumn(KEYSPACE_NAME, UTF8Type.instance)
                  .build());
         }
@@ -73,6 +75,7 @@ private VirtualTables(String keyspace)
             super(builder(keyspace, "tables")
                  .comment("virtual table definitions")
                  .kind(TableMetadata.Kind.VIRTUAL)
+                 .partitioner(new LocalPartitioner(UTF8Type.instance))
                  .addPartitionKeyColumn(KEYSPACE_NAME, UTF8Type.instance)
                  .addClusteringColumn(TABLE_NAME, UTF8Type.instance)
                  .addRegularColumn(COMMENT, UTF8Type.instance)
@@ -112,6 +115,7 @@ private VirtualColumns(String keyspace)
             super(builder(keyspace, "columns")
                  .comment("virtual column definitions")
                  .kind(TableMetadata.Kind.VIRTUAL)
+                 .partitioner(new LocalPartitioner(UTF8Type.instance))
                  .addPartitionKeyColumn(KEYSPACE_NAME, UTF8Type.instance)
                  .addClusteringColumn(TABLE_NAME, UTF8Type.instance)
                  .addClusteringColumn(COLUMN_NAME, UTF8Type.instance)