Merge pull request redpanda-data#25118 from andrwng/tag-expiry-int64

iceberg: make snapshot expiration an explicit 64-bit
IoannisRP · Feb 19, 2025 · 8df894d · 8df894d
2 parents eb24db2 + 3765afd
commit 8df894d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/v/datalake/coordinator/iceberg_file_committer.cc b/src/v/datalake/coordinator/iceberg_file_committer.cc
@@ -317,7 +317,7 @@ class table_commit_builder {
           std::move(icb_files_),
           {{commit_meta_prop, to_json_str(commit_meta)}},
           commit_tag_name,
-          /*tag_expiration_ms=*/std::numeric_limits<long>::max());
+          /*tag_expiration_ms=*/std::numeric_limits<int64_t>::max());
         if (icb_append_res.has_error()) {
             co_return log_and_convert_action_errc(
               icb_append_res.error(),

diff --git a/src/v/iceberg/merge_append_action.h b/src/v/iceberg/merge_append_action.h
@@ -66,7 +66,7 @@ class merge_append_action : public action {
       chunked_vector<data_file> files,
       chunked_vector<std::pair<ss::sstring, ss::sstring>> snapshot_props = {},
       std::optional<ss::sstring> tag_name = std::nullopt,
-      std::optional<long> tag_expiration_ms = std::nullopt,
+      std::optional<int64_t> tag_expiration_ms = std::nullopt,
       size_t min_to_merge_new_files = default_min_to_merge_new_files,
       size_t mfile_target_size_bytes = default_target_size_bytes)
       : io_(io)
@@ -156,7 +156,7 @@ class merge_append_action : public action {
     chunked_vector<data_file> new_data_files_;
     chunked_vector<std::pair<ss::sstring, ss::sstring>> snapshot_props_;
     std::optional<ss::sstring> tag_name_;
-    std::optional<long> tag_expiration_ms_;
+    std::optional<int64_t> tag_expiration_ms_;
 };
 
 } // namespace iceberg
diff --git a/src/v/iceberg/transaction.cc b/src/v/iceberg/transaction.cc
@@ -74,7 +74,7 @@ ss::future<transaction::txn_outcome> transaction::merge_append(
   chunked_vector<data_file> files,
   chunked_vector<std::pair<ss::sstring, ss::sstring>> snapshot_props,
   std::optional<ss::sstring> tag_name,
-  std::optional<long> tag_expiration_ms) {
+  std::optional<int64_t> tag_expiration_ms) {
     auto a = std::make_unique<merge_append_action>(
       io,
       table_,

diff --git a/src/v/iceberg/transaction.h b/src/v/iceberg/transaction.h
@@ -54,7 +54,7 @@ class transaction {
       chunked_vector<data_file>,
       chunked_vector<std::pair<ss::sstring, ss::sstring>> snapshot_props = {},
       std::optional<ss::sstring> tag_name = std::nullopt,
-      std::optional<long> tag_expiration_ms = std::nullopt);
+      std::optional<int64_t> tag_expiration_ms = std::nullopt);
 
     // Removes expired snapshots from the table, computing expiration based on
     // the given timestamp. Note, this does not perform IO to delete any