svn commit: r1029355 - in /cassandra/trunk/src/java/org/apache/cassandra/cli: CliClient.java CliUserHelp.java

[ee...@apache.org]

Author: eevans
Date: Sun Oct 31 14:35:28 2010
New Revision: 1029355

URL: http://svn.apache.org/viewvc?rev=1029355&view=rev
Log:
merge from 0.7

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1029355&r1=1029354&r2=1029355&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Sun Oct 31 14:35:28 2010
@@ -973,6 +973,30 @@ public class CliClient extends CliUserHe
 >>>>>>> merge from 0.7
     }
 
+    // TRUNCATE <columnFamily>
+    private void executeTruncate(String columnFamily)
+    {
+        if (!CliMain.isConnected() || !hasKeySpace())
+            return;
+
+        // getting CfDef, it will fail if there is no such column family in current keySpace. 
+        CfDef cfDef = getCfDef(columnFamily);
+
+        try
+        {
+            thriftClient.truncate(cfDef.getName());
+            sessionState.out.println(columnFamily + " truncated.");
+        }
+        catch (InvalidRequestException e)
+        {
+            throw new RuntimeException(e.getWhy());
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
     // SHOW API VERSION
     private void executeShowVersion() throws TException
     {

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1029355&r1=1029354&r2=1029355&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java Sun Oct 31 14:35:28 2010
@@ -331,12 +331,8 @@ public class CliUserHelp {
             state.out.println("del <cf>['<key>']['<super>']['<col>']                         Delete sub column.");
             state.out.println("count <cf>['<key>']                                     Count columns in record.");
             state.out.println("count <cf>['<key>']['<super>']                  Count columns in a super column.");
-<<<<<<< HEAD
             state.out.println("truncate <column_family>                       Truncate specified column family.");            
             state.out.println("list <cf>                                    List all rows in the column family.");
-=======
-            state.out.println("list <cf>                                  List all rows in the column family.");
->>>>>>> merge from 0.7
             state.out.println("list <cf>[<startKey>:]");
             state.out.println("                       List rows in the column family beginning with <startKey>.");
             state.out.println("list <cf>[<startKey>:<endKey>]");