Merge branch 'master' of https://github.com/milvus-io/milvus into 231…

…2-import-executor
milvus-io · Dec 23, 2023 · 17a131c · 17a131c
2 parents c84c29e + 1b7f1d7
commit 17a131c
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/internal/core/src/mmap/Column.h b/internal/core/src/mmap/Column.h
@@ -318,18 +318,22 @@ class VariableColumn : public ColumnBase {
         if (!indices.empty()) {
             indices_ = std::move(indices);
         }
-        num_rows_ = indices_.size();
 
-        size_t total_size = size_;
-        size_ = 0;
-        Expand(total_size);
+        // for variable length column in memory mode only
+        if (data_ == nullptr) {
+            num_rows_ = indices_.size();
 
-        while (!load_buf_.empty()) {
-            auto data = std::move(load_buf_.front());
-            load_buf_.pop();
+            size_t total_size = size_;
+            size_ = 0;
+            Expand(total_size);
 
-            std::copy_n(data.data(), data.length(), data_ + size_);
-            size_ += data.length();
+            while (!load_buf_.empty()) {
+                auto data = std::move(load_buf_.front());
+                load_buf_.pop();
+
+                std::copy_n(data.data(), data.length(), data_ + size_);
+                size_ += data.length();
+            }
         }
 
         ConstructViews();