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

improve lazy lookup of keyspace/column family metadata 

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2009-12-05 05:27:38 +00:00
parent 43cc5b1aef
commit bf6ac62695
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public class CliClient
{
private Cassandra.Client thriftClient_ = null;
private CliSessionState css_ = null;
Map<String, Map<String, String>> columnFamiliesMap;
private Map<String, Map<String, Map<String, String>>> keyspacesMap = new HashMap<String, Map<String,Map<String,String>>>();
public CliClient(CliSessionState css, Cassandra.Client thriftClient)
{
@ -126,6 +126,15 @@ public class CliClient
CliMain.disconnect();
System.exit(0);
}
Map<String, Map<String, String>> getCFMetaData(String keyspace) throws NotFoundException, TException
{
// Lazily lookup column family meta-data.
if (!(keyspacesMap.containsKey(keyspace)))
keyspacesMap.put(keyspace, thriftClient_.describe_keyspace(keyspace));
return keyspacesMap.get(keyspace);
}
private void executeCount(CommonTree ast) throws TException, InvalidRequestException, UnavailableException, TimedOutException
{
if (!CliMain.isConnected())
@ -238,13 +247,15 @@ public class CliClient
String tableName = CliCompiler.getTableName(columnFamilySpec);
String key = CliCompiler.getKey(columnFamilySpec);
String columnFamily = CliCompiler.getColumnFamily(columnFamilySpec);
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
// Lazily lookup column family meta-data.
if (columnFamiliesMap == null)
columnFamiliesMap = thriftClient_.describe_keyspace(tableName);
if (!(getCFMetaData(tableName).containsKey(columnFamily)))
{
css_.out.println("No such column family: " + columnFamily);
return;
}
boolean isSuper = columnFamiliesMap.get(columnFamily).get("Type").equals("Super") ? true : false;
boolean isSuper = getCFMetaData(tableName).get(columnFamily).get("Type").equals("Super") ? true : false;
byte[] superColumnName = null;
byte[] columnName = null;