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

NPE fix on null highestSelectivityIndex 

Patch by Berenguer Blasi; reviewed by Sam Tunnicliffe for
CASSANDRA-10550
This commit is contained in:
Bereng 2015-10-19 16:45:23 +02:00 committed by Sam Tunnicliffe
parent 86583af4ca
commit da8be1c093
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.12 2.1.12
* Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550)
* Fix paging issues with partitions containing only static columns data * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381) (CASSANDRA-10381)
* Fix conditions on static columns (CASSANDRA-10264) * Fix conditions on static columns (CASSANDRA-10264)

11
src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
View File

@ -858,11 +858,14 @@ public class SecondaryIndexManager
for (SecondaryIndexSearcher searcher : indexSearchers) for (SecondaryIndexSearcher searcher : indexSearchers)
{ {
SecondaryIndex highestSelectivityIndex = searcher.highestSelectivityIndex(clause); SecondaryIndex highestSelectivityIndex = searcher.highestSelectivityIndex(clause);
long estimate = highestSelectivityIndex.estimateResultRows(); if (highestSelectivityIndex != null)
if (estimate <= bestEstimate)
{ {
bestEstimate = estimate; long estimate = highestSelectivityIndex.estimateResultRows();
mostSelective = searcher; if (estimate <= bestEstimate)
{
bestEstimate = estimate;
mostSelective = searcher;
}
} }
} }

2
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -1571,7 +1571,7 @@ public class StorageProxy implements StorageProxyMBean
{ {
// use our own mean column count as our estimate for how many matching rows each node will have // use our own mean column count as our estimate for how many matching rows each node will have
SecondaryIndex highestSelectivityIndex = searcher.highestSelectivityIndex(command.rowFilter); SecondaryIndex highestSelectivityIndex = searcher.highestSelectivityIndex(command.rowFilter);
resultRowsPerRange = Math.min(resultRowsPerRange, highestSelectivityIndex.estimateResultRows()); resultRowsPerRange = highestSelectivityIndex == null ? resultRowsPerRange : Math.min(resultRowsPerRange, highestSelectivityIndex.estimateResultRows());
} }
} }
} }