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

Merge cassandra-2.2 into cassandra-3.0

This commit is contained in:
blerer 2015-08-17 11:09:51 +02:00
parent d2da7606ab ee186b6b05
commit 47b66d7c1e
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java
View File

@ -104,7 +104,7 @@ final class PrimaryKeyRestrictionSet extends AbstractPrimaryKeyRestrictions
this.slice = true;
else if (restriction.isContains() || primaryKeyRestrictions.isContains())
this.contains = true;
else if (restriction.isIN())
else if (restriction.isIN() || primaryKeyRestrictions.isIN())
this.in = true;
else
this.eq = true;

2
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
View File

@ -747,6 +747,8 @@ public class SelectStatement implements CQLStatement
verifyOrderingIsAllowed(restrictions);
orderingComparator = getOrderingComparator(cfm, selection, restrictions);
isReversed = isReversed(cfm);
if (isReversed)
orderingComparator = Collections.reverseOrder(orderingComparator);
}
checkNeedsFiltering(restrictions);

43
test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
View File

@ -21,6 +21,7 @@ import org.junit.Test;
import org.apache.cassandra.cql3.CQLTester;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertTrue;
public class SelectOrderByTest extends CQLTester
@ -488,6 +489,48 @@ public class SelectOrderByTest extends CQLTester
assertTrue(isFirstIntSorted(results));
}
@Test
public void testInOrderByWithTwoPartitionKeyColumns() throws Throwable
{
for (String option : asList("", "WITH CLUSTERING ORDER BY (col_3 DESC)"))
{
createTable("CREATE TABLE %s (col_1 int, col_2 int, col_3 int, PRIMARY KEY ((col_1, col_2), col_3)) " + option);
execute("INSERT INTO %s (col_1, col_2, col_3) VALUES(?, ?, ?)", 1, 1, 1);
execute("INSERT INTO %s (col_1, col_2, col_3) VALUES(?, ?, ?)", 1, 1, 2);
execute("INSERT INTO %s (col_1, col_2, col_3) VALUES(?, ?, ?)", 1, 1, 13);
execute("INSERT INTO %s (col_1, col_2, col_3) VALUES(?, ?, ?)", 1, 2, 10);
execute("INSERT INTO %s (col_1, col_2, col_3) VALUES(?, ?, ?)", 1, 2, 11);
assertRows(execute("select * from %s where col_1=? and col_2 IN (?, ?) order by col_3;", 1, 1, 2),
row(1, 1, 1),
row(1, 1, 2),
row(1, 2, 10),
row(1, 2, 11),
row(1, 1, 13));
assertRows(execute("select * from %s where col_1=? and col_2 IN (?, ?) order by col_3 desc;", 1, 1, 2),
row(1, 1, 13),
row(1, 2, 11),
row(1, 2, 10),
row(1, 1, 2),
row(1, 1, 1));
assertRows(execute("select * from %s where col_2 IN (?, ?) and col_1=? order by col_3;", 1, 2, 1),
row(1, 1, 1),
row(1, 1, 2),
row(1, 2, 10),
row(1, 2, 11),
row(1, 1, 13));
assertRows(execute("select * from %s where col_2 IN (?, ?) and col_1=? order by col_3 desc;", 1, 2, 1),
row(1, 1, 13),
row(1, 2, 11),
row(1, 2, 10),
row(1, 1, 2),
row(1, 1, 1));
}
}
private boolean isFirstIntSorted(Object[][] rows)
{
for (int i = 1; i < rows.length; i++)