Copilot commented on code in PR #801: URL: https://github.com/apache/iceberg-cpp/pull/801#discussion_r3627722774
########## src/iceberg/test/snapshots_table_test.cc: ########## @@ -0,0 +1,162 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include <memory> +#include <utility> + +#include <arrow/array.h> +#include <arrow/c/bridge.h> +#include <arrow/record_batch.h> +#include <gmock/gmock.h> +#include <gtest/gtest.h> + +#include "iceberg/inspect/metadata_table.h" +#include "iceberg/schema.h" +#include "iceberg/schema_field.h" +#include "iceberg/test/matchers.h" +#include "iceberg/test/metadata_table_test_base.h" +#include "iceberg/type.h" + +namespace iceberg { +namespace { + +std::shared_ptr<Schema> MakeSnapshotsSchema() { + return std::make_shared<Schema>(std::vector<SchemaField>{ + SchemaField::MakeRequired(1, "committed_at", timestamp_tz()), + SchemaField::MakeRequired(2, "snapshot_id", int64()), + SchemaField::MakeOptional(3, "parent_id", int64()), + SchemaField::MakeOptional(4, "operation", string()), + SchemaField::MakeOptional(5, "manifest_list", string()), + SchemaField::MakeOptional( + 6, "summary", + std::make_shared<MapType>(SchemaField::MakeRequired(7, "key", string()), + SchemaField::MakeRequired(8, "value", string())))}); +} + +} // namespace + +class SnapshotsTableTest : public MetadataTableTestBase { + protected: + void SetUp() override { + MetadataTableTestBase::SetUp(); + + auto [snap1, snap2] = MakeTestSnapshots(); + snap1_ = snap1; + snap2_ = snap2; + + ICEBERG_UNWRAP_OR_FAIL( + table_, MakeTableWithSnapshots({snap1, snap2}, /*current_snapshot_id=*/2)); + + ICEBERG_UNWRAP_OR_FAIL(snapshots_table_, + MetadataTable::Make(table_, MetadataTable::Kind::kSnapshots)); + } + + std::shared_ptr<Table> table_; + std::shared_ptr<Snapshot> snap1_; + std::shared_ptr<Snapshot> snap2_; + std::unique_ptr<MetadataTable> snapshots_table_; Review Comment: `SnapshotsTableTest` stores `snap1_`/`snap2_` but they are never used, and the derived `table_` member hides `MetadataTableTestBase::table_`, which makes it easy to accidentally use the wrong fixture table (this already happens in different tests via `MetadataTableTestBase::table_` vs `table_`). Renaming/removing these members makes the fixture clearer and avoids member hiding. ########## src/iceberg/test/snapshots_table_test.cc: ########## @@ -0,0 +1,162 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include <memory> +#include <utility> + +#include <arrow/array.h> +#include <arrow/c/bridge.h> +#include <arrow/record_batch.h> +#include <gmock/gmock.h> +#include <gtest/gtest.h> + +#include "iceberg/inspect/metadata_table.h" +#include "iceberg/schema.h" +#include "iceberg/schema_field.h" +#include "iceberg/test/matchers.h" +#include "iceberg/test/metadata_table_test_base.h" +#include "iceberg/type.h" + +namespace iceberg { +namespace { + +std::shared_ptr<Schema> MakeSnapshotsSchema() { + return std::make_shared<Schema>(std::vector<SchemaField>{ + SchemaField::MakeRequired(1, "committed_at", timestamp_tz()), + SchemaField::MakeRequired(2, "snapshot_id", int64()), + SchemaField::MakeOptional(3, "parent_id", int64()), + SchemaField::MakeOptional(4, "operation", string()), + SchemaField::MakeOptional(5, "manifest_list", string()), + SchemaField::MakeOptional( + 6, "summary", + std::make_shared<MapType>(SchemaField::MakeRequired(7, "key", string()), + SchemaField::MakeRequired(8, "value", string())))}); +} + +} // namespace + +class SnapshotsTableTest : public MetadataTableTestBase { + protected: + void SetUp() override { + MetadataTableTestBase::SetUp(); + + auto [snap1, snap2] = MakeTestSnapshots(); + snap1_ = snap1; + snap2_ = snap2; + + ICEBERG_UNWRAP_OR_FAIL( + table_, MakeTableWithSnapshots({snap1, snap2}, /*current_snapshot_id=*/2)); + + ICEBERG_UNWRAP_OR_FAIL(snapshots_table_, + MetadataTable::Make(table_, MetadataTable::Kind::kSnapshots)); + } + + std::shared_ptr<Table> table_; + std::shared_ptr<Snapshot> snap1_; + std::shared_ptr<Snapshot> snap2_; + std::unique_ptr<MetadataTable> snapshots_table_; +}; + +TEST_F(SnapshotsTableTest, Construct) { + ICEBERG_UNWRAP_OR_FAIL(snapshots_table_, + MetadataTable::Make(MetadataTableTestBase::table_, + MetadataTable::Kind::kSnapshots)); + EXPECT_EQ(snapshots_table_->kind(), MetadataTable::Kind::kSnapshots); + EXPECT_EQ(snapshots_table_->source_table(), MetadataTableTestBase::table_); + EXPECT_EQ(snapshots_table_->name().name, "source_table.snapshots"); + EXPECT_EQ(snapshots_table_->name().ns.levels, (std::vector<std::string>{"db"})); + EXPECT_NE(snapshots_table_->schema(), nullptr); +} + +TEST_F(SnapshotsTableTest, SchemaMatchesIcebergSchema) { + ICEBERG_UNWRAP_OR_FAIL(snapshots_table_, + MetadataTable::Make(MetadataTableTestBase::table_, + MetadataTable::Kind::kSnapshots)); + EXPECT_TRUE(*snapshots_table_->schema() == *MakeSnapshotsSchema()); +} + +TEST_F(SnapshotsTableTest, Scan) { + // Scan the snapshots table once and verify all columns of the result. + ICEBERG_UNWRAP_OR_FAIL(auto array, snapshots_table_->Scan()); + auto batch = FinishAndImport(std::move(array), *snapshots_table_->schema()); + + // Row and column counts. + EXPECT_EQ(batch->num_rows(), 2); + EXPECT_EQ(batch->num_columns(), 6); + + // Column 0: committed_at (timestamptz) — microseconds since epoch. + auto committed_at = std::static_pointer_cast<::arrow::TimestampArray>(batch->column(0)); + EXPECT_EQ(committed_at->Value(0), 1234567890000 * 1000); + EXPECT_EQ(committed_at->Value(1), 9876543210000 * 1000); + + // Column 1: snapshot_id (long) — returned in storage order. + auto snapshot_ids = std::static_pointer_cast<::arrow::Int64Array>(batch->column(1)); + EXPECT_EQ(snapshot_ids->Value(0), 1); + EXPECT_EQ(snapshot_ids->Value(1), 2); + + // Column 2: parent_id (long) — first snapshot has no parent. + auto parent_ids = std::static_pointer_cast<::arrow::Int64Array>(batch->column(2)); + EXPECT_TRUE(parent_ids->IsNull(0)); + EXPECT_FALSE(parent_ids->IsNull(1)); + EXPECT_EQ(parent_ids->Value(1), 1); + + // Column 3: operation (string). + auto operations = std::static_pointer_cast<::arrow::StringArray>(batch->column(3)); + EXPECT_EQ(operations->GetString(0), "append"); + EXPECT_EQ(operations->GetString(1), "append"); + + // Column 4: manifest_list (string). + auto manifest_lists = std::static_pointer_cast<::arrow::StringArray>(batch->column(4)); + EXPECT_EQ(manifest_lists->GetString(0), "file:/tmp/manifest1.avro"); + EXPECT_EQ(manifest_lists->GetString(1), "file:/tmp/manifest2.avro"); + + // Column 5: summary (map<string,string>) — each summary has 11 entries + // (10 data + 1 operation). + auto summaries = std::static_pointer_cast<::arrow::MapArray>(batch->column(5)); + EXPECT_FALSE(summaries->IsNull(0)); + EXPECT_FALSE(summaries->IsNull(1)); + EXPECT_EQ(summaries->value_length(0), 11); + EXPECT_EQ(summaries->value_length(1), 11); +} Review Comment: The Scan test only asserts `summary` map lengths, which won’t catch wrong/missing key-value pairs (especially since `AppendStringMap` iterates an `unordered_map`). It would be more robust to assert that a couple of expected keys exist with the expected values for each row. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
