test

Author: iamlinjunhong

pkg/sql/plan/apply_indices_hnsw.go

@@ -46,6 +46,10 @@ func (builder *QueryBuilder) prepareHnswIndexContext(vecCtx *vectorSortContext,
 	if vecCtx.distFnExpr == nil {
 		return nil, nil
 	}
+
+	// RankOption.Mode controls vector index behavior:
+	// - "force": Disable vector index, force full table scan (for debugging/comparison)
+	// - nil/other: Enable vector index with default behavior
 	if vecCtx.rankOption != nil && vecCtx.rankOption.Mode == "force" {
 		return nil, nil
 	}

pkg/sql/plan/apply_indices_ivfflat.go

@@ -49,6 +49,11 @@ func (builder *QueryBuilder) prepareIvfIndexContext(vecCtx *vectorSortContext, m
 	if vecCtx.distFnExpr == nil {
 		return nil, nil
 	}
+
+	// RankOption.Mode controls vector index behavior:
+	// - "pre": Enable vector index with BloomFilter pushdown for better filtering
+	// - "force": Disable vector index, force full table scan (for debugging/comparison)
+	// - nil/other: Enable vector index with default behavior
 	if vecCtx.rankOption != nil && vecCtx.rankOption.Mode == "force" {
 		return nil, nil
 	}
@@ -579,6 +584,11 @@ func (builder *QueryBuilder) rebindScanNode(scanNode *plan.Node) {
 	for _, expr := range scanNode.FilterList {
 		replaceColRefTag(expr, oldTag, newTag)
 	}
+	// Also update BlockFilterList, which was copied from the original scanNode
+	// and still contains references to the old binding tag
+	for _, expr := range scanNode.BlockFilterList {
+		replaceColRefTag(expr, oldTag, newTag)
+	}
 }
 
 func replaceColRefTag(expr *plan.Expr, oldTag, newTag int32) {

pkg/sql/plan/query_builder.go

@@ -5222,7 +5222,7 @@ func (builder *QueryBuilder) GetContext() context.Context {
 // parseRankOption parses rank options from a map of option key-value pairs.
 // It extracts the "mode" option case-insensitively and validates it.
 // Returns a RankOption with the parsed mode if valid, or nil if no mode is specified.
-// Returns an error if the mode value is invalid (must be "pre" or "post").
+// Returns an error if the mode value is invalid (must be "pre", "post", or "force").
 func parseRankOption(options map[string]string, ctx context.Context) (*plan.RankOption, error) {
 	if len(options) == 0 {
 		return nil, nil
@@ -5243,8 +5243,12 @@ func parseRankOption(options map[string]string, ctx context.Context) (*plan.Rank
 
 	if mode, ok := getOptionValue("mode"); ok {
 		modeLower := strings.ToLower(strings.TrimSpace(mode))
-		if modeLower != "pre" && modeLower != "post" {
-			return nil, moerr.NewInvalidInputf(ctx, "mode must be 'pre' or 'post', got '%s'", mode)
+		// Mode options:
+		// - "pre": Enable vector index with BloomFilter pushdown
+		// - "post": Enable vector index with standard behavior (post-filtering)
+		// - "force": Force disable vector index, use full table scan
+		if modeLower != "pre" && modeLower != "post" && modeLower != "force" {
+			return nil, moerr.NewInvalidInputf(ctx, "mode must be 'pre', 'post', or 'force', got '%s'", mode)
 		}
 		rankOption.Mode = modeLower
 	}

pkg/sql/plan/query_builder_test.go

@@ -380,7 +380,7 @@ func TestQueryBuilder_bindLimit(t *testing.T) {
 	stmts, _ := parsers.Parse(context.TODO(), dialect.MYSQL, "select a from select_test.bind_select limit 1, 5", 1)
 	astLimit := stmts[0].(*tree.Select).Limit
 
-	boundOffsetExpr, boundCountExpr, _, err := builder.bindLimit(bindCtx, astLimit)
+	boundOffsetExpr, boundCountExpr, _, err := builder.bindLimit(bindCtx, astLimit, nil)
 	require.NoError(t, err)
 	require.Equal(t, int32(types.T_uint64), boundOffsetExpr.Typ.Id)
 	offsetExpr, ok := boundOffsetExpr.Expr.(*plan.Expr_Lit)
@@ -858,10 +858,20 @@ func TestParseRankOption(t *testing.T) {
 		rankOption, err := parseRankOption(options, ctx)
 		require.Error(t, err)
 		require.Nil(t, rankOption)
-		require.Contains(t, err.Error(), "mode must be 'pre' or 'post'")
+		require.Contains(t, err.Error(), "mode must be 'pre', 'post', or 'force'")
 		require.Contains(t, err.Error(), "invalid")
 	})
 
+	t.Run("valid mode force", func(t *testing.T) {
+		options := map[string]string{
+			"mode": "force",
+		}
+		rankOption, err := parseRankOption(options, ctx)
+		require.NoError(t, err)
+		require.NotNil(t, rankOption)
+		require.Equal(t, "force", rankOption.Mode)
+	})
+
 	t.Run("empty options map", func(t *testing.T) {
 		options := map[string]string{}
 		rankOption, err := parseRankOption(options, ctx)