This is an automated email from the ASF dual-hosted git repository. aleksey pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push: new 8202845 Document 4.0 system keyspace changes, bump generations 8202845 is described below commit 8202845facd741f01fbfbbec93d6a3c8e6078644 Author: Aleksey Yeshchenko <alek...@apache.org> AuthorDate: Mon Dec 9 15:32:35 2019 +0000 Document 4.0 system keyspace changes, bump generations patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for CASSANRA-15454 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/AuthKeyspace.java | 15 ++++++++------- .../cassandra/repair/SystemDistributedKeyspace.java | 3 ++- .../org/apache/cassandra/schema/CompressionParams.java | 1 - src/java/org/apache/cassandra/tracing/TraceKeyspace.java | 5 ++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b88a65b..6783b2c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0-alpha3 + * Document 4.0 system keyspace changes, bump generations (CASSANDRA-15454) * Make it possible to disable STCS-in-L0 during runtime (CASSANDRA-15445) * Removed obsolete OldNetworkTopologyStrategy (CASSANDRA-13990) * Align record header of FQL and audit binary log (CASSANDRA-15076) diff --git a/src/java/org/apache/cassandra/auth/AuthKeyspace.java b/src/java/org/apache/cassandra/auth/AuthKeyspace.java index 750900e..a57257c 100644 --- a/src/java/org/apache/cassandra/auth/AuthKeyspace.java +++ b/src/java/org/apache/cassandra/auth/AuthKeyspace.java @@ -41,8 +41,9 @@ public final class AuthKeyspace * generation and document your change here. * * gen 0: original definition in 3.0 + * gen 1: compression chunk length reduced to 16KiB, memtable_flush_period_in_ms now unset on all tables in 4.0 */ - public static final long GENERATION = 0; + public static final long GENERATION = 1; public static final String ROLES = "roles"; public static final String ROLE_MEMBERS = "role_members"; @@ -89,12 +90,12 @@ public final class AuthKeyspace + "PRIMARY KEY(resource, role))"); private static final TableMetadata NetworkPermissions = - parse(NETWORK_PERMISSIONS, - "user network permissions", - "CREATE TABLE %s (" - + "role text, " - + "dcs frozen<set<text>>, " - + "PRIMARY KEY(role))"); + parse(NETWORK_PERMISSIONS, + "user network permissions", + "CREATE TABLE %s (" + + "role text, " + + "dcs frozen<set<text>>, " + + "PRIMARY KEY(role))"); private static TableMetadata parse(String name, String description, String cql) { diff --git a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java index 3c26bca..a28a637 100644 --- a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java +++ b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java @@ -76,8 +76,9 @@ public final class SystemDistributedKeyspace * gen 1: (pre-)add options column to parent_repair_history in 3.0, 3.11 * gen 2: (pre-)add coordinator_port and participants_v2 columns to repair_history in 3.0, 3.11, 4.0 * gen 3: gc_grace_seconds raised from 0 to 10 days in CASSANDRA-12954 in 3.11.0 + * gen 4: compression chunk length reduced to 16KiB, memtable_flush_period_in_ms now unset on all tables in 4.0 */ - public static final long GENERATION = 3; + public static final long GENERATION = 4; public static final String REPAIR_HISTORY = "repair_history"; diff --git a/src/java/org/apache/cassandra/schema/CompressionParams.java b/src/java/org/apache/cassandra/schema/CompressionParams.java index 102edd8..21bea74 100644 --- a/src/java/org/apache/cassandra/schema/CompressionParams.java +++ b/src/java/org/apache/cassandra/schema/CompressionParams.java @@ -42,7 +42,6 @@ import org.apache.cassandra.io.compress.*; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.streaming.messages.StreamMessage; import static java.lang.String.format; diff --git a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java index a48c4dd..8c6d8c8 100644 --- a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java +++ b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java @@ -20,7 +20,6 @@ package org.apache.cassandra.tracing; import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.*; -import java.util.concurrent.TimeUnit; import org.apache.cassandra.cql3.statements.schema.CreateTableStatement; import org.apache.cassandra.db.Mutation; @@ -53,12 +52,13 @@ public final class TraceKeyspace * will ever start; see the note below for why this is necessary; actual change in 3.0: * removed default ttl, reduced bloom filter fp chance from 0.1 to 0.01. * gen 1577836800000001: (pre-)adds coordinator_port column to sessions and source_port column to events in 3.0, 3.11, 4.0 + * gen 1577836800000002: compression chunk length reduced to 16KiB, memtable_flush_period_in_ms now unset on all tables in 4.0 * * * Until CASSANDRA-6016 (Oct 13, 2.0.2) and in all of 1.2, we used to create system_traces keyspace and * tables in the same way that we created the purely local 'system' keyspace - using current time on node bounce * (+1). For new definitions to take, we need to bump the generation further than that. */ - public static final long GENERATION = 1577836800000001L; + public static final long GENERATION = 1577836800000002L; public static final String SESSIONS = "sessions"; public static final String EVENTS = "events"; @@ -96,7 +96,6 @@ public final class TraceKeyspace return CreateTableStatement.parse(format(cql, table), SchemaConstants.TRACE_KEYSPACE_NAME) .id(TableId.forSystemTable(SchemaConstants.TRACE_KEYSPACE_NAME, table)) .gcGraceSeconds(0) - .memtableFlushPeriod((int) TimeUnit.HOURS.toMillis(1)) .comment(description) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org