Fix API compatibility after rebase on main

Upstream changed Table and DataTableScanBuilder constructors to require
full_name/table_name and MetricsReporter parameters. Updated RestTable,
RestTableScanBuilder, and their callers accordingly.

Author: Sandeep Gottimukkala

src/iceberg/catalog/rest/rest_catalog.cc

@@ -937,7 +937,8 @@ Result<std::shared_ptr<Table>> RestCatalog::MakeTableFromLoadResult(
     };
     return RestTable::Make(identifier, std::move(result.metadata),
                            std::move(result.metadata_location), std::move(table_io),
-                           std::move(table_catalog), std::move(rest_ctx));
+                           std::move(table_catalog), RestTableName(name_, identifier),
+                           reporter, std::move(rest_ctx));
   }
 
   return Table::Make(identifier, std::move(result.metadata),

src/iceberg/catalog/rest/rest_table.cc

@@ -31,9 +31,12 @@ namespace iceberg::rest {
 
 RestTable::RestTable(TableIdentifier identifier, std::shared_ptr<TableMetadata> metadata,
                      std::string metadata_location, std::shared_ptr<FileIO> io,
-                     std::shared_ptr<Catalog> catalog, RestScanContext rest_context)
+                     std::shared_ptr<Catalog> catalog, std::string full_name,
+                     std::shared_ptr<MetricsReporter> reporter,
+                     RestScanContext rest_context)
     : Table(std::move(identifier), std::move(metadata), std::move(metadata_location),
-            std::move(io), std::move(catalog)),
+            std::move(io), std::move(catalog), std::move(full_name),
+            std::move(reporter)),
       rest_context_(std::move(rest_context)) {}
 
 RestTable::~RestTable() = default;
@@ -43,18 +46,21 @@ Result<std::shared_ptr<RestTable>> RestTable::Make(TableIdentifier identifier,
                                                    std::string metadata_location,
                                                    std::shared_ptr<FileIO> io,
                                                    std::shared_ptr<Catalog> catalog,
+                                                   std::string full_name,
+                                                   std::shared_ptr<MetricsReporter> reporter,
                                                    RestScanContext rest_context) {
   if (metadata == nullptr) {
     return InvalidArgument("Metadata cannot be null");
   }
   return std::shared_ptr<RestTable>(
       new RestTable(std::move(identifier), std::move(metadata),
                     std::move(metadata_location), std::move(io), std::move(catalog),
-                    std::move(rest_context)));
+                    std::move(full_name), std::move(reporter), std::move(rest_context)));
 }
 
 Result<std::unique_ptr<DataTableScanBuilder>> RestTable::NewScan() const {
-  return std::make_unique<RestTableScanBuilder>(metadata_, io_, rest_context_);
+  return std::make_unique<RestTableScanBuilder>(metadata_, io_, full_name_, reporter_,
+                                                rest_context_);
 }
 
 }  // namespace iceberg::rest

src/iceberg/catalog/rest/rest_table.h

@@ -24,6 +24,7 @@
 
 #include "iceberg/catalog/rest/iceberg_rest_export.h"
 #include "iceberg/catalog/rest/rest_table_scan.h"
+#include "iceberg/metrics/metrics_reporter.h"
 #include "iceberg/result.h"
 #include "iceberg/table.h"
 #include "iceberg/type_fwd.h"
@@ -42,6 +43,8 @@ class ICEBERG_REST_EXPORT RestTable final : public Table {
                                                  std::string metadata_location,
                                                  std::shared_ptr<FileIO> io,
                                                  std::shared_ptr<Catalog> catalog,
+                                                 std::string full_name,
+                                                 std::shared_ptr<MetricsReporter> reporter,
                                                  RestScanContext rest_context);
 
   ~RestTable() override;
@@ -53,7 +56,8 @@ class ICEBERG_REST_EXPORT RestTable final : public Table {
  private:
   RestTable(TableIdentifier identifier, std::shared_ptr<TableMetadata> metadata,
             std::string metadata_location, std::shared_ptr<FileIO> io,
-            std::shared_ptr<Catalog> catalog, RestScanContext rest_context);
+            std::shared_ptr<Catalog> catalog, std::string full_name,
+            std::shared_ptr<MetricsReporter> reporter, RestScanContext rest_context);
 
   RestScanContext rest_context_;
 };

src/iceberg/catalog/rest/rest_table_scan.cc

@@ -262,8 +262,11 @@ void RestTableScan::CancelPlanning(const std::string& plan_id) const {
 
 RestTableScanBuilder::RestTableScanBuilder(std::shared_ptr<TableMetadata> metadata,
                                            std::shared_ptr<FileIO> io,
+                                           std::string table_name,
+                                           std::shared_ptr<MetricsReporter> metrics_reporter,
                                            RestScanContext rest_context)
-    : DataTableScanBuilder(std::move(metadata), std::move(io)),
+    : DataTableScanBuilder(std::move(metadata), std::move(io), std::move(table_name),
+                           std::move(metrics_reporter)),
       rest_context_(std::move(rest_context)) {}
 
 Result<std::unique_ptr<DataTableScan>> RestTableScanBuilder::Build() {

src/iceberg/catalog/rest/rest_table_scan.h

@@ -27,6 +27,7 @@
 
 #include "iceberg/catalog/rest/endpoint.h"
 #include "iceberg/catalog/rest/iceberg_rest_export.h"
+#include "iceberg/metrics/metrics_reporter.h"
 #include "iceberg/result.h"
 #include "iceberg/table_identifier.h"
 #include "iceberg/table_scan.h"
@@ -104,6 +105,8 @@ class ICEBERG_REST_EXPORT RestTableScan : public DataTableScan {
 class ICEBERG_REST_EXPORT RestTableScanBuilder : public DataTableScanBuilder {
  public:
   RestTableScanBuilder(std::shared_ptr<TableMetadata> metadata, std::shared_ptr<FileIO> io,
+                       std::string table_name,
+                       std::shared_ptr<MetricsReporter> metrics_reporter,
                        RestScanContext rest_context);
 
   /// \brief Resolves schema/context via parent logic then creates a RestTableScan.

src/iceberg/test/rest_table_scan_test.cc

@@ -372,7 +372,8 @@ TEST_F(RestTableScanTest, FetchScanTasksEndpointNotSupported) {
 // --------------------------------------------------------------------------
 TEST_F(RestTableScanTest, UseSnapshotPropagatesUseSnapshotSchemaInContext) {
   constexpr int64_t kSnapshotId = 1000L;
-  RestTableScanBuilder builder(metadata_, file_io_, MakeContext(std::nullopt));
+  RestTableScanBuilder builder(metadata_, file_io_, "test.my_table", nullptr,
+                               MakeContext(std::nullopt));
   builder.UseSnapshot(kSnapshotId);
   ICEBERG_UNWRAP_OR_FAIL(auto scan, builder.Build());
   EXPECT_TRUE(scan->context().use_snapshot_schema);
@@ -382,7 +383,8 @@ TEST_F(RestTableScanTest, UseSnapshotPropagatesUseSnapshotSchemaInContext) {
 // use_snapshot_schema: default scan does not set use_snapshot_schema.
 // --------------------------------------------------------------------------
 TEST_F(RestTableScanTest, DefaultScanDoesNotSetUseSnapshotSchema) {
-  RestTableScanBuilder builder(metadata_, file_io_, MakeContext(std::nullopt));
+  RestTableScanBuilder builder(metadata_, file_io_, "test.my_table", nullptr,
+                               MakeContext(std::nullopt));
   ICEBERG_UNWRAP_OR_FAIL(auto scan, builder.Build());
   EXPECT_FALSE(scan->context().use_snapshot_schema);
 }
@@ -394,7 +396,8 @@ TEST_F(RestTableScanTest, RestTableNewScanReturnsRestTableScanBuilder) {
   ICEBERG_UNWRAP_OR_FAIL(
       auto table,
       RestTable::Make(identifier_, metadata_, "/tmp/metadata.json", file_io_,
-                      /*catalog=*/nullptr, MakeContext(std::nullopt)));
+                      /*catalog=*/nullptr, "test.my_table", nullptr,
+                      MakeContext(std::nullopt)));
   ICEBERG_UNWRAP_OR_FAIL(auto builder, table->NewScan());
   auto* typed = dynamic_cast<RestTableScanBuilder*>(builder.get());
   EXPECT_NE(typed, nullptr);