Skip to content

Refactor RTreeIndex tests and remove unused configurations #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaocai2333 merged 1 commit into from
Aug 21, 2025
Merged

Refactor RTreeIndex tests and remove unused configurations #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 8 additions & 112 deletions internal/core/unittest/test_rtree_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,6 @@ TEST_F(RTreeIndexTest, Build_ConfigAndMetaJson) {

nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["fillFactor"] = "0.6";
build_cfg["indexCapacity"] = "32";
build_cfg["leafCapacity"] = "64";
build_cfg["rv"] = "RSTAR";

rtree.Build(build_cfg);
auto stats = rtree.Upload({});
Expand All @@ -295,11 +291,7 @@ TEST_F(RTreeIndexTest, Build_ConfigAndMetaJson) {

std::string base_path;
for (const auto& p : local_paths) {
if (ends_with(p, ".dat")) {
base_path = p.substr(0, p.size() - 4);
break;
}
if (ends_with(p, ".idx")) {
if (ends_with(p, ".bgi")) {
base_path = p.substr(0, p.size() - 4);
break;
}
Expand All @@ -320,94 +312,9 @@ TEST_F(RTreeIndexTest, Build_ConfigAndMetaJson) {
std::ifstream ifs(base_path + ".meta.json");
ASSERT_TRUE(ifs.good());
nlohmann::json meta = nlohmann::json::parse(ifs);
ASSERT_EQ(meta["fill_factor"], "0.6");
ASSERT_EQ(meta["index_capacity"], "32");
ASSERT_EQ(meta["leaf_capacity"], "64");
ASSERT_EQ(meta["dimension"], 2);
}

TEST_F(RTreeIndexTest, Build_InvalidVariant_ShouldThrow) {
// Prepare insert
std::vector<std::string> wkbs = {CreateWkbFromWkt("POINT(0 0)")};
auto remote_file = (temp_path_.get() / "geom2.parquet").string();
WriteGeometryInsertFile(chunk_manager_, field_meta_, remote_file, wkbs);

milvus::storage::FileManagerContext ctx(
field_meta_, index_meta_, chunk_manager_);
milvus::index::RTreeIndex<std::string> rtree(ctx);

nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["rv"] = "FOO"; // invalid
EXPECT_THROW(rtree.Build(build_cfg), milvus::SegcoreError);
}

TEST_F(RTreeIndexTest, Load_OnlyIdx_OnlyDat) {
// Build and upload
milvus::storage::FileManagerContext ctx(
field_meta_, index_meta_, chunk_manager_);
milvus::index::RTreeIndex<std::string> rtree(ctx);
std::vector<std::string> wkbs = {CreatePointWKB(3.0, 3.0),
CreatePointWKB(4.0, 4.0)};
rtree.BuildWithRawDataForUT(wkbs.size(), wkbs.data());
auto stats = rtree.Upload({});

std::vector<std::string> only_idx, only_dat;
for (const auto& p : stats->GetIndexFiles()) {
if (boost::algorithm::ends_with(p, ".idx_0"))
only_idx.push_back(p);
if (boost::algorithm::ends_with(p, ".dat_0"))
only_dat.push_back(p);
}
ASSERT_FALSE(only_idx.empty());
ASSERT_FALSE(only_dat.empty());

// Load with only idx should fail
milvus::storage::FileManagerContext ctx_load1(
field_meta_, index_meta_, chunk_manager_);
ctx_load1.set_for_loading_index(true);
milvus::index::RTreeIndex<std::string> rtree_load1(ctx_load1);
nlohmann::json cfg1;
cfg1["index_files"] = only_idx;
milvus::tracer::TraceContext trace_ctx;
EXPECT_ANY_THROW(rtree_load1.Load(trace_ctx, cfg1));

// Load with only dat should fail
milvus::storage::FileManagerContext ctx_load2(
field_meta_, index_meta_, chunk_manager_);
ctx_load2.set_for_loading_index(true);
milvus::index::RTreeIndex<std::string> rtree_load2(ctx_load2);
nlohmann::json cfg2;
cfg2["index_files"] = only_dat;
EXPECT_ANY_THROW(rtree_load2.Load(trace_ctx, cfg2));
}

TEST_F(RTreeIndexTest, Load_OnlyMeta_ShouldThrow) {
// Build and upload
milvus::storage::FileManagerContext ctx(
field_meta_, index_meta_, chunk_manager_);
milvus::index::RTreeIndex<std::string> rtree(ctx);
std::vector<std::string> wkbs = {CreatePointWKB(5.0, 5.0)};
rtree.BuildWithRawDataForUT(wkbs.size(), wkbs.data());
auto stats = rtree.Upload({});

std::vector<std::string> only_meta;
for (const auto& p : stats->GetIndexFiles()) {
if (boost::algorithm::ends_with(p, ".meta.json_0"))
only_meta.push_back(p);
}
ASSERT_FALSE(only_meta.empty());

milvus::storage::FileManagerContext ctx_load(
field_meta_, index_meta_, chunk_manager_);
ctx_load.set_for_loading_index(true);
milvus::index::RTreeIndex<std::string> rtree_load(ctx_load);
nlohmann::json cfg;
cfg["index_files"] = only_meta;
milvus::tracer::TraceContext trace_ctx;
EXPECT_ANY_THROW(rtree_load.Load(trace_ctx, cfg));
}

TEST_F(RTreeIndexTest, Load_MixedFileNamesAndPaths) {
// Build and upload
milvus::storage::FileManagerContext ctx(
Expand Down Expand Up @@ -444,7 +351,7 @@ TEST_F(RTreeIndexTest, Load_NonexistentRemote_ShouldThrow) {
// nonexist file
nlohmann::json cfg;
cfg["index_files"] = std::vector<std::string>{
(temp_path_.get() / "does_not_exist.idx_0").string()};
(temp_path_.get() / "does_not_exist.bgi_0").string()};
milvus::tracer::TraceContext trace_ctx;
EXPECT_THROW(rtree_load.Load(trace_ctx, cfg), milvus::SegcoreError);
}
Expand All @@ -462,10 +369,7 @@ TEST_F(RTreeIndexTest, Build_EndToEnd_FromInsertFiles) {

nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["fillFactor"] = "0.8";
build_cfg["indexCapacity"] = "50";
build_cfg["leafCapacity"] = "50";
build_cfg["rv"] = "RSTAR";

rtree.Build(build_cfg);
ASSERT_EQ(rtree.Count(), wkbs.size());

Expand Down Expand Up @@ -504,10 +408,7 @@ TEST_F(RTreeIndexTest, Build_Upload_Load_LargeDataset) {

nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["fillFactor"] = "0.8";
build_cfg["indexCapacity"] = "50";
build_cfg["leafCapacity"] = "50";
build_cfg["rv"] = "RSTAR";

rtree.Build(build_cfg);

ASSERT_EQ(rtree.Count(), static_cast<int64_t>(N));
Expand Down Expand Up @@ -558,10 +459,7 @@ TEST_F(RTreeIndexTest, Build_BulkLoad_Nulls_And_BadWKB) {

nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["fillFactor"] = "0.8";
build_cfg["indexCapacity"] = "50";
build_cfg["leafCapacity"] = "50";
build_cfg["rv"] = "RSTAR";

rtree.Build(build_cfg);

// expect: 3 geometries (0, 2, 4) are valid and parsable, 1st geometry is marked null and skipped, 3rd geometry is bad WKB and skipped
Expand All @@ -585,6 +483,7 @@ TEST_F(RTreeIndexTest, Build_BulkLoad_Nulls_And_BadWKB) {
}

// The following two tests only test the coarse query (R-Tree) and not the exact query (GDAL)

TEST_F(RTreeIndexTest, Query_CoarseAndExact_Equals_Intersects_Within) {
// Build a small index in-memory (via UT API)
milvus::storage::FileManagerContext ctx(
Expand Down Expand Up @@ -713,7 +612,7 @@ TEST_F(RTreeIndexTest, Query_Touches_Contains_Crosses_Overlaps) {
"POLYGON(( -1 -1, -1 4, 4 4, 4 -1, -1 -1))");
EXPECT_TRUE(bm[0]);
EXPECT_TRUE(bm[1]);
EXPECT_FALSE(bm[2]);
EXPECT_TRUE(bm[2]);
}

// Touches: polygon that only touches at the corner (2,2) with id1
Expand Down Expand Up @@ -800,10 +699,7 @@ TEST_F(RTreeIndexTest, GIS_Index_Exact_Filtering) {
milvus::index::RTreeIndex<std::string> rtree_build(fm_ctx);
nlohmann::json build_cfg;
build_cfg["insert_files"] = std::vector<std::string>{remote_file};
build_cfg["fillFactor"] = "0.8";
build_cfg["indexCapacity"] = "50";
build_cfg["leafCapacity"] = "50";
build_cfg["rv"] = "RSTAR";

rtree_build.Build(build_cfg);
auto stats = rtree_build.Upload({});

Expand Down
110 changes: 0 additions & 110 deletions internal/util/indexparamcheck/rtree_checker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package indexparamcheck

import (
"fmt"
"strconv"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -45,114 +43,6 @@ func TestRTREEChecker(t *testing.T) {
assert.Error(t, err)
})

t.Run("valid parameters with defaults", func(t *testing.T) {
params := make(map[string]string)
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.NoError(t, err)

// Check that defaults are applied
assert.Equal(t, fmt.Sprintf("%f", DefaultRTreeFillFactor), params[RTreeFillFactor])
assert.Equal(t, strconv.Itoa(DefaultRTreeIndexCapacity), params[RTreeIndexCapacity])
assert.Equal(t, strconv.Itoa(DefaultRTreeLeafCapacity), params[RTreeLeafCapacity])
assert.Equal(t, strconv.Itoa(DefaultRTreeDim), params[RTreeDim])
assert.Equal(t, DefaultRTreeRV, params[RTreeRV])
})

t.Run("valid custom parameters", func(t *testing.T) {
params := map[string]string{
RTreeFillFactor: "0.7",
RTreeIndexCapacity: "150",
RTreeLeafCapacity: "150",
RTreeDim: "2",
RTreeRV: "RV_LINEAR",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.NoError(t, err)
})

t.Run("invalid fillFactor - too low", func(t *testing.T) {
params := map[string]string{
RTreeFillFactor: "0.05",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid fillFactor - too high", func(t *testing.T) {
params := map[string]string{
RTreeFillFactor: "1.5",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid indexCapacity - too low", func(t *testing.T) {
params := map[string]string{
RTreeIndexCapacity: "1",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid indexCapacity - too high", func(t *testing.T) {
params := map[string]string{
RTreeIndexCapacity: "1500",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid leafCapacity - too low", func(t *testing.T) {
params := map[string]string{
RTreeLeafCapacity: "1",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid leafCapacity - too high", func(t *testing.T) {
params := map[string]string{
RTreeLeafCapacity: "1500",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid dimension - too low", func(t *testing.T) {
params := map[string]string{
RTreeDim: "1",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid dimension - too high", func(t *testing.T) {
params := map[string]string{
RTreeDim: "4",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("invalid rv value", func(t *testing.T) {
params := map[string]string{
RTreeRV: "INVALID_RV",
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.Error(t, err)
})

t.Run("valid rv values", func(t *testing.T) {
validRVs := []string{"RV_LINEAR", "RV_QUADRATIC", "RV_RSTAR"}
for _, rv := range validRVs {
params := map[string]string{
RTreeRV: rv,
}
err := c.CheckTrain(schemapb.DataType_Geometry, params)
assert.NoError(t, err)
}
})

t.Run("non-geometry data type", func(t *testing.T) {
params := make(map[string]string)
err := c.CheckTrain(schemapb.DataType_VarChar, params)
Expand Down
Loading