natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

super column support for deletes 

Patch by eevans; reviewed by jbellis

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888628 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2009-12-08 23:33:51 +00:00
parent 81cb157bd3
commit 44bd6cfe6a
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/java/org/apache/cassandra/cli/CliClient.java
View File

@ -26,6 +26,7 @@ import java.util.*;
import java.io.UnsupportedEncodingException;
import org.apache.commons.lang.ArrayUtils;
import org.hamcrest.core.IsSame;
// Cli Client Side Library
public class CliClient
@ -121,7 +122,8 @@ public class CliClient
css_.out.println("set <ksp>.<cf>['<key>']['<super>']['<col>'] = '<value>' Set a sub column.");
css_.out.println("del <ksp>.<cf>['<key>'] Delete record.");
css_.out.println("del <ksp>.<cf>['<key>']['<col>'] Delete column.");
css_.out.println("count <ksp>.<cf>['<key>'] Count columns in row.");
css_.out.println("del <ksp>.<cf>['<key>']['<super>']['<col>'] Delete sub column.");
css_.out.println("count <ksp>.<cf>['<key>'] Count columns in record.");
}
private void cleanupAndExit()
@ -184,22 +186,49 @@ public class CliClient
String columnFamily = CliCompiler.getColumnFamily(columnFamilySpec);
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
// assume simple columnFamily for now
String columnName = null;
final byte[] name;
if (columnSpecCnt == 0)
byte[] superColumnName = null;
byte[] columnName = null;
boolean isSuper;
try
{
// table.cf['key']
name = null;
if (!(getCFMetaData(tableName).containsKey(columnFamily)))
{
css_.out.println("No such column family: " + columnFamily);
return;
}
isSuper = getCFMetaData(tableName).get(columnFamily).get("Type").equals("Super") ? true : false;
}
else
catch (NotFoundException nfe)
{
css_.out.printf("No such keyspace: %s\n", tableName);
return;
}
if ((columnSpecCnt < 0) || (columnSpecCnt > 2))
{
css_.out.println("Invalid row, super column, or column specification.");
return;
}
if (columnSpecCnt == 1)
{
assert columnSpecCnt == 1;
// table.cf['key']['column']
columnName = CliCompiler.getColumn(columnFamilySpec, 0);
name = columnName.getBytes("UTF-8");
if (isSuper)
superColumnName = CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8");
else
columnName = CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8");
}
thriftClient_.remove(tableName, key, new ColumnPath(columnFamily, null, name), System.currentTimeMillis(), ConsistencyLevel.ONE);
else if (columnSpecCnt == 2)
{
// table.cf['key']['column']['column']
superColumnName = CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8");
columnName = CliCompiler.getColumn(columnFamilySpec, 1).getBytes("UTF-8");
}
thriftClient_.remove(tableName, key, new ColumnPath(columnFamily, superColumnName, columnName),
System.currentTimeMillis(), ConsistencyLevel.ONE);
css_.out.println(String.format("%s removed.", (columnSpecCnt == 0) ? "row" : "column"));
}