Skip to content
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

Jump to bottom

feat(schema): add unit tests for schema by cpp. #22

Merged
merged 1 commit into from
Jul 18, 2023
Merged

feat(schema): add unit tests for schema by cpp. #22

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
6 changes: 2 additions & 4 deletions cpp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ debug:
clean:
rm -rf build

test:
conan install . -if build --build=missing
conan build .
cd build && ctest . -j ${TEST_THREADS} --output-on-failure
test: build
cd build/Release && ctest . -j ${TEST_THREADS} --output-on-failure

format:
find ./src -type f ! -name "*.pb.h" -iname *.h -o -iname *.cpp | xargs clang-format -i
Expand Down
171 changes: 110 additions & 61 deletions cpp/test/schema_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,117 @@
#include "gtest/gtest.h"
#include "storage/options.h"
#include "storage/test_util.h"
#include <arrow/util/key_value_metadata.h>

namespace milvus_storage {

// TEST(SchemaValidateTest, SchemaValidateNoVersionColTest) {
// std::vector<std::string> field_names = {"field1", "field2"};
// std::vector<std::shared_ptr<arrow::DataType>> field_types = {
// arrow::int64(),
// arrow::fixed_size_binary(8),
// };
// std::shared_ptr<arrow::Schema> schema = CreateArrowSchema(field_names, field_types);
// SchemaOptions options;
// options.primary_column = "field1";
// options.vector_column = "field2";
//
// Schema schema_obj(schema, options);
// Status status = schema_obj.Validate();
// ASSERT_TRUE(status.ok());
//
// auto scalar_schema = schema_obj.scalar_schema();
// ASSERT_EQ(scalar_schema->num_fields(), 1);
// ASSERT_EQ(scalar_schema->field(0)->name(), options.primary_column);
//
// auto vector_schema = schema_obj.vector_schema();
// ASSERT_EQ(vector_schema->num_fields(), 2);
// ASSERT_EQ(vector_schema->field(0)->name(), options.primary_column);
// ASSERT_EQ(vector_schema->field(1)->name(), options.vector_column);
//
// auto delete_schema = schema_obj.delete_schema();
// ASSERT_EQ(delete_schema->num_fields(), 1);
// ASSERT_EQ(delete_schema->field(0)->name(), options.primary_column);
// }
//
// TEST(SchemaValidateTest, SchemaValidateVersionColTest) {
// std::vector<std::string> field_names = {"field1", "field2", "field3"};
// std::vector<std::shared_ptr<arrow::DataType>> field_types = {arrow::int64(), arrow::fixed_size_binary(8),
// arrow::int64()};
// std::shared_ptr<arrow::Schema> schema = CreateArrowSchema(field_names, field_types);
// SchemaOptions options;
// options.primary_column = "field1";
// options.vector_column = "field2";
// options.version_column = "field3";
//
// Schema schema_obj(schema, options);
// auto status = schema_obj.Validate();
// ASSERT_TRUE(status.ok());
//
// auto scalar_schema = schema_obj.scalar_schema();
// ASSERT_EQ(scalar_schema->num_fields(), 2);
// ASSERT_EQ(scalar_schema->field(0)->name(), options.primary_column);
// ASSERT_EQ(scalar_schema->field(1)->name(), options.version_column);
//
// auto vector_schema = schema_obj.vector_schema();
// ASSERT_EQ(vector_schema->num_fields(), 3);
// auto n = vector_schema->num_fields();
// ASSERT_EQ(vector_schema->field(0)->name(), options.primary_column);
// ASSERT_EQ(vector_schema->field(1)->name(), options.vector_column);
// ASSERT_EQ(vector_schema->field(2)->name(), options.version_column);
//
// auto delete_schema = schema_obj.delete_schema();
// ASSERT_EQ(delete_schema->num_fields(), 2);
// ASSERT_EQ(delete_schema->field(0)->name(), options.primary_column);
// ASSERT_EQ(delete_schema->field(1)->name(), options.version_column);
// }
//
TEST(SchemaValidateTest, SchemaValidateNoVersionColTest) {
// Create Fields
std::shared_ptr<arrow::KeyValueMetadata> metadata = arrow::KeyValueMetadata::Make(
std::vector<std::string>{"key1", "key2"}, std::vector<std::string>{"value1", "value2"});

std::shared_ptr<arrow::Field> pk_field = arrow::field("pk_field", arrow::int64(), /*nullable=*/false, metadata);

std::shared_ptr<arrow::Field> vec_field =
arrow::field("vec_field", arrow::fixed_size_binary(10), /*nullable=*/false, metadata);

// Create Arrow Schema
arrow::SchemaBuilder schema_builder;
auto status = schema_builder.AddField(pk_field);
ASSERT_TRUE(status.ok());

status = schema_builder.AddField(vec_field);
ASSERT_TRUE(status.ok());
auto schema_metadata =
arrow::KeyValueMetadata(std::vector<std::string>{"key1", "key2"}, std::vector<std::string>{"value1", "value2"});
auto metadata_status = schema_builder.AddMetadata(schema_metadata);
ASSERT_TRUE(metadata_status.ok());
auto arrow_schema = schema_builder.Finish().ValueOrDie();

// Create Options
auto options = std::make_shared<Options>();
options->uri = "file:///tmp/test";
auto schema_options = std::make_shared<SchemaOptions>();
schema_options->primary_column = "pk_field";

schema_options->vector_column = "vec_field";

// Create Schema
auto space_schema1 = std::make_shared<Schema>(arrow_schema, schema_options);

auto sp_status1 = space_schema1->Validate();
ASSERT_TRUE(sp_status1.ok());

auto scalar_schema = space_schema1->scalar_schema();
ASSERT_EQ(scalar_schema->num_fields(), 1);
ASSERT_EQ(scalar_schema->field(0)->name(), schema_options->primary_column);

auto vector_schema = space_schema1->vector_schema();
ASSERT_EQ(vector_schema->num_fields(), 2);
ASSERT_EQ(vector_schema->field(0)->name(), schema_options->primary_column);

ASSERT_EQ(vector_schema->field(1)->name(), schema_options->vector_column);

auto delete_schema = space_schema1->delete_schema();
ASSERT_EQ(delete_schema->num_fields(), 1);
ASSERT_EQ(delete_schema->field(0)->name(), schema_options->primary_column);
}

TEST(SchemaValidateTest, SchemaValidateVersionColTest) {
// Create Fields
std::shared_ptr<arrow::KeyValueMetadata> metadata = arrow::KeyValueMetadata::Make(
std::vector<std::string>{"key1", "key2"}, std::vector<std::string>{"value1", "value2"});

std::shared_ptr<arrow::Field> pk_field = arrow::field("pk_field", arrow::int64(), /*nullable=*/false, metadata);

std::shared_ptr<arrow::Field> ts_field = arrow::field("ts_field", arrow::int64(), /*nullable=*/false, metadata);

std::shared_ptr<arrow::Field> vec_field =
arrow::field("vec_field", arrow::fixed_size_binary(10), /*nullable=*/false, metadata);

// Create Arrow Schema
arrow::SchemaBuilder schema_builder;
auto status = schema_builder.AddField(pk_field);
ASSERT_TRUE(status.ok());
status = schema_builder.AddField(ts_field);
ASSERT_TRUE(status.ok());
status = schema_builder.AddField(vec_field);
ASSERT_TRUE(status.ok());
auto schema_metadata =
arrow::KeyValueMetadata(std::vector<std::string>{"key1", "key2"}, std::vector<std::string>{"value1", "value2"});
auto metadata_status = schema_builder.AddMetadata(schema_metadata);
ASSERT_TRUE(metadata_status.ok());
auto arrow_schema = schema_builder.Finish().ValueOrDie();

// Create Options
auto options = std::make_shared<Options>();
options->uri = "file:///tmp/test";
auto schema_options = std::make_shared<SchemaOptions>();
schema_options->primary_column = "pk_field";
schema_options->version_column = "ts_field";
schema_options->vector_column = "vec_field";

// Create Schema
auto space_schema1 = std::make_shared<Schema>(arrow_schema, schema_options);

auto sp_status1 = space_schema1->Validate();
ASSERT_TRUE(sp_status1.ok());

auto scalar_schema = space_schema1->scalar_schema();
ASSERT_EQ(scalar_schema->num_fields(), 2);
ASSERT_EQ(scalar_schema->field(0)->name(), schema_options->primary_column);
ASSERT_EQ(scalar_schema->field(1)->name(), schema_options->version_column);

auto vector_schema = space_schema1->vector_schema();
ASSERT_EQ(vector_schema->num_fields(), 3);
ASSERT_EQ(vector_schema->field(0)->name(), schema_options->primary_column);
ASSERT_EQ(vector_schema->field(1)->name(), schema_options->version_column);
ASSERT_EQ(vector_schema->field(2)->name(), schema_options->vector_column);

auto delete_schema = space_schema1->delete_schema();
ASSERT_EQ(delete_schema->num_fields(), 2);
ASSERT_EQ(delete_schema->field(0)->name(), schema_options->primary_column);
ASSERT_EQ(delete_schema->field(1)->name(), schema_options->version_column);
}

} // namespace milvus_storage