Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e36d2333 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36d2333 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e36d2333 Branch: refs/heads/cassandra-3.5 Commit: e36d2333c770d26c03ce7a5ca99676ac1f75c0b8 Parents: fc6b2b3 0a5e220 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Mar 16 11:15:57 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Mar 16 11:15:57 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/SerializationHeader.java | 2 +- .../org/apache/cassandra/tools/SSTableExport.java | 14 ++++++++------ .../apache/cassandra/tools/SSTableMetadataViewer.java | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36d2333/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7acb24d,28de247..1ff4e6d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.5 +3.5 +Merged from 3.0: + * SSTableExport supports secondary index tables (CASSANDRA-11330) * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36d2333/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java index 25e6a8f,3728d34..04e148a --- a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java +++ b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java @@@ -121,30 -82,6 +121,30 @@@ public class SSTableMetadataViewe { out.printf("Estimated cardinality: %s%n", compaction.cardinalityEstimator.cardinality()); } + if (header != null) + { + EncodingStats encodingStats = header.getEncodingStats(); - AbstractType<?> keyType = header.getKetType(); ++ AbstractType<?> keyType = header.getKeyType(); + List<AbstractType<?>> clusteringTypes = header.getClusteringTypes(); + Map<ByteBuffer, AbstractType<?>> staticColumns = header.getStaticColumns(); + Map<String, String> statics = staticColumns.entrySet().stream() + .collect(Collectors.toMap( + e -> UTF8Type.instance.getString(e.getKey()), + e -> e.getValue().toString())); + Map<ByteBuffer, AbstractType<?>> regularColumns = header.getRegularColumns(); + Map<String, String> regulars = regularColumns.entrySet().stream() + .collect(Collectors.toMap( + e -> UTF8Type.instance.getString(e.getKey()), + e -> e.getValue().toString())); + + out.printf("EncodingStats minTTL: %s%n", encodingStats.minTTL); + out.printf("EncodingStats minLocalDeletionTime: %s%n", encodingStats.minLocalDeletionTime); + out.printf("EncodingStats minTimestamp: %s%n", encodingStats.minTimestamp); + out.printf("KeyType: %s%n", keyType.toString()); + out.printf("ClusteringTypes: %s%n", clusteringTypes.toString()); + out.printf("StaticColumns: {%s}%n", FBUtilities.toString(statics)); + out.printf("RegularColumns: {%s}%n", FBUtilities.toString(regulars)); + } } else {
