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

Fix primary index calculation for SASI 

Patch by Corentin Chary; reviewed by Alex Petrov for CASSANDRA-12910.
This commit is contained in:
Corentin Chary 2016-12-06 14:59:25 +01:00 committed by Aleksey Yeschenko
parent d7b6b7a34d
commit 7b1e2ed6e3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.12
* Fix primary index calculation for SASI (CASSANDRA-12910)
* Expose time spent waiting in thread pool queue (CASSANDRA-8398)
* Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
@ -6,6 +7,7 @@
* Add support for arithmetic operators (CASSANDRA-11935)
* Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
3.10
* Use correct bounds for all-data range when filtering (CASSANDRA-12666)
* Remove timing window in test case (CASSANDRA-12875)

2
src/java/org/apache/cassandra/index/sasi/plan/QueryController.java
View File

@ -236,7 +236,7 @@ public class QueryController
continue;
Set<SSTableIndex> indexes = applyScope(view.match(e));
if (primaryIndexes.size() > indexes.size())
if (expression == null || primaryIndexes.size() > indexes.size())
{
primaryIndexes = indexes;
expression = e;