-
Notifications
You must be signed in to change notification settings - Fork 80
feat: implement update location #508
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -175,7 +175,8 @@ if(ICEBERG_BUILD_BUNDLE) | |
| update_partition_spec_test.cc | ||
| update_properties_test.cc | ||
| update_schema_test.cc | ||
| update_sort_order_test.cc) | ||
| update_sort_order_test.cc | ||
| update_location_test.cc) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sort alphabetically |
||
|
|
||
| add_iceberg_test(data_writer_test USE_BUNDLE SOURCES data_writer_test.cc) | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /* | ||
| * 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 "iceberg/update/update_location.h" | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
|
|
||
| #include <arrow/filesystem/mockfs.h> | ||
| #include <gmock/gmock.h> | ||
| #include <gtest/gtest.h> | ||
|
|
||
| #include "iceberg/arrow/arrow_fs_file_io_internal.h" | ||
| #include "iceberg/result.h" | ||
| #include "iceberg/test/matchers.h" | ||
| #include "iceberg/test/update_test_base.h" | ||
|
|
||
| namespace iceberg { | ||
|
|
||
| class UpdateLocationTest : public UpdateTestBase {}; | ||
|
|
||
| TEST_F(UpdateLocationTest, SetLocationSuccess) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's remove this by testing location after commit directly. |
||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
| const std::string new_location = "/warehouse/new_location"; | ||
| update->SetLocation(new_location); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto result, update->Apply()); | ||
| EXPECT_EQ(result, new_location); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, SetLocationMultipleTimes) { | ||
| // Test that setting location multiple times uses the last value | ||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
| update->SetLocation("/warehouse/first_location") | ||
| .SetLocation("/warehouse/second_location") | ||
| .SetLocation("/warehouse/final_location"); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto result, update->Apply()); | ||
| EXPECT_EQ(result, "/warehouse/final_location"); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, SetEmptyLocation) { | ||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
| update->SetLocation(""); | ||
|
|
||
| auto result = update->Apply(); | ||
| EXPECT_THAT(result, IsError(ErrorKind::kValidationFailed)); | ||
| EXPECT_THAT(result, HasErrorMessage("Location cannot be empty")); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, ApplyWithoutSettingLocation) { | ||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
|
|
||
| auto result = update->Apply(); | ||
| EXPECT_THAT(result, IsError(ErrorKind::kInvalidArgument)); | ||
| EXPECT_THAT(result, HasErrorMessage("Location must be set before applying")); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, CommitSuccess) { | ||
| // Test empty commit (should fail since location is not set) | ||
| ICEBERG_UNWRAP_OR_FAIL(auto empty_update, table_->NewUpdateLocation()); | ||
| auto empty_commit_result = empty_update->Commit(); | ||
| EXPECT_THAT(empty_commit_result, IsError(ErrorKind::kInvalidArgument)); | ||
|
|
||
| // Test commit with location change | ||
| // For MockFS, we need to create the metadata directory at the new location | ||
| const std::string new_location = "/warehouse/new_table_location"; | ||
| auto arrow_fs = std::dynamic_pointer_cast<::arrow::fs::internal::MockFileSystem>( | ||
| static_cast<arrow::ArrowFileSystemFileIO&>(*file_io_).fs()); | ||
| ASSERT_TRUE(arrow_fs != nullptr); | ||
| ASSERT_TRUE(arrow_fs->CreateDir(new_location + "/metadata").ok()); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
| update->SetLocation(new_location); | ||
| EXPECT_THAT(update->Commit(), IsOk()); | ||
|
|
||
| // Verify the location was committed | ||
| ICEBERG_UNWRAP_OR_FAIL(auto reloaded, catalog_->LoadTable(table_ident_)); | ||
| EXPECT_EQ(reloaded->location(), new_location); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, CommitWithRelativePath) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We shouldn't test relative path because the spec does not support it yet. This may lead to confusion. |
||
| // Test that relative paths work | ||
| const std::string relative_location = "warehouse/relative_location"; | ||
|
|
||
| // Create metadata directory for the new location | ||
| auto arrow_fs = std::dynamic_pointer_cast<::arrow::fs::internal::MockFileSystem>( | ||
| static_cast<arrow::ArrowFileSystemFileIO&>(*file_io_).fs()); | ||
| ASSERT_TRUE(arrow_fs != nullptr); | ||
| ASSERT_TRUE(arrow_fs->CreateDir(relative_location + "/metadata").ok()); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateLocation()); | ||
| update->SetLocation(relative_location); | ||
|
|
||
| EXPECT_THAT(update->Commit(), IsOk()); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto reloaded, catalog_->LoadTable(table_ident_)); | ||
| EXPECT_EQ(reloaded->location(), relative_location); | ||
| } | ||
|
|
||
| TEST_F(UpdateLocationTest, MultipleUpdatesSequentially) { | ||
| // Get arrow_fs for creating directories | ||
| auto arrow_fs = std::dynamic_pointer_cast<::arrow::fs::internal::MockFileSystem>( | ||
| static_cast<arrow::ArrowFileSystemFileIO&>(*file_io_).fs()); | ||
| ASSERT_TRUE(arrow_fs != nullptr); | ||
|
|
||
| // First update | ||
| const std::string first_location = "/warehouse/first"; | ||
| ASSERT_TRUE(arrow_fs->CreateDir(first_location + "/metadata").ok()); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need to create the dir? |
||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto update1, table_->NewUpdateLocation()); | ||
| update1->SetLocation(first_location); | ||
| EXPECT_THAT(update1->Commit(), IsOk()); | ||
|
|
||
| // Reload and verify | ||
| ICEBERG_UNWRAP_OR_FAIL(auto reloaded1, catalog_->LoadTable(table_ident_)); | ||
| EXPECT_EQ(reloaded1->location(), first_location); | ||
|
|
||
| // Second update | ||
| const std::string second_location = "/warehouse/second"; | ||
| ASSERT_TRUE(arrow_fs->CreateDir(second_location + "/metadata").ok()); | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto update2, reloaded1->NewUpdateLocation()); | ||
| update2->SetLocation(second_location); | ||
| EXPECT_THAT(update2->Commit(), IsOk()); | ||
|
|
||
| // Reload and verify | ||
| ICEBERG_UNWRAP_OR_FAIL(auto reloaded2, catalog_->LoadTable(table_ident_)); | ||
| EXPECT_EQ(reloaded2->location(), second_location); | ||
| } | ||
|
|
||
| } // namespace iceberg | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -187,13 +187,14 @@ class TableUpdateContext; | |
| class Transaction; | ||
|
|
||
| /// \brief Update family. | ||
| class ExpireSnapshots; | ||
| class PendingUpdate; | ||
| class SnapshotUpdate; | ||
| class UpdatePartitionSpec; | ||
| class UpdateProperties; | ||
| class UpdateSchema; | ||
| class UpdateSortOrder; | ||
| class ExpireSnapshots; | ||
| class UpdateLocation; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sort alphabetically |
||
|
|
||
| /// ---------------------------------------------------------------------------- | ||
| /// TODO: Forward declarations below are not added yet. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ install_headers( | |
| 'update_schema.h', | ||
| 'update_sort_order.h', | ||
| 'update_properties.h', | ||
| 'update_location.h', | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sort alphabetically |
||
| ], | ||
| subdir: 'iceberg/update', | ||
| ) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,7 @@ class ICEBERG_EXPORT PendingUpdate : public ErrorCollector { | |
| kUpdateSchema, | ||
| kUpdateSnapshot, | ||
| kUpdateSortOrder, | ||
| kUpdateLocation, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sort alphabetically |
||
| }; | ||
|
|
||
| /// \brief Return the kind of this pending update. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * 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 "iceberg/update/update_location.h" | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
| #include <string_view> | ||
|
|
||
| #include "iceberg/result.h" | ||
| #include "iceberg/transaction.h" | ||
| #include "iceberg/util/macros.h" | ||
|
|
||
| namespace iceberg { | ||
|
|
||
| Result<std::shared_ptr<UpdateLocation>> UpdateLocation::Make( | ||
| std::shared_ptr<Transaction> transaction) { | ||
| ICEBERG_PRECHECK(transaction != nullptr, | ||
| "Cannot create UpdateLocation without a transaction"); | ||
| return std::shared_ptr<UpdateLocation>(new UpdateLocation(std::move(transaction))); | ||
| } | ||
|
|
||
| UpdateLocation::UpdateLocation(std::shared_ptr<Transaction> transaction) | ||
| : PendingUpdate(std::move(transaction)) {} | ||
|
|
||
| UpdateLocation::~UpdateLocation() = default; | ||
|
|
||
| UpdateLocation& UpdateLocation::SetLocation(std::string_view location) { | ||
| ICEBERG_BUILDER_CHECK(!location.empty(), "Location cannot be empty"); | ||
| location_ = std::string(location); | ||
| return *this; | ||
| } | ||
|
|
||
| Result<std::string> UpdateLocation::Apply() { | ||
| ICEBERG_RETURN_UNEXPECTED(CheckErrors()); | ||
| if (location_.empty()) { | ||
| return InvalidArgument("Location must be set before applying"); | ||
| } | ||
| return location_; | ||
| } | ||
|
|
||
| } // namespace iceberg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sort alphabetically