remove TableOperations

Author: wgtmac

src/iceberg/catalog.h

@@ -25,13 +25,17 @@
 #include <string_view>
 #include <vector>
 
+#include "iceberg/error.h"
 #include "iceberg/expected.h"
 #include "iceberg/table_identifier.h"
 #include "iceberg/type_fwd.h"
 
 namespace iceberg {
 
 /// \brief A Catalog API for table create, drop, and load operations.
+///
+/// Note that these functions are named after the corresponding operationId
+/// specified by the Iceberg Rest Catalog API.
 class ICEBERG_EXPORT Catalog {
  public:
   virtual ~Catalog() = default;
@@ -42,9 +46,9 @@ class ICEBERG_EXPORT Catalog {
   /// \brief Return all the identifiers under this namespace
   ///
   /// \param ns a namespace
-  /// \return a list of identifiers for tables or Error::kNoSuchNamespace
+  /// \return a list of identifiers for tables or ErrorKind::kNoSuchNamespace
   /// if the namespace does not exist
-  virtual expected<std::vector<TableIdentifier>, ErrorKind> ListTables(
+  virtual expected<std::vector<TableIdentifier>, Error> ListTables(
       const Namespace& ns) const = 0;
 
   /// \brief Create a table
@@ -54,22 +58,33 @@ class ICEBERG_EXPORT Catalog {
   /// \param spec a partition spec
   /// \param location a location for the table; leave empty if unspecified
   /// \param properties a string map of table properties
-  /// \return a Table instance or Error::kAlreadyExists if the table already exists
-  virtual expected<std::unique_ptr<Table>, ErrorKind> CreateTable(
+  /// \return a Table instance or ErrorKind::kAlreadyExists if the table already exists
+  virtual expected<std::unique_ptr<Table>, Error> CreateTable(
       const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec,
       const std::string& location,
       const std::map<std::string, std::string>& properties) = 0;
 
+  /// \brief Update a table
+  ///
+  /// \param identifier a table identifier
+  /// \param requirements a list of table requirements
+  /// \param updates a list of table updates
+  /// \return a Table instance or ErrorKind::kAlreadyExists if the table already exists
+  virtual expected<std::unique_ptr<Table>, Error> UpdateTable(
+      const TableIdentifier& identifier,
+      const std::vector<std::unique_ptr<UpdateRequirement>>& requirements,
+      const std::vector<std::unique_ptr<MetadataUpdate>>& updates) = 0;
+
   /// \brief Start a transaction to create a table
   ///
   /// \param identifier a table identifier
   /// \param schema a schema
   /// \param spec a partition spec
   /// \param location a location for the table; leave empty if unspecified
   /// \param properties a string map of table properties
-  /// \return a Transaction to create the table or Error::kAlreadyExists if the table
+  /// \return a Transaction to create the table or ErrorKind::kAlreadyExists if the table
   /// already exists
-  virtual expected<std::shared_ptr<Transaction>, ErrorKind> NewCreateTableTransaction(
+  virtual expected<std::shared_ptr<Transaction>, Error> StageCreateTable(
       const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec,
       const std::string& location,
       const std::map<std::string, std::string>& properties) = 0;
@@ -94,16 +109,16 @@ class ICEBERG_EXPORT Catalog {
   ///
   /// \param identifier a table identifier
   /// \return instance of Table implementation referred to by identifier or
-  /// Error::kNoSuchTable if the table does not exist
-  virtual expected<std::shared_ptr<Table>, ErrorKind> LoadTable(
+  /// ErrorKind::kNoSuchTable if the table does not exist
+  virtual expected<std::shared_ptr<Table>, Error> LoadTable(
       const TableIdentifier& identifier) const = 0;
 
   /// \brief Register a table with the catalog if it does not exist
   ///
   /// \param identifier a table identifier
   /// \param metadata_file_location the location of a metadata file
-  /// \return a Table instance or Error::kAlreadyExists if the table already exists
-  virtual expected<std::shared_ptr<Table>, ErrorKind> RegisterTable(
+  /// \return a Table instance or ErrorKind::kAlreadyExists if the table already exists
+  virtual expected<std::shared_ptr<Table>, Error> RegisterTable(
       const TableIdentifier& identifier, const std::string& metadata_file_location) = 0;
 
   /// \brief Initialize a catalog given a custom name and a map of catalog properties
@@ -172,7 +187,7 @@ class ICEBERG_EXPORT Catalog {
     /// \brief Starts a transaction to create the table
     ///
     /// \return the Transaction to create the table
-    virtual std::unique_ptr<Transaction> CreateTransaction() = 0;
+    virtual std::unique_ptr<Transaction> StageCreate() = 0;
   };
 };
 

src/iceberg/demo.cc

@@ -24,7 +24,6 @@
 #include "iceberg/location_provider.h"
 #include "iceberg/puffin.h"
 #include "iceberg/table.h"
-#include "iceberg/table_operations.h"
 #include "iceberg/transaction.h"
 
 namespace iceberg {

src/iceberg/error.h

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <string>
+
+#include "iceberg/iceberg_export.h"
+
+namespace iceberg {
+
+/// \brief Error types for iceberg.
+/// TODO: add more and sort them based on some rules.
+enum class ErrorKind {
+  kNoSuchNamespace,
+  kAlreadyExists,
+  kNoSuchTable,
+  kCommitStateUnknown,
+};
+
+/// \brief Error with a kind and a message.
+struct ICEBERG_EXPORT [[nodiscard]] Error {
+  ErrorKind kind;
+  std::string message;
+};
+
+}  // namespace iceberg

src/iceberg/table.h

@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "iceberg/error.h"
 #include "iceberg/expected.h"
 #include "iceberg/iceberg_export.h"
 #include "iceberg/type_fwd.h"
@@ -42,7 +43,7 @@ class ICEBERG_EXPORT Table {
   virtual const std::string& uuid() const = 0;
 
   /// \brief Refresh the current table metadata
-  virtual void Refresh() = 0;
+  virtual expected<void, Error> Refresh() = 0;
 
   /// \brief Return the schema for this table
   virtual const std::shared_ptr<Schema>& schema() const = 0;
@@ -76,7 +77,7 @@ class ICEBERG_EXPORT Table {
   ///
   /// \param snapshot_id the ID of the snapshot to get
   /// \return the Snapshot with the given id
-  virtual expected<std::shared_ptr<Snapshot>, ErrorKind> snapshot(
+  virtual expected<std::shared_ptr<Snapshot>, Error> snapshot(
       int64_t snapshot_id) const = 0;
 
   /// \brief Get the snapshots of this table

src/iceberg/table_operations.h

@@ -81,22 +81,12 @@ class TimestampTzType;
 class Type;
 class UuidType;
 
-/// \brief Error types for iceberg.
-/// TODO: add more and sort them based on some rules.
-enum class ErrorKind {
-  kNoSuchNamespace,
-  kAlreadyExists,
-  kNoSuchTable,
-  kCommitStateUnknown,
-};
-
 struct Namespace;
 struct TableIdentifier;
 
 class Catalog;
 class LocationProvider;
 class Table;
-class TableOperations;
 class Transaction;
 
 /// ----------------------------------------------------------------------------
@@ -110,6 +100,9 @@ class SortOrder;
 class StructLike;
 class TableMetadata;
 
+class MetadataUpdate;
+class UpdateRequirement;
+
 class AppendFiles;
 class TableScan;