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 2009/04/22 00:18:08 UTC
svn commit: r767315 -
/incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java
Author: jbellis
Date: Tue Apr 21 22:18:08 2009
New Revision: 767315
URL: http://svn.apache.org/viewvc?rev=767315&view=rev
Log:
RVH should use RC.getRow for correctness and maintainability (in particular the path for get_columns_since was missing). patch by Jun Rao; reviewed by jbellis for #93
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java?rev=767315&r1=767314&r2=767315&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadVerbHandler.java Tue Apr 21 22:18:08 2009
@@ -76,22 +76,7 @@
Table table = Table.open(readCommand.table);
Row row = null;
long start = System.currentTimeMillis();
- if( readCommand.columnFamilyColumn == null )
- row = table.get(readCommand.key);
- else
- {
- if(readCommand.columnNames.size() == 0)
- {
- if(readCommand.count > 0 && readCommand.start >= 0)
- row = table.getRow(readCommand.key, readCommand.columnFamilyColumn, readCommand.start, readCommand.count);
- else
- row = table.getRow(readCommand.key, readCommand.columnFamilyColumn);
- }
- else
- {
- row = table.getRow(readCommand.key, readCommand.columnFamilyColumn, readCommand.columnNames);
- }
- }
+ row = readCommand.getRow(table);
logger_.info("getRow() TIME: " + (System.currentTimeMillis() - start) + " ms.");
start = System.currentTimeMillis();
ReadResponse readResponse = null;