You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by al...@apache.org on 2026/09/18 07:45:12 UTC
(asterixdb) branch master updated: [ASTERIXDB-3857][COMP][STO] New default values for VTree
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new c051430f9b [ASTERIXDB-3857][COMP][STO] New default values for VTree
c051430f9b is described below
commit c051430f9bf18419667136d02a3172193e71df80
Author: Le0shy <le...@gmail.com>
AuthorDate: Thu Sep 17 19:01:42 2026 -0700
[ASTERIXDB-3857][COMP][STO] New default values for VTree
- user model changes: yes
- storage format changes: no
- interface changes: no
Details:
min_probe_fraction=0.75, epsilon=0.75
Ext-ref: MB-73926,MB-73832,MB-73925
Co-Authored-By: Claude Fable 5.1 <no...@anthropic.com>
Change-Id: I14bc27d8475352de15b3750431850c3e1e21ae79
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21818
Reviewed-by: Ali Alsuliman <al...@gmail.com>
Tested-by: Ali Alsuliman <al...@gmail.com>
---
.../org/apache/asterix/optimizer/cost/VectorIndexGeometry.java | 2 +-
.../org/apache/asterix/optimizer/rules/am/VectorJobGenParams.java | 4 ++--
.../apache/asterix/optimizer/cost/VectorIndexGeometryTest.java | 7 +++----
.../asterix/common/annotations/AnnSearchPreferenceAnnotation.java | 2 +-
.../sqlpp/rewrites/visitor/SqlppVectorDistanceRewriteVisitor.java | 2 +-
.../java/org/apache/asterix/om/vector/VectorIndexParameters.java | 2 +-
.../am/lsm/vector/dataflow/VTreeSearchOperatorNodePushable.java | 2 +-
.../hyracks/storage/am/vector/impls/VTreeSearchPredicate.java | 8 ++++----
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/cost/VectorIndexGeometry.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/cost/VectorIndexGeometry.java
index 715db7f778..0cccf5f9f3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/cost/VectorIndexGeometry.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/cost/VectorIndexGeometry.java
@@ -67,7 +67,7 @@ public final class VectorIndexGeometry {
private static final double MIN_ROWS = 1.0;
// The search substitutes this for a non-positive probe fraction, so the geometry has to as well.
- private static final double DEFAULT_MIN_PROBE_FRACTION = 0.1;
+ private static final double DEFAULT_MIN_PROBE_FRACTION = 0.75;
private final double treeCentroids;
private final double entriesPerCluster;
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/VectorJobGenParams.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/VectorJobGenParams.java
index 73ae60c7d8..116f5eb5a3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/VectorJobGenParams.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/VectorJobGenParams.java
@@ -39,8 +39,8 @@ import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
* [0] = query vector (e.g., from constant [1.0, 2.0, ...])
* [1] = k value (from LIMIT k)
* [2] = distance metric (e.g., "euclidean")
- * [3] = min_probe_fraction (ANN_DISTANCE arg 3, default 0.1)
- * [4] = k_multiplier (ANN_DISTANCE arg 4, default 1)
+ * [3] = min_probe_fraction (ANN_DISTANCE arg 3)
+ * [4] = k_multiplier (ANN_DISTANCE arg 4)
*/
public class VectorJobGenParams extends AccessMethodJobGenParams {
diff --git a/asterixdb/asterix-algebra/src/test/java/org/apache/asterix/optimizer/cost/VectorIndexGeometryTest.java b/asterixdb/asterix-algebra/src/test/java/org/apache/asterix/optimizer/cost/VectorIndexGeometryTest.java
index 928eabf9f7..93095bacb9 100644
--- a/asterixdb/asterix-algebra/src/test/java/org/apache/asterix/optimizer/cost/VectorIndexGeometryTest.java
+++ b/asterixdb/asterix-algebra/src/test/java/org/apache/asterix/optimizer/cost/VectorIndexGeometryTest.java
@@ -111,8 +111,8 @@ public class VectorIndexGeometryTest {
/** The probe fraction is a floor: the search keeps opening clusters until it has enough candidates. */
@Test
public void candidateCountRaisesProbesAboveTheFraction() throws Exception {
- // 100 rows per partition cluster into 10 leaves of 10 entries; a zero fraction would probe one.
- VectorIndexGeometry geometry = geometry(params(DIMENSION), NO_INCLUDES, 400, 0, 35);
+ // 100 rows per partition cluster into 10 leaves of 10 entries; a tenth would probe one.
+ VectorIndexGeometry geometry = geometry(params(DIMENSION), NO_INCLUDES, 400, 0.1, 35);
assertEquals(4, geometry.getProbes(), 0);
assertEquals(40, geometry.getScannedEntries(), 0);
@@ -122,8 +122,7 @@ public class VectorIndexGeometryTest {
@Test
public void zeroFractionProbesTheDefaultShare() throws Exception {
VectorIndexGeometry byDefault = geometry(params(DIMENSION), NO_INCLUDES, CARDINALITY, 0, CANDIDATES);
- VectorIndexGeometry explicit =
- geometry(params(DIMENSION), NO_INCLUDES, CARDINALITY, PROBE_FRACTION, CANDIDATES);
+ VectorIndexGeometry explicit = geometry(params(DIMENSION), NO_INCLUDES, CARDINALITY, 0.75, CANDIDATES);
assertEquals(explicit.getProbes(), byDefault.getProbes(), 0);
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/annotations/AnnSearchPreferenceAnnotation.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/annotations/AnnSearchPreferenceAnnotation.java
index 149f32b009..0c58d6b8ee 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/annotations/AnnSearchPreferenceAnnotation.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/annotations/AnnSearchPreferenceAnnotation.java
@@ -44,7 +44,7 @@ public final class AnnSearchPreferenceAnnotation implements IExpressionAnnotatio
return metric;
}
- /** Fraction of clusters to probe during the ANN search; default 0.1. */
+ /** Fraction of clusters to probe during the ANN search. */
public double getMinProbeFraction() {
return minProbeFraction;
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppVectorDistanceRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppVectorDistanceRewriteVisitor.java
index a6301f5224..3031cff70c 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppVectorDistanceRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppVectorDistanceRewriteVisitor.java
@@ -99,7 +99,7 @@ public final class SqlppVectorDistanceRewriteVisitor extends AbstractSqlppSimple
// call as index-eligible for IntroduceTopKAccessMethodRule and (b) carries the ANN-only search
// parameters. Metric/parameter validation happens here at compile time.
- private static final double DEFAULT_MIN_PROBE_FRACTION = 0.1;
+ private static final double DEFAULT_MIN_PROBE_FRACTION = 0.75;
private static final int DEFAULT_K_MULTIPLIER = 1;
private static boolean isAnnDistanceCall(CallExpr callExpr) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/vector/VectorIndexParameters.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/vector/VectorIndexParameters.java
index fc848e4a31..6dc6241fc8 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/vector/VectorIndexParameters.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/vector/VectorIndexParameters.java
@@ -94,7 +94,7 @@ public final class VectorIndexParameters implements Serializable {
* build used, so this only stands in for a record written before that.
*/
public static final double DEFAULT_TRAIN_LIST_FRACTION = 0.1;
- public static final double DEFAULT_EPSILON = 0.25;
+ public static final double DEFAULT_EPSILON = 0.75;
public static final int DEFAULT_CROSS_POLLINATION_M = 1;
public static final double DEFAULT_RNG_FACTOR = 1.0;
/** Sanity cap on {@link #CROSS_POLLINATION_M}: anything larger almost certainly indicates a user error. */
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-vtree/src/main/java/org/apache/hyracks/storage/am/lsm/vector/dataflow/VTreeSearchOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-vtree/src/main/java/org/apache/hyracks/storage/am/lsm/vector/dataflow/VTreeSearchOperatorNodePushable.java
index 9740548be0..9ca92e9299 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-vtree/src/main/java/org/apache/hyracks/storage/am/lsm/vector/dataflow/VTreeSearchOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-vtree/src/main/java/org/apache/hyracks/storage/am/lsm/vector/dataflow/VTreeSearchOperatorNodePushable.java
@@ -94,7 +94,7 @@ public class VTreeSearchOperatorNodePushable extends IndexSearchOperatorNodePush
// The actual tuple filter, created from the factory
protected ITupleFilter tupleFilter;
- /** Epsilon from vector index metadata (default 0.3 when absent in catalog). */
+ /** Epsilon from vector index metadata. */
protected final double indexEpsilon;
/**
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-vtree/src/main/java/org/apache/hyracks/storage/am/vector/impls/VTreeSearchPredicate.java b/hyracks-fullstack/hyracks/hyracks-storage-am-vtree/src/main/java/org/apache/hyracks/storage/am/vector/impls/VTreeSearchPredicate.java
index e792beb602..414daadf94 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-vtree/src/main/java/org/apache/hyracks/storage/am/vector/impls/VTreeSearchPredicate.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-vtree/src/main/java/org/apache/hyracks/storage/am/vector/impls/VTreeSearchPredicate.java
@@ -40,12 +40,12 @@ public class VTreeSearchPredicate implements ISearchPredicate {
private int queryFieldIndex;
private int k; // Number of nearest neighbors to return (for ANN queries)
private ITupleFilter tupleFilter; // Filter for INCLUDE field predicates (e.g., year > 2000)
- private double minProbeFraction; // Fraction of leaf clusters to probe (0.0-1.0, default 0.1)
+ private double minProbeFraction; // Fraction of leaf clusters to probe (0.0-1.0, default 0.75)
private double epsilon; // Distance threshold for level-wise cross-pollination (internal, not user-facing)
private int kMultiplier; // Multiplier for candidate limit: K * kMultiplier sent to PK for reranking (default 1)
- private static final double DEFAULT_MIN_PROBE_FRACTION = 0.1;
- private static final double DEFAULT_EPSILON = 0.3;
+ private static final double DEFAULT_MIN_PROBE_FRACTION = 0.75;
+ private static final double DEFAULT_EPSILON = 0.75;
private static final int DEFAULT_K_MULTIPLIER = 1;
public VTreeSearchPredicate() {
@@ -108,7 +108,7 @@ public class VTreeSearchPredicate implements ISearchPredicate {
/**
* Set the min_probe_fraction parameter (fraction of leaf clusters to probe).
* Converted to nprobe = max(1, floor(totalLeafClusters * fraction)) at runtime.
- * Value of 0 means use default (0.1).
+ * Value of 0 means use default (0.75).
*/
public void setMinProbeFraction(double minProbeFraction) {
if (minProbeFraction <= 0.0) {