You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/14 18:37:01 UTC
[1/9] git commit: NEWS
Updated Branches:
refs/heads/cassandra-2.0 65f189b9d -> dd13281c2
refs/heads/cassandra-2.0.0 830507b03 -> 1db8a221b
refs/heads/trunk 633cfbc7c -> e3308a164
NEWS
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82fc8711
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82fc8711
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82fc8711
Branch: refs/heads/cassandra-2.0
Commit: 82fc87115948cc5349cc5e046977260ac3d5880a
Parents: 830507b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 12 15:28:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:13:35 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82fc8711/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index c608e03..81b5e12 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -18,14 +18,14 @@ using the provided 'sstableupgrade' tool.
Upgrading
---------
- - CAS and new features in CQL such as DROP COLUMN assume that cell
- timestamps are microseconds-since-epoch. Do not use these
- features if you are using client-specified timestamps with some
- other source.
- Upgrading is ONLY supported from Cassandra 1.2.9 or later. This
goes for sstable compatibility as well as network. When
upgrading from an earlier release, upgrade to 1.2.9 first and
run upgradesstables before proceeding to 2.0.
+ - CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
- Replication and strategy options do not accept unknown options anymore.
This was already the case for CQL3 in 1.2 but this is now the case for
thrift too.
@@ -75,6 +75,8 @@ Operations
Features
--------
+ - Lightweight transactions
+ (http://www.datastax.com/dev/blog/lightweight-transactions-in-cassandra-2-0)
- Alias support has been added to CQL3 SELECT statement. Refer to
CQL3 documentation (http://cassandra.apache.org/doc/cql3/CQL.html) for details.
- JEMalloc support (see memory_allocator in cassandra.yaml)
[7/9] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd13281c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd13281c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd13281c
Branch: refs/heads/trunk
Commit: dd13281c253b38029141715efc64738355391469
Parents: 65f189b 1db8a22
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:37 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:37 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++--
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
2 files changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[4/9] git commit: clean up cfstats/cfhistograms output
Posted by jb...@apache.org.
clean up cfstats/cfhistograms output
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1db8a221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1db8a221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1db8a221
Branch: refs/heads/cassandra-2.0
Commit: 1db8a221b30362d11799b20bf1b699d28022114a
Parents: 82fc871
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:22 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
1 file changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1db8a221/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 1d415a8..a88c908 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -78,7 +78,7 @@ public class NodeCmd
static
{
- options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified column family");
+ options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified table (column family)");
options.addOption(HOST_OPT, true, "node hostname or ip address");
options.addOption(PORT_OPT, true, "remote jmx agent port number");
options.addOption(USERNAME_OPT, true, "remote jmx agent username");
@@ -690,7 +690,7 @@ public class NodeCmd
CompactionManagerMBean cm = probe.getCompactionManagerProxy();
outs.println("pending tasks: " + cm.getPendingTasks());
if (cm.getCompactions().size() > 0)
- outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "column family", "completed", "total", "unit", "progress");
+ outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "table", "completed", "total", "unit", "progress");
long remainingBytes = 0;
for (Map<String, String> c : cm.getCompactions())
{
@@ -813,9 +813,9 @@ public class NodeCmd
{
String cfName = cfstore.getColumnFamilyName();
if(cfName.contains("."))
- outs.println("\t\tColumn Family (index): " + cfName);
+ outs.println("\t\tTable (index): " + cfName);
else
- outs.println("\t\tColumn Family: " + cfName);
+ outs.println("\t\tTable: " + cfName);
outs.println("\t\tSSTable count: " + cfstore.getLiveSSTableCount());
int[] leveledSStables = cfstore.getSSTableCountPerLevel();
@@ -839,23 +839,23 @@ public class NodeCmd
outs.println("]");
}
}
- outs.println("\t\tSpace used (live): " + cfstore.getLiveDiskSpaceUsed());
- outs.println("\t\tSpace used (total): " + cfstore.getTotalDiskSpaceUsed());
- outs.println("\t\tNumber of Keys (estimate): " + cfstore.estimateKeys());
- outs.println("\t\tMemtable Columns Count: " + cfstore.getMemtableColumnsCount());
- outs.println("\t\tMemtable Data Size: " + cfstore.getMemtableDataSize());
- outs.println("\t\tMemtable Switch Count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead Count: " + cfstore.getReadCount());
- outs.println("\t\tRead Latency: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite Count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite Latency: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tPending Tasks: " + cfstore.getPendingTasks());
- outs.println("\t\tBloom Filter False Positives: " + cfstore.getBloomFilterFalsePositives());
- outs.println("\t\tBloom Filter False Ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
- outs.println("\t\tBloom Filter Space Used: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted row minimum size: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted row maximum size: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted row mean size: " + cfstore.getMeanRowSize());
+ outs.println("\t\tSpace used (live), bytes: " + cfstore.getLiveDiskSpaceUsed());
+ outs.println("\t\tSpace used (total), bytes: " + cfstore.getTotalDiskSpaceUsed());
+ outs.println("\t\tNumber of keys (estimate): " + cfstore.estimateKeys());
+ outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
+ outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
+ outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
+ outs.println("\t\tRead count: " + cfstore.getReadCount());
+ outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tWrite count: " + cfstore.getWriteCount());
+ outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
+ outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
+ outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
+ outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
+ outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
@@ -884,7 +884,9 @@ public class NodeCmd
output.println(String.format("%s/%s histograms", keySpace, columnFamily));
output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "Offset", "SSTables", "Write Latency", "Read Latency", "Row Size", "Column Count"));
+ "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "", "", "(micros)", "(micros)", "(bytes)", ""));
for (int i = 0; i < offsets.length; i++)
{
@@ -1358,7 +1360,7 @@ public class NodeCmd
if (columnFamily != null)
{
- System.out.print("and column family: " + columnFamily);
+ System.out.print("and table: " + columnFamily);
}
System.out.println();
[8/9] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd13281c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd13281c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd13281c
Branch: refs/heads/cassandra-2.0
Commit: dd13281c253b38029141715efc64738355391469
Parents: 65f189b 1db8a22
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:37 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:37 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++--
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
2 files changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[5/9] git commit: clean up cfstats/cfhistograms output
Posted by jb...@apache.org.
clean up cfstats/cfhistograms output
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1db8a221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1db8a221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1db8a221
Branch: refs/heads/cassandra-2.0.0
Commit: 1db8a221b30362d11799b20bf1b699d28022114a
Parents: 82fc871
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:22 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
1 file changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1db8a221/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 1d415a8..a88c908 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -78,7 +78,7 @@ public class NodeCmd
static
{
- options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified column family");
+ options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified table (column family)");
options.addOption(HOST_OPT, true, "node hostname or ip address");
options.addOption(PORT_OPT, true, "remote jmx agent port number");
options.addOption(USERNAME_OPT, true, "remote jmx agent username");
@@ -690,7 +690,7 @@ public class NodeCmd
CompactionManagerMBean cm = probe.getCompactionManagerProxy();
outs.println("pending tasks: " + cm.getPendingTasks());
if (cm.getCompactions().size() > 0)
- outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "column family", "completed", "total", "unit", "progress");
+ outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "table", "completed", "total", "unit", "progress");
long remainingBytes = 0;
for (Map<String, String> c : cm.getCompactions())
{
@@ -813,9 +813,9 @@ public class NodeCmd
{
String cfName = cfstore.getColumnFamilyName();
if(cfName.contains("."))
- outs.println("\t\tColumn Family (index): " + cfName);
+ outs.println("\t\tTable (index): " + cfName);
else
- outs.println("\t\tColumn Family: " + cfName);
+ outs.println("\t\tTable: " + cfName);
outs.println("\t\tSSTable count: " + cfstore.getLiveSSTableCount());
int[] leveledSStables = cfstore.getSSTableCountPerLevel();
@@ -839,23 +839,23 @@ public class NodeCmd
outs.println("]");
}
}
- outs.println("\t\tSpace used (live): " + cfstore.getLiveDiskSpaceUsed());
- outs.println("\t\tSpace used (total): " + cfstore.getTotalDiskSpaceUsed());
- outs.println("\t\tNumber of Keys (estimate): " + cfstore.estimateKeys());
- outs.println("\t\tMemtable Columns Count: " + cfstore.getMemtableColumnsCount());
- outs.println("\t\tMemtable Data Size: " + cfstore.getMemtableDataSize());
- outs.println("\t\tMemtable Switch Count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead Count: " + cfstore.getReadCount());
- outs.println("\t\tRead Latency: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite Count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite Latency: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tPending Tasks: " + cfstore.getPendingTasks());
- outs.println("\t\tBloom Filter False Positives: " + cfstore.getBloomFilterFalsePositives());
- outs.println("\t\tBloom Filter False Ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
- outs.println("\t\tBloom Filter Space Used: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted row minimum size: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted row maximum size: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted row mean size: " + cfstore.getMeanRowSize());
+ outs.println("\t\tSpace used (live), bytes: " + cfstore.getLiveDiskSpaceUsed());
+ outs.println("\t\tSpace used (total), bytes: " + cfstore.getTotalDiskSpaceUsed());
+ outs.println("\t\tNumber of keys (estimate): " + cfstore.estimateKeys());
+ outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
+ outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
+ outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
+ outs.println("\t\tRead count: " + cfstore.getReadCount());
+ outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tWrite count: " + cfstore.getWriteCount());
+ outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
+ outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
+ outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
+ outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
+ outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
@@ -884,7 +884,9 @@ public class NodeCmd
output.println(String.format("%s/%s histograms", keySpace, columnFamily));
output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "Offset", "SSTables", "Write Latency", "Read Latency", "Row Size", "Column Count"));
+ "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "", "", "(micros)", "(micros)", "(bytes)", ""));
for (int i = 0; i < offsets.length; i++)
{
@@ -1358,7 +1360,7 @@ public class NodeCmd
if (columnFamily != null)
{
- System.out.print("and column family: " + columnFamily);
+ System.out.print("and table: " + columnFamily);
}
System.out.println();
[6/9] git commit: clean up cfstats/cfhistograms output
Posted by jb...@apache.org.
clean up cfstats/cfhistograms output
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1db8a221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1db8a221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1db8a221
Branch: refs/heads/trunk
Commit: 1db8a221b30362d11799b20bf1b699d28022114a
Parents: 82fc871
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:22 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
1 file changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1db8a221/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 1d415a8..a88c908 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -78,7 +78,7 @@ public class NodeCmd
static
{
- options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified column family");
+ options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified table (column family)");
options.addOption(HOST_OPT, true, "node hostname or ip address");
options.addOption(PORT_OPT, true, "remote jmx agent port number");
options.addOption(USERNAME_OPT, true, "remote jmx agent username");
@@ -690,7 +690,7 @@ public class NodeCmd
CompactionManagerMBean cm = probe.getCompactionManagerProxy();
outs.println("pending tasks: " + cm.getPendingTasks());
if (cm.getCompactions().size() > 0)
- outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "column family", "completed", "total", "unit", "progress");
+ outs.printf("%25s%16s%16s%16s%16s%10s%10s%n", "compaction type", "keyspace", "table", "completed", "total", "unit", "progress");
long remainingBytes = 0;
for (Map<String, String> c : cm.getCompactions())
{
@@ -813,9 +813,9 @@ public class NodeCmd
{
String cfName = cfstore.getColumnFamilyName();
if(cfName.contains("."))
- outs.println("\t\tColumn Family (index): " + cfName);
+ outs.println("\t\tTable (index): " + cfName);
else
- outs.println("\t\tColumn Family: " + cfName);
+ outs.println("\t\tTable: " + cfName);
outs.println("\t\tSSTable count: " + cfstore.getLiveSSTableCount());
int[] leveledSStables = cfstore.getSSTableCountPerLevel();
@@ -839,23 +839,23 @@ public class NodeCmd
outs.println("]");
}
}
- outs.println("\t\tSpace used (live): " + cfstore.getLiveDiskSpaceUsed());
- outs.println("\t\tSpace used (total): " + cfstore.getTotalDiskSpaceUsed());
- outs.println("\t\tNumber of Keys (estimate): " + cfstore.estimateKeys());
- outs.println("\t\tMemtable Columns Count: " + cfstore.getMemtableColumnsCount());
- outs.println("\t\tMemtable Data Size: " + cfstore.getMemtableDataSize());
- outs.println("\t\tMemtable Switch Count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead Count: " + cfstore.getReadCount());
- outs.println("\t\tRead Latency: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite Count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite Latency: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tPending Tasks: " + cfstore.getPendingTasks());
- outs.println("\t\tBloom Filter False Positives: " + cfstore.getBloomFilterFalsePositives());
- outs.println("\t\tBloom Filter False Ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
- outs.println("\t\tBloom Filter Space Used: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted row minimum size: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted row maximum size: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted row mean size: " + cfstore.getMeanRowSize());
+ outs.println("\t\tSpace used (live), bytes: " + cfstore.getLiveDiskSpaceUsed());
+ outs.println("\t\tSpace used (total), bytes: " + cfstore.getTotalDiskSpaceUsed());
+ outs.println("\t\tNumber of keys (estimate): " + cfstore.estimateKeys());
+ outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
+ outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
+ outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
+ outs.println("\t\tRead count: " + cfstore.getReadCount());
+ outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tWrite count: " + cfstore.getWriteCount());
+ outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
+ outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
+ outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
+ outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
+ outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
@@ -884,7 +884,9 @@ public class NodeCmd
output.println(String.format("%s/%s histograms", keySpace, columnFamily));
output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "Offset", "SSTables", "Write Latency", "Read Latency", "Row Size", "Column Count"));
+ "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "", "", "(micros)", "(micros)", "(bytes)", ""));
for (int i = 0; i < offsets.length; i++)
{
@@ -1358,7 +1360,7 @@ public class NodeCmd
if (columnFamily != null)
{
- System.out.print("and column family: " + columnFamily);
+ System.out.print("and table: " + columnFamily);
}
System.out.println();
[9/9] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3308a16
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3308a16
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3308a16
Branch: refs/heads/trunk
Commit: e3308a1641eea3ce6af9932db7f22ee526448825
Parents: 633cfbc dd13281
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 14 11:36:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:36:52 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++--
.../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++----------
2 files changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[3/9] git commit: NEWS
Posted by jb...@apache.org.
NEWS
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82fc8711
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82fc8711
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82fc8711
Branch: refs/heads/trunk
Commit: 82fc87115948cc5349cc5e046977260ac3d5880a
Parents: 830507b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 12 15:28:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:13:35 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82fc8711/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index c608e03..81b5e12 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -18,14 +18,14 @@ using the provided 'sstableupgrade' tool.
Upgrading
---------
- - CAS and new features in CQL such as DROP COLUMN assume that cell
- timestamps are microseconds-since-epoch. Do not use these
- features if you are using client-specified timestamps with some
- other source.
- Upgrading is ONLY supported from Cassandra 1.2.9 or later. This
goes for sstable compatibility as well as network. When
upgrading from an earlier release, upgrade to 1.2.9 first and
run upgradesstables before proceeding to 2.0.
+ - CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
- Replication and strategy options do not accept unknown options anymore.
This was already the case for CQL3 in 1.2 but this is now the case for
thrift too.
@@ -75,6 +75,8 @@ Operations
Features
--------
+ - Lightweight transactions
+ (http://www.datastax.com/dev/blog/lightweight-transactions-in-cassandra-2-0)
- Alias support has been added to CQL3 SELECT statement. Refer to
CQL3 documentation (http://cassandra.apache.org/doc/cql3/CQL.html) for details.
- JEMalloc support (see memory_allocator in cassandra.yaml)
[2/9] git commit: NEWS
Posted by jb...@apache.org.
NEWS
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82fc8711
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82fc8711
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82fc8711
Branch: refs/heads/cassandra-2.0.0
Commit: 82fc87115948cc5349cc5e046977260ac3d5880a
Parents: 830507b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 12 15:28:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 14 11:13:35 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82fc8711/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index c608e03..81b5e12 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -18,14 +18,14 @@ using the provided 'sstableupgrade' tool.
Upgrading
---------
- - CAS and new features in CQL such as DROP COLUMN assume that cell
- timestamps are microseconds-since-epoch. Do not use these
- features if you are using client-specified timestamps with some
- other source.
- Upgrading is ONLY supported from Cassandra 1.2.9 or later. This
goes for sstable compatibility as well as network. When
upgrading from an earlier release, upgrade to 1.2.9 first and
run upgradesstables before proceeding to 2.0.
+ - CAS and new features in CQL such as DROP COLUMN assume that cell
+ timestamps are microseconds-since-epoch. Do not use these
+ features if you are using client-specified timestamps with some
+ other source.
- Replication and strategy options do not accept unknown options anymore.
This was already the case for CQL3 in 1.2 but this is now the case for
thrift too.
@@ -75,6 +75,8 @@ Operations
Features
--------
+ - Lightweight transactions
+ (http://www.datastax.com/dev/blog/lightweight-transactions-in-cassandra-2-0)
- Alias support has been added to CQL3 SELECT statement. Refer to
CQL3 documentation (http://cassandra.apache.org/doc/cql3/CQL.html) for details.
- JEMalloc support (see memory_allocator in cassandra.yaml)