|
26 | 26 | import org.springframework.lang.Nullable;
|
27 | 27 | import org.springframework.util.StringUtils;
|
28 | 28 |
|
29 |
| -import java.util.ArrayList; |
30 | 29 | import java.util.Comparator;
|
31 | 30 | import java.util.List;
|
32 | 31 | import java.util.Optional;
|
@@ -132,21 +131,19 @@ private void setFilterFromSingleQualifier(Statement stmt, Qualifier qualifier) {
|
132 | 131 | }
|
133 | 132 |
|
134 | 133 | private boolean isIndexedBin(Statement stmt, Qualifier qualifier) {
|
135 |
| - List<Index> indexesForField = new ArrayList<>(); |
136 |
| - boolean hasField = false; |
| 134 | + boolean hasIndexesForField = false, hasField = false; |
137 | 135 | if (StringUtils.hasLength(qualifier.getBinName())) {
|
138 | 136 | hasField = true;
|
139 |
| - indexesForField = indexesCache.getAllIndexesForField( |
140 |
| -// indexesForField = indexesCache.getAllIndexesForField( |
| 137 | + hasIndexesForField = indexesCache.hasIndexFor( |
141 | 138 | new IndexedField(stmt.getNamespace(), stmt.getSetName(), qualifier.getBinName())
|
142 | 139 | );
|
143 | 140 | }
|
144 | 141 |
|
145 | 142 | if (log.isDebugEnabled() && hasField) {
|
146 |
| - log.debug("Qualifier #{}, bin {}.{}.{} has {} secondary index(es)", qualifier.hashCode(), |
147 |
| - stmt.getNamespace(), stmt.getSetName(), qualifier.getBinName(), indexesForField.size()); |
| 143 | + log.debug("Qualifier #{}, bin {}.{}.{} has secondary index(es): {}", qualifier.hashCode(), |
| 144 | + stmt.getNamespace(), stmt.getSetName(), qualifier.getBinName(), hasIndexesForField); |
148 | 145 | }
|
149 |
| - return !indexesForField.isEmpty(); |
| 146 | + return hasIndexesForField; |
150 | 147 | }
|
151 | 148 |
|
152 | 149 | private int getMinBinValuesRatioForQualifier(Statement stmt, Qualifier qualifier) {
|
|
0 commit comments