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

Include array schema name when dumping fragment info. #5257

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Include array schema name when dumping fragment info. #5257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efabc36
Include array schema name when dumping fragment info.
teo-tsirpanis Aug 26, 2024
f714ed6
Fix tests.
teo-tsirpanis Aug 27, 2024
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
35 changes: 26 additions & 9 deletions test/src/unit-capi-fragment_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,20 +1526,27 @@ TEST_CASE("C API: Test fragment info, dump", "[capi][fragment_info][dump]") {

// Check dump
const auto ver = std::to_string(tiledb::sm::constants::format_version);
const char* schema_name;
rc = tiledb_fragment_info_get_array_schema_name(
ctx, fragment_info, 0, &schema_name);
CHECK(rc == TILEDB_OK);
std::string dump_str =
std::string("- Fragment num: 3\n") +
"- Unconsolidated metadata num: 3\n" + "- To vacuum num: 0\n" +
"- Fragment #1:\n" + " > URI: " + written_frag_uri_1 + "\n" +
" > Type: dense\n" + " > Non-empty domain: [1, 6]\n" +
" > Size: 3202\n" + " > Cell num: 10\n" +
" > Timestamp range: [1, 1]\n" + " > Format version: " + ver + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [1, 6]\n" + " > Size: 3202\n" +
" > Cell num: 10\n" + " > Timestamp range: [1, 1]\n" +
" > Format version: " + ver + "\n" +
" > Has consolidated metadata: no\n" + "- Fragment #2:\n" +
" > URI: " + written_frag_uri_2 + "\n" + " > Type: dense\n" +
" > URI: " + written_frag_uri_2 + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [1, 4]\n" + " > Size: 3151\n" +
" > Cell num: 5\n" + " > Timestamp range: [2, 2]\n" +
" > Format version: " + ver + "\n" +
" > Has consolidated metadata: no\n" + "- Fragment #3:\n" +
" > URI: " + written_frag_uri_3 + "\n" + " > Type: dense\n" +
" > URI: " + written_frag_uri_3 + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [5, 6]\n" + " > Size: 3202\n" +
" > Cell num: 10\n" + " > Timestamp range: [3, 3]\n" +
" > Format version: " + ver + "\n" +
Expand Down Expand Up @@ -1710,13 +1717,18 @@ TEST_CASE(
CHECK(rc == TILEDB_OK);

// Check dump
const char* schema_name;
rc = tiledb_fragment_info_get_array_schema_name(
ctx, fragment_info, 0, &schema_name);
CHECK(rc == TILEDB_OK);
const auto ver = std::to_string(tiledb::sm::constants::format_version);
std::string dump_str =
std::string("- Fragment num: 1\n") +
"- Unconsolidated metadata num: 1\n" + "- To vacuum num: 3\n" +
"- To vacuum URIs:\n" + " > " + written_frag_uri_1 + "\n > " +
written_frag_uri_2 + "\n > " + written_frag_uri_3 + "\n" +
"- Fragment #1:\n" + " > URI: " + uri + "\n" + " > Type: dense\n" +
"- Fragment #1:\n" + " > URI: " + uri + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [1, 6]\n" + " > Size: 3208\n" +
" > Cell num: 10\n" + " > Timestamp range: [1, 3]\n" +
" > Format version: " + ver + "\n" +
Expand Down Expand Up @@ -1821,13 +1833,18 @@ TEST_CASE(

// Check dump
const auto ver = std::to_string(tiledb::sm::constants::format_version);
const char* schema_name;
rc = tiledb_fragment_info_get_array_schema_name(
ctx, fragment_info, 0, &schema_name);
CHECK(rc == TILEDB_OK);
std::string dump_str =
std::string("- Fragment num: 1\n") +
"- Unconsolidated metadata num: 1\n" + "- To vacuum num: 0\n" +
"- Fragment #1:\n" + " > URI: " + written_frag_uri + "\n" +
" > Type: sparse\n" + " > Non-empty domain: [a, ddd]\n" +
" > Size: 3439\n" + " > Cell num: 4\n" +
" > Timestamp range: [1, 1]\n" + " > Format version: " + ver + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: sparse\n" +
" > Non-empty domain: [a, ddd]\n" + " > Size: 3439\n" +
" > Cell num: 4\n" + " > Timestamp range: [1, 1]\n" +
" > Format version: " + ver + "\n" +
" > Has consolidated metadata: no\n";
FILE* gold_fout = fopen("gold_fout.txt", "w");
const char* dump = dump_str.c_str();
Expand Down
14 changes: 9 additions & 5 deletions test/src/unit-cppapi-fragment_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,20 +1096,24 @@ TEST_CASE(

// Check dump
const auto ver = std::to_string(tiledb::sm::constants::format_version);
auto schema_name = fragment_info.array_schema_name(0);
std::string dump_str =
std::string("- Fragment num: 3\n") +
"- Unconsolidated metadata num: 3\n" + "- To vacuum num: 0\n" +
"- Fragment #1:\n" + " > URI: " + written_frag_uri_1 + "\n" +
" > Type: dense\n" + " > Non-empty domain: [1, 6]\n" +
" > Size: 3202\n" + " > Cell num: 10\n" +
" > Timestamp range: [1, 1]\n" + " > Format version: " + ver + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [1, 6]\n" + " > Size: 3202\n" +
" > Cell num: 10\n" + " > Timestamp range: [1, 1]\n" +
" > Format version: " + ver + "\n" +
" > Has consolidated metadata: no\n" + "- Fragment #2:\n" +
" > URI: " + written_frag_uri_2 + "\n" + " > Type: dense\n" +
" > URI: " + written_frag_uri_2 + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [1, 4]\n" + " > Size: 3151\n" +
" > Cell num: 5\n" + " > Timestamp range: [2, 2]\n" +
" > Format version: " + ver + "\n" +
" > Has consolidated metadata: no\n" + "- Fragment #3:\n" +
" > URI: " + written_frag_uri_3 + "\n" + " > Type: dense\n" +
" > URI: " + written_frag_uri_3 + "\n" +
" > Schema name: " + schema_name + "\n" + " > Type: dense\n" +
" > Non-empty domain: [5, 6]\n" + " > Size: 3202\n" +
" > Cell num: 10\n" + " > Timestamp range: [3, 3]\n" +
" > Format version: " + ver + "\n" +
Expand Down
1 change: 1 addition & 0 deletions tiledb/sm/fragment/single_fragment_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class SingleFragmentInfo {

std::stringstream ss;
ss << " > URI: " << uri_.c_str() << "\n";
ss << " > Schema name: " << array_schema_name_ << "\n";
ss << " > Type: " << (sparse_ ? "sparse" : "dense") << "\n";
ss << " > Non-empty domain: " << non_empty_domain_str(dim_types).c_str()
<< "\n";
Expand Down
Loading