fix createindex again hang up

Signed-off-by: Xianhui.Lin <[email protected]> fix unitest Signed-off-by: Xianhui.Lin <[email protected]> fix createindex hang Signed-off-by: Xianhui.Lin <[email protected]> fix triggerstatstask go ut Signed-off-by: Xianhui.Lin <[email protected]>
milvus-io · Dec 30, 2024 · 04b2f80 · 04b2f80
1 parent bbee182
commit 04b2f80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/internal/core/src/index/JsonKeyInvertedIndex.cpp b/internal/core/src/index/JsonKeyInvertedIndex.cpp
@@ -89,9 +89,6 @@ JsonKeyInvertedIndex::TravelJson(const char* json,
 
 void
 JsonKeyInvertedIndex::AddJson(const char* json, int64_t offset) {
-    if (json == nullptr) {
-        return;
-    }
     jsmn_parser parser;
     jsmntok_t* tokens = (jsmntok_t*)malloc(16 * sizeof(jsmntok_t));
     if (!tokens) {
@@ -225,6 +222,9 @@ JsonKeyInvertedIndex::BuildWithFieldData(
             for (int i = 0; i < n; i++) {
                 if (!data->is_valid(i)) {
                     null_offset.push_back(i);
+                    std::string empty = "";
+                    wrapper_->add_multi_data(&empty, 0, offset++);
+                    return;
                 }
                 AddJson(static_cast<const milvus::Json*>(data->RawValue(i))
                             ->data()

diff --git a/internal/datacoord/job_manager.go b/internal/datacoord/job_manager.go
@@ -142,7 +142,8 @@ func needDoTextIndex(segment *SegmentInfo, fieldIDs []UniqueID) bool {
 }
 
 func needDoJsonKeyIndex(segment *SegmentInfo, fieldIDs []UniqueID) bool {
-	if !isFlush(segment) {
+	if !(isFlush(segment) && segment.GetLevel() != datapb.SegmentLevel_L0 &&
+		segment.GetIsSorted()) {
 		return false
 	}
 	for _, fieldID := range fieldIDs {

diff --git a/internal/datacoord/job_manager_test.go b/internal/datacoord/job_manager_test.go
@@ -122,5 +122,5 @@ func (s *jobManagerSuite) TestJobManager_triggerStatsTaskLoop() {
 
 	jm.loopWg.Wait()
 
-	s.Equal(4, len(jm.scheduler.tasks))
+	s.Equal(3, len(jm.scheduler.tasks))
 }