add column limit to cli patch by Brian O'Neill; reviewed by jbellis for CASSANDRA-4098
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b79d815 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b79d815 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b79d815 Branch: refs/heads/trunk Commit: 1b79d815555aeb749f17f246a317b05812b6b937 Parents: c8a415a Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 2 12:24:32 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 2 12:24:32 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- src/java/org/apache/cassandra/cli/CliClient.java | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d815/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f7a109f..b90c53d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,10 @@ 1.1.1-dev + * add column limit to cli (CASSANDRA-3012, 4098) * clean up and optimize DataOutputBuffer, used by CQL compression and CompositeType (CASSANDRA-4072) * optimize commitlog checksumming (CASSANDRA-3610) - * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261) + * identify and blacklist corrupted SSTables from future compactions + (CASSANDRA-2261) * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) 1.1-dev http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b79d815/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java index 72fb40d..75d4a14 100644 --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@ -1317,7 +1317,7 @@ public class CliClient String rawStartKey = ""; String rawEndKey = ""; int limitCount = Integer.MAX_VALUE; // will reset to default later if it's not specified - int columnCount = Integer.MAX_VALUE; + int columnCount = Integer.MAX_VALUE; // will reset to default later if it's not specified boolean reversed = false; // optional arguments: key range and limit @@ -1383,6 +1383,12 @@ public class CliClient limitCount = 100; sessionState.out.println("Using default limit of 100"); } + if (columnCount == Integer.MAX_VALUE) + { + columnCount = 100; + sessionState.out.println("Using default column limit of 100"); + } + CfDef columnFamilyDef = getCfDef(columnFamily);