Skip to content

GH-41766: [C++][Parquet] Copy key value metadata when store_schema is false #41769

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

Open
TheNeuralBit wants to merge 4 commits into
base: main
Choose a base branch
from
Open

GH-41766: [C++][Parquet] Copy key value metadata when store_schema is false #41769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7f2ae5
Copy key value metadata when store_schema is false
TheNeuralBit May 21, 2024
a49079c
fixup! Copy key value metadata when store_schema is false
TheNeuralBit May 22, 2024
203d4ca
fixup! Copy key value metadata when store_schema is false
TheNeuralBit May 22, 2024
3365cbf
fixup! Copy key value metadata when store_schema is false
TheNeuralBit May 28, 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: 29 additions & 6 deletions cpp/src/parquet/arrow/arrow_reader_writer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,22 +649,24 @@ class ParquetIOTestBase : public ::testing::Test {
AssertArraysEqual(values, *out);
}

void ReadTableFromFile(std::unique_ptr<FileReader> reader, bool expect_metadata,
void ReadTableFromFile(std::unique_ptr<FileReader> reader, bool expect_schema,
std::shared_ptr<Table>* out) {
ASSERT_OK_NO_THROW(reader->ReadTable(out));
auto key_value_metadata =
reader->parquet_reader()->metadata()->key_value_metadata().get();
if (!expect_metadata) {
ASSERT_EQ(nullptr, key_value_metadata);
if (!expect_schema) {
ASSERT_TRUE(key_value_metadata == nullptr ||
!key_value_metadata->Contains("ARROW:schema"));
} else {
ASSERT_NE(nullptr, key_value_metadata);
ASSERT_TRUE(key_value_metadata->Contains("ARROW:schema"));
}
ASSERT_NE(nullptr, out->get());
}

void ReadTableFromFile(std::unique_ptr<FileReader> reader,
std::shared_ptr<Table>* out) {
ReadTableFromFile(std::move(reader), /*expect_metadata=*/false, out);
ReadTableFromFile(std::move(reader), /*expect_schema=*/false, out);
}

void RoundTripSingleColumn(
Expand All @@ -680,9 +682,9 @@ class ParquetIOTestBase : public ::testing::Test {
std::shared_ptr<Table> out;
std::unique_ptr<FileReader> reader;
ASSERT_NO_FATAL_FAILURE(this->ReaderFromSink(&reader));
const bool expect_metadata = arrow_properties->store_schema();
const bool expect_schema = arrow_properties->store_schema();
ASSERT_NO_FATAL_FAILURE(
this->ReadTableFromFile(std::move(reader), expect_metadata, &out));
this->ReadTableFromFile(std::move(reader), expect_schema, &out));
ASSERT_EQ(1, out->num_columns());
ASSERT_EQ(table->num_rows(), out->num_rows());

Expand Down Expand Up @@ -5343,6 +5345,27 @@ TEST(TestArrowReadWrite, OperationsOnClosedWriter) {
ASSERT_RAISES(Invalid, writer->WriteTable(*table, 1));
}

TEST(TestArrowReadWrite, TableWithMetadata) {
auto values = std::make_shared<ChunkedArray>(::arrow::ArrayVector{}, ::arrow::int32());
auto table =
MakeSimpleTable(values, false, ::arrow::KeyValueMetadata::Make({"foo"}, {"bar"}));

auto sink = CreateOutputStream();
ASSERT_OK_NO_THROW(
WriteTable(*table, ::arrow::default_memory_pool(), sink, SMALL_SIZE));
ASSERT_OK_AND_ASSIGN(auto buffer, sink->Finish());

std::shared_ptr<Table> out;
std::unique_ptr<FileReader> reader;
ASSERT_OK_NO_THROW(OpenFile(std::make_shared<BufferReader>(buffer),
::arrow::default_memory_pool(), &reader));
ASSERT_OK_NO_THROW(reader->ReadTable(&out));

ASSERT_NE(nullptr, out->schema()->metadata());
ASSERT_TRUE(out->schema()->metadata()->Contains("foo"));
ASSERT_EQ("bar", out->schema()->metadata()->Get("foo"));
}

namespace {

struct ColumnIndexObject {
Expand Down
13 changes: 8 additions & 5 deletions cpp/src/parquet/arrow/test_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,18 @@ Status MakeEmptyListsArray(int64_t size, std::shared_ptr<Array>* out_array) {
}

std::shared_ptr<::arrow::Table> MakeSimpleTable(
const std::shared_ptr<ChunkedArray>& values, bool nullable) {
auto schema = ::arrow::schema({::arrow::field("col", values->type(), nullable)});
const std::shared_ptr<ChunkedArray>& values, bool nullable,
std::shared_ptr<::arrow::KeyValueMetadata> metadata = nullptr) {
auto schema = ::arrow::schema({::arrow::field("col", values->type(), nullable)},
std::move(metadata));
return ::arrow::Table::Make(schema, {values});
}

std::shared_ptr<::arrow::Table> MakeSimpleTable(const std::shared_ptr<Array>& values,
bool nullable) {
std::shared_ptr<::arrow::Table> MakeSimpleTable(
const std::shared_ptr<Array>& values, bool nullable,
std::shared_ptr<::arrow::KeyValueMetadata> metadata = nullptr) {
auto carr = std::make_shared<::arrow::ChunkedArray>(values);
return MakeSimpleTable(carr, nullable);
return MakeSimpleTable(carr, nullable, std::move(metadata));
}

template <typename T>
Expand Down
7 changes: 6 additions & 1 deletion cpp/src/parquet/arrow/writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,12 @@ Status GetSchemaMetadata(const ::arrow::Schema& schema, ::arrow::MemoryPool* poo
const ArrowWriterProperties& properties,
std::shared_ptr<const KeyValueMetadata>* out) {
if (!properties.store_schema()) {
*out = nullptr;
if (schema.metadata()) {
*out = schema.metadata()->Copy();
} else {
// No metadata to propagate
*out = nullptr;
}
return Status::OK();
}

Expand Down