greg/helenus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

We only transition to allow filtering and only if we've not already set it.

Browse source
This commit is contained in:
Greg Burd 2017-11-02 16:09:47 -04:00
parent d1fe54b0ce
commit 864c4af5af
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/net/helenus/core/operation/SelectOperation.java
View file

@ -291,21 +291,23 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
where.and(filter.getClause(sessionOps.getValuePreparer()));
HelenusProperty prop = filter.getNode().getProperty();
boolean isFirstIndex = true;
switch (prop.getColumnType()) {
case PARTITION_KEY :
case CLUSTERING_COLUMN :
break;
default :
// When using non-Cassandra-standard 2i types or when using more than one
// indexed column or non-indexed columns the query must include ALLOW FILTERING.
if (prop.caseSensitiveIndex()) {
allowFiltering = true;
} else if (prop.getIndexName() != null) {
allowFiltering |= !isFirstIndex;
isFirstIndex = false;
} else {
allowFiltering = true;
}
if (allowFiltering == false) {
switch (prop.getColumnType()) {
case PARTITION_KEY :
case CLUSTERING_COLUMN :
break;
default :
// When using non-Cassandra-standard 2i types or when using more than one
// indexed column or non-indexed columns the query must include ALLOW FILTERING.
if (prop.caseSensitiveIndex()) {
allowFiltering = true;
} else if (prop.getIndexName() != null) {
allowFiltering |= !isFirstIndex;
isFirstIndex = false;
} else {
allowFiltering = true;
}
}
}
}
}