fix: no data is returned for full-text index query (#490)

Signed-off-by: ZhangJian He <shoothzj@gmail.com>
openGemini · Feb 28, 2024 · 502f6cd · 502f6cd
1 parent 3adf273
commit 502f6cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/engine/column_store_reader.go b/engine/column_store_reader.go
@@ -403,7 +403,6 @@ func (r *ColumnStoreReader) Run(ctx context.Context) (iterCount, rowCountAfterFi
 	filterBitmap := bitmap.NewFilterBitmap(r.queryCtx.filterOption.CondFunctions.NumFilter())
 	colAux := record.ColAux{}
 	for {
-		filterBitmap.Reset()
 		select {
 		case <-r.closedCh:
 			return

diff --git a/engine/hybrid_store_reader.go b/engine/hybrid_store_reader.go
@@ -518,7 +518,6 @@ func (r *HybridStoreReader) run(ctx context.Context, reader comm.KeyCursor) (err
 	var rec *record.Record
 	colAux := record.ColAux{}
 	for {
-		r.filterBitmap.Reset()
 		select {
 		case <-r.closedCh:
 			return

diff --git a/engine/hybrid_store_reader_test.go b/engine/hybrid_store_reader_test.go
@@ -432,6 +432,16 @@ func TestHybridStoreReader(t *testing.T) {
 			expected:  0,
 			expect:    testEqualChunkNum,
 		},
+		{
+			name:      "select * from db0.rp0.mst where or",
+			q:         `select field1_float,field2_int,field3_bool,field4_string from db0.rp0.mst where MATCHPHRASE(primaryKey_string1, 'test111') or MATCHPHRASE(primaryKey_string2, 'test')`,
+			tr:        util.TimeRange{Min: 1635724800000000000, Max: 1635732800000000000},
+			out:       buildComRowDataType(),
+			readerOps: buildComReaderOps(),
+			fields:    fields,
+			expected:  1245,
+			expect:    testEqualChunkNum,
+		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.skip {

diff --git a/engine/immutable/reader.go b/engine/immutable/reader.go
@@ -947,6 +947,8 @@ func FilterByFieldFuncs(rec, filterRec *record.Record, filterOption *BaseFilterO
 		return rec
 	}
 
+	filterBitmap.Reset()
+
 	if err := filterOption.CondFunctions.Filter(rec, filterBitmap); err != nil {
 		panic(err)
 	}
@@ -956,7 +958,6 @@ func FilterByFieldFuncs(rec, filterRec *record.Record, filterOption *BaseFilterO
 	}
 
 	if len(filterBitmap.ReserveId) == 0 {
-		filterBitmap.Reset()
 		return nil
 	}
 	return GenRecByReserveIds(rec, filterRec, filterBitmap.ReserveId, filterOption.RedIdxMap)