Github user aweisberg commented on a diff in the pull request:
https://github.com/apache/cassandra/pull/184#discussion_r163301627
--- Diff: src/java/org/apache/cassandra/db/SystemKeyspace.java ---
@@ -145,168 +152,218 @@ private SystemKeyspace()
private static final TableMetadata Local =
parse(LOCAL,
- "information about the local node",
- "CREATE TABLE %s ("
- + "key text,"
- + "bootstrapped text,"
- + "broadcast_address inet,"
- + "cluster_name text,"
- + "cql_version text,"
- + "data_center text,"
- + "gossip_generation int,"
- + "host_id uuid,"
- + "listen_address inet,"
- + "native_protocol_version text,"
- + "partitioner text,"
- + "rack text,"
- + "release_version text,"
- + "rpc_address inet,"
- + "schema_version uuid,"
- + "tokens set<varchar>,"
- + "truncated_at map<uuid, blob>,"
- + "PRIMARY KEY ((key)))")
- .recordDeprecatedSystemColumn("thrift_version",
UTF8Type.instance)
- .build();
-
- private static final TableMetadata Peers =
- parse(PEERS,
- "information about known peers in the cluster",
- "CREATE TABLE %s ("
- + "peer inet,"
- + "data_center text,"
- + "host_id uuid,"
- + "preferred_ip inet,"
- + "rack text,"
- + "release_version text,"
- + "rpc_address inet,"
- + "schema_version uuid,"
- + "tokens set<varchar>,"
- + "PRIMARY KEY ((peer)))")
- .build();
-
- private static final TableMetadata PeerEvents =
- parse(PEER_EVENTS,
- "events related to peers",
- "CREATE TABLE %s ("
- + "peer inet,"
- + "hints_dropped map<uuid, int>,"
- + "PRIMARY KEY ((peer)))")
- .build();
+ "information about the local node",
+ "CREATE TABLE %s ("
+ + "key text,"
+ + "bootstrapped text,"
+ + "broadcast_address inet,"
+ + "broadcast_port int,"
+ + "cluster_name text,"
+ + "cql_version text,"
+ + "data_center text,"
+ + "gossip_generation int,"
+ + "host_id uuid,"
+ + "listen_address inet,"
+ + "listen_port int,"
+ + "native_protocol_version text,"
+ + "partitioner text,"
+ + "rack text,"
+ + "release_version text,"
+ + "rpc_address inet,"
+ + "rpc_port int,"
+ + "schema_version uuid,"
+ + "tokens set<varchar>,"
+ + "truncated_at map<uuid, blob>,"
+ + "PRIMARY KEY ((key)))"
+ ).recordDeprecatedSystemColumn("thrift_version",
UTF8Type.instance)
+ .build();
+
+ private static final TableMetadata PeersV2 =
+ parse(PEERS_V2,
+ "information about known peers in the cluster",
+ "CREATE TABLE %s ("
+ + "peer inet,"
+ + "peer_port int,"
+ + "data_center text,"
+ + "host_id uuid,"
+ + "preferred_ip inet,"
+ + "preferred_port int,"
+ + "rack text,"
+ + "release_version text,"
+ + "native_address inet,"
+ + "native_port int,"
+ + "schema_version uuid,"
+ + "tokens set<varchar>,"
+ + "PRIMARY KEY ((peer), peer_port))")
+ .build();
+
+ private static final TableMetadata PeerEventsV2 =
+ parse(PEER_EVENTS_V2,
+ "events related to peers",
+ "CREATE TABLE %s ("
+ + "peer inet,"
+ + "peer_port int,"
+ + "hints_dropped map<uuid, int>,"
+ + "PRIMARY KEY ((peer), peer_port))")
+ .build();
private static final TableMetadata RangeXfers =
parse(RANGE_XFERS,
- "ranges requested for transfer",
- "CREATE TABLE %s ("
- + "token_bytes blob,"
- + "requested_at timestamp,"
- + "PRIMARY KEY ((token_bytes)))")
- .build();
+ "ranges requested for transfer",
+ "CREATE TABLE %s ("
+ + "token_bytes blob,"
+ + "requested_at timestamp,"
+ + "PRIMARY KEY ((token_bytes)))")
+ .build();
private static final TableMetadata CompactionHistory =
parse(COMPACTION_HISTORY,
- "week-long compaction history",
- "CREATE TABLE %s ("
- + "id uuid,"
- + "bytes_in bigint,"
- + "bytes_out bigint,"
- + "columnfamily_name text,"
- + "compacted_at timestamp,"
- + "keyspace_name text,"
- + "rows_merged map<int, bigint>,"
- + "PRIMARY KEY ((id)))")
- .defaultTimeToLive((int) TimeUnit.DAYS.toSeconds(7))
- .build();
+ "week-long compaction history",
+ "CREATE TABLE %s ("
+ + "id uuid,"
+ + "bytes_in bigint,"
+ + "bytes_out bigint,"
+ + "columnfamily_name text,"
+ + "compacted_at timestamp,"
+ + "keyspace_name text,"
+ + "rows_merged map<int, bigint>,"
+ + "PRIMARY KEY ((id)))")
+ .defaultTimeToLive((int) TimeUnit.DAYS.toSeconds(7))
+ .build();
private static final TableMetadata SSTableActivity =
parse(SSTABLE_ACTIVITY,
- "historic sstable read rates",
- "CREATE TABLE %s ("
- + "keyspace_name text,"
- + "columnfamily_name text,"
- + "generation int,"
- + "rate_120m double,"
- + "rate_15m double,"
- + "PRIMARY KEY ((keyspace_name, columnfamily_name,
generation)))")
- .build();
+ "historic sstable read rates",
+ "CREATE TABLE %s ("
+ + "keyspace_name text,"
+ + "columnfamily_name text,"
+ + "generation int,"
+ + "rate_120m double,"
+ + "rate_15m double,"
+ + "PRIMARY KEY ((keyspace_name, columnfamily_name,
generation)))")
+ .build();
private static final TableMetadata SizeEstimates =
parse(SIZE_ESTIMATES,
- "per-table primary range size estimates",
- "CREATE TABLE %s ("
- + "keyspace_name text,"
- + "table_name text,"
- + "range_start text,"
- + "range_end text,"
- + "mean_partition_size bigint,"
- + "partitions_count bigint,"
- + "PRIMARY KEY ((keyspace_name), table_name, range_start,
range_end))")
- .build();
+ "per-table primary range size estimates",
+ "CREATE TABLE %s ("
+ + "keyspace_name text,"
+ + "table_name text,"
+ + "range_start text,"
+ + "range_end text,"
+ + "mean_partition_size bigint,"
+ + "partitions_count bigint,"
+ + "PRIMARY KEY ((keyspace_name), table_name, range_start,
range_end))")
+ .gcGraceSeconds(0)
--- End diff --
This is also not supposed to be here anymore.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
