feat: RegisterTable support for InMemoryCatalog

shuxu.li · shuxu.li · commit d8cd04e332a6 · 2025-07-17T10:42:37.000+08:00
diff --git a/src/iceberg/catalog/in_memory_catalog.cc b/src/iceberg/catalog/in_memory_catalog.cc
@@ -411,20 +411,20 @@ Status InMemoryCatalog::DropTable(const TableIdentifier& identifier, bool purge)
 Result<std::shared_ptr<Table>> InMemoryCatalog::LoadTable(
     const TableIdentifier& identifier) {
   if (!file_io_) [[unlikely]] {
-    return NotSupported("file_io is not set for catalog {}", catalog_name_);
+    return InvalidArgument("file_io is not set for catalog {}", catalog_name_);
   }
 
   Result<std::string> metadata_location;
   {
     std::unique_lock lock(mutex_);
-    metadata_location = root_namespace_->GetTableMetadataLocation(identifier);
-    ICEBERG_RETURN_UNEXPECTED(metadata_location);
+    ICEBERG_ASSIGN_OR_RAISE(metadata_location,
+                            root_namespace_->GetTableMetadataLocation(identifier));
   }
 
-  auto metadata = TableMetadataUtil::Read(*file_io_, metadata_location.value());
-  ICEBERG_RETURN_UNEXPECTED(metadata);
+  ICEBERG_ASSIGN_OR_RAISE(auto metadata,
+                          TableMetadataUtil::Read(*file_io_, metadata_location.value()));
 
-  return std::make_shared<Table>(identifier, std::move(metadata.value()),
+  return std::make_shared<Table>(identifier, std::move(metadata),
                                  metadata_location.value(), file_io_,
                                  std::static_pointer_cast<Catalog>(shared_from_this()));
 }

Original file line number	Diff line number	Diff line change
`@@ -411,20 +411,20 @@ Status InMemoryCatalog::DropTable(const TableIdentifier& identifier, bool purge)`
`411`	`411`	`Result<std::shared_ptr<Table>> InMemoryCatalog::LoadTable(`
`412`	`412`	`const TableIdentifier& identifier) {`
`413`	`413`	`if (!file_io_) [[unlikely]] {`
`414`		`- return NotSupported("file_io is not set for catalog {}", catalog_name_);`
	`414`	`+ return InvalidArgument("file_io is not set for catalog {}", catalog_name_);`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`Result<std::string> metadata_location;`
`418`	`418`	`{`
`419`	`419`	`std::unique_lock lock(mutex_);`
`420`		`- metadata_location = root_namespace_->GetTableMetadataLocation(identifier);`
`421`		`- ICEBERG_RETURN_UNEXPECTED(metadata_location);`
	`420`	`+ ICEBERG_ASSIGN_OR_RAISE(metadata_location,`
	`421`	`+ root_namespace_->GetTableMetadataLocation(identifier));`
`422`	`422`	`}`
`423`	`423`
`424`		`- auto metadata = TableMetadataUtil::Read(*file_io_, metadata_location.value());`
`425`		`- ICEBERG_RETURN_UNEXPECTED(metadata);`
	`424`	`+ ICEBERG_ASSIGN_OR_RAISE(auto metadata,`
	`425`	`+ TableMetadataUtil::Read(*file_io_, metadata_location.value()));`
`426`	`426`
`427`		`- return std::make_shared<Table>(identifier, std::move(metadata.value()),`
	`427`	`+ return std::make_shared<Table>(identifier, std::move(metadata),`
`428`	`428`	`metadata_location.value(), file_io_,`
`429`	`429`	`std::static_pointer_cast<Catalog>(shared_from_this()));`
`430`	`430`	`}`