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

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
This commit is contained in:
Tyler Hobbs 2015-01-08 14:41:01 -06:00
parent fb95309489 bd3c47ca73
commit 5674a96d4c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
View File

@ -260,7 +260,8 @@ public class CompositesSearcher extends SecondaryIndexSearcher
else
previousPrefix = null;
logger.trace("Adding index hit to current row for {}", indexComparator.getString(cell.name()));
if (logger.isTraceEnabled())
logger.trace("Adding index hit to current row for {}", indexComparator.getString(cell.name()));
// We always query the whole CQL3 row. In the case where the original filter was a name filter this might be
// slightly wasteful, but this probably doesn't matter in practice and it simplify things.