Merge cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be2c26f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be2c26f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be2c26f1 Branch: refs/heads/cassandra-3.0 Commit: be2c26f183b6ef9c606fab83342fff026054f5a3 Parents: c997c08 62fc314 Author: blerer <[email protected]> Authored: Thu Aug 20 13:52:27 2015 +0200 Committer: blerer <[email protected]> Committed: Thu Aug 20 13:53:30 2015 +0200 ---------------------------------------------------------------------- .../cassandra/cql3/SingleColumnRelation.java | 2 +- .../org/apache/cassandra/cql3/TokenRelation.java | 2 +- .../operations/SelectMultiColumnRelationTest.java | 12 ++++++++++++ .../operations/SelectOrderedPartitionerTest.java | 10 ++++++++++ .../operations/SelectSingleColumnRelationTest.java | 17 +++++++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2c26f1/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/SingleColumnRelation.java index 885a2e2,b206631..c848b9e --- a/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java +++ b/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java @@@ -153,8 -153,8 +153,8 @@@ public final class SingleColumnRelatio protected Restriction newINRestriction(CFMetaData cfm, VariableSpecifications boundNames) throws InvalidRequestException { - ColumnDefinition columnDef = cfm.getColumnDefinition(getEntity().prepare(cfm)); + ColumnDefinition columnDef = toColumnDefinition(cfm, entity); - List<? extends ColumnSpecification> receivers = toReceivers(columnDef); + List<? extends ColumnSpecification> receivers = toReceivers(columnDef, cfm.isDense()); List<Term> terms = toTerms(receivers, inValues, cfm.ksName, boundNames); if (terms == null) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2c26f1/src/java/org/apache/cassandra/cql3/TokenRelation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2c26f1/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2c26f1/test/unit/org/apache/cassandra/cql3/validation/operations/SelectSingleColumnRelationTest.java ----------------------------------------------------------------------
