Skip to content

Commit 64a8ed8

Browse files
committed
move things around
1 parent ee00d63 commit 64a8ed8

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,25 @@ public enum PruningScenario {
699699
DEFAULT_PRUNING, // Default pruning configuration
700700
STRICT_PRUNING // Stricter pruning with higher thresholds
701701
}
702+
703+
public enum QueryPruningScenario {
704+
PRUNE_FALSE_NO_CONFIG,
705+
PRUNE_FALSE_WITH_CONFIG,
706+
PRUNE_TRUE_NO_CONFIG,
707+
PRUNE_TRUE_WITH_CONFIG,
708+
PRUNE_NULL_WITH_CONFIG,
709+
PRUNE_NULL_NO_CONFIG
710+
}
711+
712+
public enum IndexPruningScenario {
713+
// PREVIOUS_VERSION_NO_PRUNING, //TODO(mromaios): This fails when combined with query pruning that overrides the index options,
714+
// check.
715+
PRUNE_FALSE_NO_CONFIG,
716+
PRUNE_TRUE_NO_CONFIG,
717+
PRUNE_TRUE_WITH_CONFIG,
718+
PRUNE_NULL_NO_CONFIG
719+
}
720+
702721

703722
private void withSearchExecutionContext(MapperService mapperService, CheckedConsumer<SearchExecutionContext, IOException> consumer)
704723
throws IOException {
@@ -855,24 +874,6 @@ private PruningScenario getEffectivePruningScenario(
855874
return PruningScenario.DEFAULT_PRUNING;
856875
}
857876

858-
public enum QueryPruningScenario {
859-
PRUNE_FALSE_NO_CONFIG,
860-
PRUNE_FALSE_WITH_CONFIG,
861-
PRUNE_TRUE_NO_CONFIG,
862-
PRUNE_TRUE_WITH_CONFIG,
863-
PRUNE_NULL_WITH_CONFIG,
864-
PRUNE_NULL_NO_CONFIG
865-
}
866-
867-
public enum IndexPruningScenario {
868-
// PREVIOUS_VERSION_NO_PRUNING, //TODO(mromaios): This fails when combined with query pruning that overrides the index options,
869-
// check.
870-
PRUNE_FALSE_NO_CONFIG,
871-
PRUNE_TRUE_NO_CONFIG,
872-
PRUNE_TRUE_WITH_CONFIG,
873-
PRUNE_NULL_NO_CONFIG
874-
}
875-
876877
private Tuple<Boolean, TokenPruningConfig> getQueryPruneConfig(QueryPruningScenario queryPruningScenario) {
877878
return switch (queryPruningScenario) {
878879
case PRUNE_FALSE_NO_CONFIG -> new Tuple<>(false, null);

0 commit comments

Comments
 (0)