Refactor reduce strategy in query node

Signed-off-by: Nxige-16 <xi.ge@zilliz.com>

internal/core/src/segcore/segment_c.cpp

@@ -181,15 +181,15 @@ FillTargetEntry(CSegmentBase c_segment, CPlan c_plan, CQueryResult c_result) {
 
 CStatus
 UpdateSegmentIndex(CSegmentBase c_segment, CLoadIndexInfo c_load_index_info) {
+    auto status = CStatus();
     try {
         auto segment = (milvus::segcore::SegmentBase*)c_segment;
         auto load_index_info = (LoadIndexInfo*)c_load_index_info;
-        auto status = CStatus();
+        auto res = segment->LoadIndexing(*load_index_info);
         status.error_code = Success;
         status.error_msg = "";
         return status;
     } catch (std::exception& e) {
-        auto status = CStatus();
         status.error_code = UnexpectedException;
         status.error_msg = strdup(e.what());
         return status;

internal/master/flush_scheduler.go

@@ -68,18 +68,6 @@ func (scheduler *FlushScheduler) describe() error {
 						return err
 					}
 					for fieldID, data := range mapData {
-						// check field indexable
-						segMeta, err := scheduler.metaTable.GetSegmentByID(singleSegmentID)
-						if err != nil {
-							return err
-						}
-						indexable, err := scheduler.metaTable.IsIndexable(segMeta.CollectionID, fieldID)
-						if err != nil {
-							return err
-						}
-						if !indexable {
-							continue
-						}
 						info := &IndexBuildInfo{
 							segmentID:      singleSegmentID,
 							fieldID:        fieldID,

internal/master/meta_table.go

@@ -5,8 +5,6 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/zilliztech/milvus-distributed/internal/proto/schemapb"
-
 	"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
 
 	"github.com/zilliztech/milvus-distributed/internal/util/typeutil"
@@ -680,23 +678,3 @@ func (mt *metaTable) UpdateFieldIndexParams(collName string, fieldName string, i
 
 	return fmt.Errorf("can not find field with id %s", fieldName)
 }
-
-func (mt *metaTable) IsIndexable(collID UniqueID, fieldID UniqueID) (bool, error) {
-	mt.ddLock.RLock()
-	defer mt.ddLock.RUnlock()
-
-	if _, ok := mt.collID2Meta[collID]; !ok {
-		return false, fmt.Errorf("can not find collection with id %d", collID)
-	}
-
-	for _, v := range mt.collID2Meta[collID].Schema.Fields {
-		// field is vector type and index params is not empty
-		if v.FieldID == fieldID && (v.DataType == schemapb.DataType_VECTOR_BINARY || v.DataType == schemapb.DataType_VECTOR_FLOAT) &&
-			len(v.IndexParams) != 0 {
-			return true, nil
-		}
-	}
-
-	// fieldID is not in schema(eg: timestamp) or not indexable
-	return false, nil
-}

internal/master/persistence_scheduler_test.go

@@ -5,8 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
-
 	"github.com/zilliztech/milvus-distributed/internal/proto/etcdpb"
 	"github.com/zilliztech/milvus-distributed/internal/proto/schemapb"
 
@@ -45,7 +43,7 @@ func TestPersistenceScheduler(t *testing.T) {
 			Name: "testcoll",
 			Fields: []*schemapb.FieldSchema{
 				{FieldID: 1},
-				{FieldID: 100, DataType: schemapb.DataType_VECTOR_FLOAT, IndexParams: []*commonpb.KeyValuePair{{Key: "k", Value: "v"}}},
+				{FieldID: 100},
 			},
 		},
 	})

internal/querynode/load_index_service_test.go

@@ -16,23 +16,6 @@ import (
 	"github.com/zilliztech/milvus-distributed/internal/querynode/client"
 )
 
-//func TestLoadIndexClient_LoadIndex(t *testing.T) {
-//	pulsarURL := Params.PulsarAddress
-//	loadIndexChannels := Params.LoadIndexChannelNames
-//	loadIndexClient := client.NewLoadIndexClient(context.Background(), pulsarURL, loadIndexChannels)
-//
-//	loadIndexPath := "collection0-segment0-field0"
-//	loadIndexPaths := make([]string, 0)
-//	loadIndexPaths = append(loadIndexPaths, loadIndexPath)
-//
-//	indexParams := make(map[string]string)
-//	indexParams["index_type"] = "IVF_PQ"
-//	indexParams["index_mode"] = "cpu"
-//
-//	loadIndexClient.LoadIndex(loadIndexPaths, 0, 0, "field0", indexParams)
-//	loadIndexClient.Close()
-//}
-
 func TestLoadIndexService(t *testing.T) {
 	node := newQueryNode()
 	collectionID := rand.Int63n(1000000)