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 2015/09/02 17:23:07 UTC
cassandra git commit: Remove dead code
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 796b0f26a -> 6a86d221a
Remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a86d221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a86d221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a86d221
Branch: refs/heads/cassandra-3.0
Commit: 6a86d221a5b4dc11784a022917d0e4c6845e03aa
Parents: 796b0f2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 2 17:22:53 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 2 17:22:53 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a86d221/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 0bc8cea..0ccd229 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -971,21 +971,12 @@ public abstract class ReadCommand implements ReadQuery
LegacyLayout.LegacyBound startBound = LegacyLayout.decodeBound(metadata, ByteBufferUtil.readWithShortLength(in), true);
ByteBufferUtil.readWithShortLength(in); // the composite "stop", which isn't actually needed
- // pre-3.0 nodes will sometimes use a clustering prefix for the Command-level start and stop, but in all
- // cases this should also be represented by the ClusteringIndexFilter, so we can ignore them
- Clustering startClustering;
- if (startBound == LegacyLayout.LegacyBound.BOTTOM || startBound.bound.size() < metadata.comparator.size())
- startClustering = Clustering.EMPTY;
- else
- startClustering = startBound.getAsClustering(metadata);
-
ColumnFilter selection = LegacyRangeSliceCommandSerializer.getColumnSelectionForSlice(filter, compositesToGroup, metadata);
RowFilter rowFilter = LegacyRangeSliceCommandSerializer.deserializeRowFilter(in, metadata);
int maxResults = in.readInt();
in.readBoolean(); // countCQL3Rows
-
boolean selectsStatics = (!selection.fetchedColumns().statics.isEmpty() || filter.selects(Clustering.STATIC_CLUSTERING));
boolean isDistinct = compositesToGroup == -2 || (perPartitionLimit == 1 && selectsStatics);
DataLimits limits;