Skip to content

Commit dc78adf

Browse files
committed
use boolean check for indexes in the cache
1 parent ae5d84e commit dc78adf

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/main/java/org/springframework/data/aerospike/query/StatementBuilder.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.lang.Nullable;
2727
import org.springframework.util.StringUtils;
2828

29-
import java.util.ArrayList;
3029
import java.util.Comparator;
3130
import java.util.List;
3231
import java.util.Optional;
@@ -132,21 +131,19 @@ private void setFilterFromSingleQualifier(Statement stmt, Qualifier qualifier) {
132131
}
133132

134133
private boolean isIndexedBin(Statement stmt, Qualifier qualifier) {
135-
List<Index> indexesForField = new ArrayList<>();
136-
boolean hasField = false;
134+
boolean hasIndexesForField = false, hasField = false;
137135
if (StringUtils.hasLength(qualifier.getBinName())) {
138136
hasField = true;
139-
indexesForField = indexesCache.getAllIndexesForField(
140-
// indexesForField = indexesCache.getAllIndexesForField(
137+
hasIndexesForField = indexesCache.hasIndexFor(
141138
new IndexedField(stmt.getNamespace(), stmt.getSetName(), qualifier.getBinName())
142139
);
143140
}
144141

145142
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);
148145
}
149-
return !indexesForField.isEmpty();
146+
return hasIndexesForField;
150147
}
151148

152149
private int getMinBinValuesRatioForQualifier(Statement stmt, Qualifier qualifier) {

src/test/java/org/springframework/data/aerospike/logging/LoggingTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void binIsIndexed() {
5353

5454
// 3 events: Created query, Bin has secondary index, Secondary index filter is not set
5555
assertThat(memoryAppender.countEventsForLogger(LOGGER_NAME)).isEqualTo(3);
56-
String msg = "bin TEST.testSet.testField has 0 secondary index(es)";
56+
String msg = "bin TEST.testSet.testField has secondary index(es): false";
5757
assertThat(memoryAppender.search(msg, Level.DEBUG).size()).isEqualTo(1);
5858
assertThat(memoryAppender.contains(msg, Level.INFO)).isFalse();
5959
}

0 commit comments

Comments
 (0)