You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/06/01 18:07:48 UTC
git commit: Preserve compatibility with pre-1.1 index queries
Updated Branches:
refs/heads/cassandra-1.1 1f36de1c7 -> ef7b4705a
Preserve compatibility with pre-1.1 index queries
patch by slebresne; reviewed by jbellis for CASSANDRA-4262
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef7b4705
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef7b4705
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef7b4705
Branch: refs/heads/cassandra-1.1
Commit: ef7b4705a070a53b70a1a121fd8bff5e3bc88738
Parents: 1f36de1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jun 1 18:06:46 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jun 1 18:06:46 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/IndexScanCommand.java | 4 +-
.../org/apache/cassandra/db/RangeSliceCommand.java | 40 +++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef7b4705/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2fd051c..80ede60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -71,6 +71,7 @@
* Take supercolumn names and deletion info into account in memtable throughput
(CASSANDRA-4264)
* Add back backward compatibility for old style replication factor (CASSANDRA-4294)
+ * Preserve compatibility with pre-1.1 index queries (CASSANDRA_4264)
Merged from 1.0:
* Fix super columns bug where cache is not updated (CASSANDRA-4190)
* fix maxTimestamp to include row tombstones (CASSANDRA-4116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef7b4705/src/java/org/apache/cassandra/db/IndexScanCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/IndexScanCommand.java b/src/java/org/apache/cassandra/db/IndexScanCommand.java
index 6bce7e3..088f3b3 100644
--- a/src/java/org/apache/cassandra/db/IndexScanCommand.java
+++ b/src/java/org/apache/cassandra/db/IndexScanCommand.java
@@ -38,7 +38,7 @@ import org.apache.cassandra.thrift.TBinaryProtocol;
public class IndexScanCommand implements MessageProducer
{
- private static final IndexScanCommandSerializer serializer = new IndexScanCommandSerializer();
+ public static final IndexScanCommandSerializer serializer = new IndexScanCommandSerializer();
public final String keyspace;
public final String column_family;
@@ -80,7 +80,7 @@ public class IndexScanCommand implements MessageProducer
return serializer.deserialize(new DataInputStream(bis), message.getVersion());
}
- private static class IndexScanCommandSerializer implements IVersionedSerializer<IndexScanCommand>
+ static class IndexScanCommandSerializer implements IVersionedSerializer<IndexScanCommand>
{
public void serialize(IndexScanCommand o, DataOutput out, int version) throws IOException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef7b4705/src/java/org/apache/cassandra/db/RangeSliceCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
index 013dfc5..3c8b330 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@ -42,6 +42,8 @@ import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.Schema;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataOutputBuffer;
@@ -52,9 +54,12 @@ import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.IReadCommand;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.ColumnParent;
+import org.apache.cassandra.thrift.IndexClause;
import org.apache.cassandra.thrift.IndexExpression;
+import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.thrift.SlicePredicate;
import org.apache.cassandra.thrift.TBinaryProtocol;
+import org.apache.cassandra.thrift.ThriftValidation;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.thrift.TDeserializer;
@@ -117,6 +122,12 @@ public class RangeSliceCommand implements MessageProducer, IReadCommand
public Message getMessage(Integer version) throws IOException
{
+ if (version < MessagingService.VERSION_11 && row_filter != null && !row_filter.isEmpty())
+ {
+ // pre-1.1 versions use IndexScanCommand for index queries, so generate that instead
+ return toIndexScanCommand().getMessage(version);
+ }
+
DataOutputBuffer dob = new DataOutputBuffer();
serializer.serialize(this, dob, version);
return new Message(FBUtilities.getBroadcastAddress(),
@@ -150,6 +161,35 @@ public class RangeSliceCommand implements MessageProducer, IReadCommand
{
return keyspace;
}
+
+ // Convert to a equivalent IndexScanCommand for backward compatibility sake
+ public IndexScanCommand toIndexScanCommand()
+ {
+ assert row_filter != null && !row_filter.isEmpty();
+ if (maxIsColumns || isPaging)
+ throw new IllegalStateException("Cannot proceed with range query as the remote end has a version < 1.1. Please update the full cluster first.");
+
+ CFMetaData cfm = Schema.instance.getCFMetaData(keyspace, column_family);
+ try
+ {
+ if (!ThriftValidation.validateFilterClauses(cfm, row_filter))
+ throw new IllegalStateException("Cannot proceed with non-indexed query as the remote end has a version < 1.1. Please update the full cluster first.");
+ }
+ catch (InvalidRequestException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ RowPosition start = range.left;
+ ByteBuffer startKey = ByteBufferUtil.EMPTY_BYTE_BUFFER;
+ if (start instanceof DecoratedKey)
+ {
+ startKey = ((DecoratedKey)start).key;
+ }
+
+ IndexClause clause = new IndexClause(row_filter, startKey, maxResults);
+ return new IndexScanCommand(keyspace, column_family, clause, predicate, range);
+ }
}
class RangeSliceCommandSerializer implements IVersionedSerializer<RangeSliceCommand>