You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by gi...@apache.org on 2026/01/17 00:11:25 UTC

(iceberg-rust) branch gh-pages updated: deploy: d76bb5ed124e65e42bdc488e5028cb9d20366aa5

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git


The following commit(s) were added to refs/heads/gh-pages by this push:
     new b76506e0b deploy: d76bb5ed124e65e42bdc488e5028cb9d20366aa5
b76506e0b is described below

commit b76506e0b69919763202dbde5b2f41c1120b23b0
Author: liurenjie1024 <li...@users.noreply.github.com>
AuthorDate: Sat Jan 17 00:11:20 2026 +0000

    deploy: d76bb5ed124e65e42bdc488e5028cb9d20366aa5
---
 api/iceberg/spec/enum.SnapshotRetention.html       |   12 +-
 api/iceberg/spec/struct.SnapshotReference.html     |   14 +-
 api/iceberg/spec/struct.TableMetadata.html         |    2 +-
 .../spec/struct.TableMetadataBuildResult.html      |    2 +-
 api/iceberg/spec/struct.TableMetadataBuilder.html  |   54 +-
 api/src/iceberg/spec/snapshot.rs.html              |  891 +--
 api/src/iceberg/spec/table_metadata.rs.html        |  193 +-
 .../iceberg/spec/table_metadata_builder.rs.html    | 6452 ++++++++++----------
 8 files changed, 3908 insertions(+), 3712 deletions(-)

diff --git a/api/iceberg/spec/enum.SnapshotRetention.html b/api/iceberg/spec/enum.SnapshotRetention.html
index d9cf09f21..4307322b2 100644
--- a/api/iceberg/spec/enum.SnapshotRetention.html
+++ b/api/iceberg/spec/enum.SnapshotRetention.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="The snapshot expiration procedure removes snapshots from table metadata and applies the table’s retention policy."><title>SnapshotRetention in iceberg::spec - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b05 [...]
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="The snapshot expiration procedure removes snapshots from table metadata and applies the table’s retention policy."><title>SnapshotRetention in iceberg::spec - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b05 [...]
     Branch {
         min_snapshots_to_keep: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>&gt;,
         max_snapshot_age_ms: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>&gt;,
@@ -19,15 +19,15 @@ Defaults to table property history.expire.max-ref-age-ms. The main branch never
 </div></div></div><section id="variant.Tag" class="variant"><a href="#variant.Tag" class="anchor">§</a><h3 class="code-header">Tag</h3></section><div class="docblock"><p>Tags are labels for individual snapshots.</p>
 </div><div class="sub-variant" id="variant.Tag.fields"><h4>Fields</h4><div class="sub-variant-field"><span id="variant.Tag.field.max_ref_age_ms" class="section-header"><a href="#variant.Tag.field.max_ref_age_ms" class="anchor field">§</a><code>max_ref_age_ms: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>&gt;</ [...]
 Defaults to table property history.expire.max-ref-age-ms. The main branch never expires.</p>
-</div></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#509-522">Source</a><a href="#impl-SnapshotRetention" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.SnapshotRetent [...]
+</div></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#512-525">Source</a><a href="#impl-SnapshotRetention" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.SnapshotRetent [...]
     min_snapshots_to_keep: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>&gt;,
     max_snapshot_age_ms: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>&gt;,
     max_ref_age_ms: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>&gt;,
 ) -&gt; Self</h4></section></summary><div class="docblock"><p>Create a new branch retention policy</p>
-</div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#478">Source</a><a href="#impl-Clone-for-SnapshotRetention" class="anchor">§</a><h3 class="code- [...]
-    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
-and should not be overridden without very good reason.</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-Serialize-for-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#478">Source</a><a href="#impl-Serialize-for-SnapshotRetention" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html" title= [...]
-    __S: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serializer.html" title="trait serde_core::ser::Serializer">Serializer</a>,</div></h4></section></summary><div class='docblock'>Serialize this value into the given Serde serializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html#tymethod.serialize">Read more</a></div></details></div></details><section id="impl-Eq-for-SnapshotRetention" class="impl"><a class="src rightsi [...]
+</div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#481">Source</a><a href="#impl-Clone-for-SnapshotRetention" class="anchor">§</a><h3 class="code- [...]
+    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
+and should not be overridden without very good reason.</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-Serialize-for-SnapshotRetention" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#481">Source</a><a href="#impl-Serialize-for-SnapshotRetention" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html" title= [...]
+    __S: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serializer.html" title="trait serde_core::ser::Serializer">Serializer</a>,</div></h4></section></summary><div class='docblock'>Serialize this value into the given Serde serializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html#tymethod.serialize">Read more</a></div></details></div></details><section id="impl-Eq-for-SnapshotRetention" class="impl"><a class="src rightsi [...]
     T: 'static + ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.type_id" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/any.rs.html#139">Source</a><a href="#method.type_id" class="anchor">§</a><h4 class="code-header">fn <a href [...]
     T: <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a>,</div></h3></section></summary><div class="impl-items"><section id="method.as_any" class="method trait-impl"><a href="#method.as_any" class="anchor">§</a><h4 class="code-header">fn <a class="fn">as_any</a>(&amp;self) -&gt; &amp;(dyn <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a> + 'static)</h4 [...]
     T: ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.borrow" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/borrow.rs.html#211">Source</a><a href="#method.borrow" class="anchor">§</a><h4 class="code-header">fn <a href="https:/ [...]
diff --git a/api/iceberg/spec/struct.SnapshotReference.html b/api/iceberg/spec/struct.SnapshotReference.html
index 3c7eea75a..cd1c0c2f4 100644
--- a/api/iceberg/spec/struct.SnapshotReference.html
+++ b/api/iceberg/spec/struct.SnapshotReference.html
@@ -1,15 +1,15 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Iceberg tables keep track of branches and tags using snapshot references."><title>SnapshotReference in iceberg::spec - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Italic-81dc35de. [...]
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Iceberg tables keep track of branches and tags using snapshot references."><title>SnapshotReference in iceberg::spec - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Italic-81dc35de. [...]
     pub snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>,
     pub retention: <a class="enum" href="enum.SnapshotRetention.html" title="enum iceberg::spec::SnapshotRetention">SnapshotRetention</a>,
 }</code></pre><details class="toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Iceberg tables keep track of branches and tags using snapshot references.</p>
 </div></details><h2 id="fields" class="fields section-header">Fields<a href="#fields" class="anchor">§</a></h2><span id="structfield.snapshot_id" class="structfield section-header"><a href="#structfield.snapshot_id" class="anchor field">§</a><code>snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a></code></span><div class="docblock"><p>A reference’s snapshot ID. The tagged snapshot or latest snapshot of a branch.</p>
 </div><span id="structfield.retention" class="structfield section-header"><a href="#structfield.retention" class="anchor field">§</a><code>retention: <a class="enum" href="enum.SnapshotRetention.html" title="enum iceberg::spec::SnapshotRetention">SnapshotRetention</a></code></span><div class="docblock"><p>Snapshot retention policy</p>
-</div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#461-466">Source</a><a href="#impl-SnapshotReference" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struct.SnapshotReference.html" titl [...]
-</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotReference-1" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#468-476">Source</a><a href="#impl-SnapshotReference-1" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struct.SnapshotReference.html" title="struct iceberg::spec::SnapshotReference">SnapshotReference</a></h3></section></summary><div class="impl-items"><d [...]
-</div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#450">Source</a><a href="#impl-Clone-for-SnapshotReference" class="anchor">§</a><h3 class="code- [...]
-    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
-and should not be overridden without very good reason.</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-Serialize-for-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#450">Source</a><a href="#impl-Serialize-for-SnapshotReference" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html" title= [...]
-    __S: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serializer.html" title="trait serde_core::ser::Serializer">Serializer</a>,</div></h4></section></summary><div class='docblock'>Serialize this value into the given Serde serializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html#tymethod.serialize">Read more</a></div></details></div></details><section id="impl-Eq-for-SnapshotReference" class="impl"><a class="src rightsi [...]
+</div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#464-469">Source</a><a href="#impl-SnapshotReference" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struct.SnapshotReference.html" titl [...]
+</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-SnapshotReference-1" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#471-479">Source</a><a href="#impl-SnapshotReference-1" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struct.SnapshotReference.html" title="struct iceberg::spec::SnapshotReference">SnapshotReference</a></h3></section></summary><div class="impl-items"><d [...]
+</div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#453">Source</a><a href="#impl-Clone-for-SnapshotReference" class="anchor">§</a><h3 class="code- [...]
+    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
+and should not be overridden without very good reason.</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-Serialize-for-SnapshotReference" class="impl"><a class="src rightside" href="../../src/iceberg/spec/snapshot.rs.html#453">Source</a><a href="#impl-Serialize-for-SnapshotReference" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html" title= [...]
+    __S: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serializer.html" title="trait serde_core::ser::Serializer">Serializer</a>,</div></h4></section></summary><div class='docblock'>Serialize this value into the given Serde serializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html#tymethod.serialize">Read more</a></div></details></div></details><section id="impl-Eq-for-SnapshotReference" class="impl"><a class="src rightsi [...]
     T: 'static + ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.type_id" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/any.rs.html#139">Source</a><a href="#method.type_id" class="anchor">§</a><h4 class="code-header">fn <a href [...]
     T: <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a>,</div></h3></section></summary><div class="impl-items"><section id="method.as_any" class="method trait-impl"><a href="#method.as_any" class="anchor">§</a><h4 class="code-header">fn <a class="fn">as_any</a>(&amp;self) -&gt; &amp;(dyn <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a> + 'static)</h4 [...]
     T: ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.borrow" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/borrow.rs.html#211">Source</a><a href="#method.borrow" class="anchor">§</a><h4 class="code-header">fn <a href="https:/ [...]
diff --git a/api/iceberg/spec/struct.TableMetadata.html b/api/iceberg/spec/struct.TableMetadata.html
index e1d9295fc..efe8cbbc9 100644
--- a/api/iceberg/spec/struct.TableMetadata.html
+++ b/api/iceberg/spec/struct.TableMetadata.html
@@ -72,7 +72,7 @@ Returns an option if the <code>ref_name</code> is not found</p>
     metadata_location: impl <a class="trait" href="https://doc.rust-lang.org/nightly/core/convert/trait.AsRef.html" title="trait core::convert::AsRef">AsRef</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>&gt;,
 ) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.unit.html">()</a>&gt;</h4></section></summary><div class="docblock"><p>Write table metadata to the given location.</p>
 </div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-TableMetadata" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata.rs.html#60">Source</a><a href="#impl-Clone-for-TableMetadata" class="anchor">§</a><h3 class="code-hea [...]
-    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
+    __D: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserializer.html" title="trait serde_core::de::Deserializer">Deserializer</a>&lt;'de&gt;,</div></h4></section></summary><div class='docblock'>Deserialize this value from the given Serde deserializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/de/trait.Deserialize.html#tymethod.deserialize">Read more</a></div></details></div></details><details class="toggle implementors-toggle" open><summar [...]
 and should not be overridden without very good reason.</div></details></div></details><details class="toggle implementors-toggle" open><summary><section id="impl-Serialize-for-TableMetadata" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata.rs.html#851-860">Source</a><a href="#impl-Serialize-for-TableMetadata" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html" titl [...]
     S: <a class="trait" href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serializer.html" title="trait serde_core::ser::Serializer">Serializer</a>,</div></h4></section></summary><div class='docblock'>Serialize this value into the given Serde serializer. <a href="https://docs.rs/serde_core/1.0.228/serde_core/ser/trait.Serialize.html#tymethod.serialize">Read more</a></div></details></div></details><section id="impl-Eq-for-TableMetadata" class="impl"><a class="src rightside" hr [...]
     T: 'static + ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.type_id" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/any.rs.html#139">Source</a><a href="#method.type_id" class="anchor">§</a><h4 class="code-header">fn <a href [...]
diff --git a/api/iceberg/spec/struct.TableMetadataBuildResult.html b/api/iceberg/spec/struct.TableMetadataBuildResult.html
index cf21df0be..3d4e02daf 100644
--- a/api/iceberg/spec/struct.TableMetadataBuildResult.html
+++ b/api/iceberg/spec/struct.TableMetadataBuildResult.html
@@ -6,7 +6,7 @@
 </div></details><h2 id="fields" class="fields section-header">Fields<a href="#fields" class="anchor">§</a></h2><span id="structfield.metadata" class="structfield section-header"><a href="#structfield.metadata" class="anchor field">§</a><code>metadata: <a class="struct" href="struct.TableMetadata.html" title="struct iceberg::spec::TableMetadata">TableMetadata</a></code></span><div class="docblock"><p>The new <code>TableMetadata</code>.</p>
 </div><span id="structfield.changes" class="structfield section-header"><a href="#structfield.changes" class="anchor field">§</a><code>changes: <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="enum" href="../enum.TableUpdate.html" title="enum iceberg::TableUpdate">TableUpdate</a>&gt;</code></span><div class="docblock"><p>The changes that were applied to the metadata.</p>
 </div><span id="structfield.expired_metadata_logs" class="structfield section-header"><a href="#structfield.expired_metadata_logs" class="anchor field">§</a><code>expired_metadata_logs: <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="struct" href="struct.MetadataLog.html" title="struct iceberg::spec::MetadataLog">MetadataLog</a>&gt;</code></span><div class="docblock"><p>Expired metadata logs</p>
-</div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-TableMetadataBuildResult" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#60">Source</a><a href="#impl-Clone-for-TableMetadataBuildResult" class="anchor">§</a><h3 class="code-heade [...]
+</div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-TableMetadataBuildResult" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#60">Source</a><a href="#impl-Clone-for-TableMetadataBuildResult" class="anchor">§</a><h3 class="code-heade [...]
 and should not be overridden without very good reason.</div></details></div></details><section id="impl-StructuralPartialEq-for-TableMetadataBuildResult" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#60">Source</a><a href="#impl-StructuralPartialEq-for-TableMetadataBuildResult" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.StructuralPartialEq.html" title="trai [...]
     T: 'static + ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.type_id" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/any.rs.html#139">Source</a><a href="#method.type_id" class="anchor">§</a><h4 class="code-header">fn <a href [...]
     T: <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a>,</div></h3></section></summary><div class="impl-items"><section id="method.as_any" class="method trait-impl"><a href="#method.as_any" class="anchor">§</a><h4 class="code-header">fn <a class="fn">as_any</a>(&amp;self) -&gt; &amp;(dyn <a class="trait" href="https://doc.rust-lang.org/nightly/core/any/trait.Any.html" title="trait core::any::Any">Any</a> + 'static)</h4 [...]
diff --git a/api/iceberg/spec/struct.TableMetadataBuilder.html b/api/iceberg/spec/struct.TableMetadataBuilder.html
index 5efa4f41a..cfd8e4b0f 100644
--- a/api/iceberg/spec/struct.TableMetadataBuilder.html
+++ b/api/iceberg/spec/struct.TableMetadataBuilder.html
@@ -10,7 +10,7 @@ Some basic rules:</p>
 <li><code>add_schema</code> must be called before <code>set_current_schema</code>.</li>
 <li>If a new partition spec and schema are added, the schema should be added first.</li>
 </ul>
-</div></details><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-TableMetadataBuilder" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#71-1410">Source</a><a href="#impl-TableMetadataBuilder" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struc [...]
+</div></details><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-TableMetadataBuilder" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#71-1412">Source</a><a href="#impl-TableMetadataBuilder" class="anchor">§</a><h3 class="code-header">impl <a class="struct" href="struc [...]
 </div></details><details class="toggle method-toggle" open><summary><section id="method.new" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#79-140">Source</a><h4 class="code-header">pub fn <a href="#method.new" class="fn">new</a>(
     schema: <a class="struct" href="struct.Schema.html" title="struct iceberg::spec::Schema">Schema</a>,
     spec: impl <a class="trait" href="https://doc.rust-lang.org/nightly/core/convert/trait.Into.html" title="trait core::convert::Into">Into</a>&lt;<a class="struct" href="struct.UnboundPartitionSpec.html" title="struct iceberg::spec::UnboundPartitionSpec">UnboundPartitionSpec</a>&gt;,
@@ -31,7 +31,7 @@ If <code>current_file_location</code> is <code>None</code>, the metadata log wil
 This should only be used to stage-create tables.</p>
 </div></details><details class="toggle method-toggle" open><summary><section id="method.from_table_creation" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#167-197">Source</a><h4 class="code-header">pub fn <a href="#method.from_table_creation" class="fn">from_table_creation</a>(table_creation: <a class="struct" href="../struct.TableCreation.html" title="struct iceberg::TableCreation">TableCreation</a>) -&gt; <a class="type" href="../ty [...]
 </div></details><details class="toggle method-toggle" open><summary><section id="method.assign_uuid" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#200-207">Source</a><h4 class="code-header">pub fn <a href="#method.assign_uuid" class="fn">assign_uuid</a>(self, uuid: <a class="struct" href="https://docs.rs/uuid/1.19.0/uuid/struct.Uuid.html" title="struct uuid::Uuid">Uuid</a>) -&gt; Self</h4></section></summary><div class="docblock"><p>C [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.upgrade_format_version" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#213-243">Source</a><h4 class="code-header">pub fn <a href="#method.upgrade_format_version" class="fn">upgrade_format_version</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.upgrade_format_version" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#213-245">Source</a><h4 class="code-header">pub fn <a href="#method.upgrade_format_version" class="fn">upgrade_format_version</a>(
     self,
     format_version: <a class="enum" href="enum.FormatVersion.html" title="enum iceberg::spec::FormatVersion">FormatVersion</a>,
 ) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;Self&gt;</h4></section></summary><div class="docblock"><p>Upgrade <code>FormatVersion</code>. Downgrades are not allowed.</p>
@@ -39,7 +39,7 @@ This should only be used to stage-create tables.</p>
 <ul>
 <li>Cannot downgrade to older format versions.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_properties" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#253-281">Source</a><h4 class="code-header">pub fn <a href="#method.set_properties" class="fn">set_properties</a>(self, properties: <a class="struct" href="https://doc.rust-lang.org/nightly/std/collections/hash/map/struct.HashMap.html" title="struct std::collections::hash::map::HashMap">H [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_properties" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#255-283">Source</a><h4 class="code-header">pub fn <a href="#method.set_properties" class="fn">set_properties</a>(self, properties: <a class="struct" href="https://doc.rust-lang.org/nightly/std/collections/hash/map/struct.HashMap.html" title="struct std::collections::hash::map::HashMap">H [...]
 <p>If a reserved property is set, the corresponding action is performed and the property is not persisted.
 Currently the following reserved properties are supported:</p>
 <ul>
@@ -49,14 +49,14 @@ Currently the following reserved properties are supported:</p>
 <ul>
 <li>If properties contains a reserved property</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_properties" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#288-320">Source</a><h4 class="code-header">pub fn <a href="#method.remove_properties" class="fn">remove_properties</a>(self, properties: &amp;[<a class="struct" href="https://doc.rust-lang.org/nightly/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>]) - [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_properties" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#290-322">Source</a><h4 class="code-header">pub fn <a href="#method.remove_properties" class="fn">remove_properties</a>(self, properties: &amp;[<a class="struct" href="https://doc.rust-lang.org/nightly/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>]) - [...]
 Does nothing if the key is not present.</p>
 <h5 id="errors-2"><a class="doc-anchor" href="#errors-2">§</a>Errors</h5>
 <ul>
 <li>If properties to remove contains a reserved property</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_location" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#323-333">Source</a><h4 class="code-header">pub fn <a href="#method.set_location" class="fn">set_location</a>(self, location: <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>) -&gt; Self</h4></section> [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_snapshot" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#343-448">Source</a><h4 class="code-header">pub fn <a href="#method.add_snapshot" class="fn">add_snapshot</a>(self, snapshot: <a class="struct" href="struct.Snapshot.html" title="struct iceberg::spec::Snapshot">Snapshot</a>) -&gt; <a class="type" href="../type.Result.html" title="type icebe [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_location" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#325-335">Source</a><h4 class="code-header">pub fn <a href="#method.set_location" class="fn">set_location</a>(self, location: <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>) -&gt; Self</h4></section> [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_snapshot" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#345-450">Source</a><h4 class="code-header">pub fn <a href="#method.add_snapshot" class="fn">add_snapshot</a>(self, snapshot: <a class="struct" href="struct.Snapshot.html" title="struct iceberg::spec::Snapshot">Snapshot</a>) -&gt; <a class="type" href="../type.Result.html" title="type icebe [...]
 <h5 id="errors-3"><a class="doc-anchor" href="#errors-3">§</a>Errors</h5>
 <ul>
 <li>Snapshot id already exists.</li>
@@ -65,7 +65,7 @@ Does nothing if the key is not present.</p>
 <li>For format version &gt;= 3: added-rows is null or first-row-id is null.</li>
 <li>For format version &gt;= 3: next-row-id would overflow when adding added-rows.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_branch_snapshot" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#455-480">Source</a><h4 class="code-header">pub fn <a href="#method.set_branch_snapshot" class="fn">set_branch_snapshot</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_branch_snapshot" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#457-482">Source</a><h4 class="code-header">pub fn <a href="#method.set_branch_snapshot" class="fn">set_branch_snapshot</a>(
     self,
     snapshot: <a class="struct" href="struct.Snapshot.html" title="struct iceberg::spec::Snapshot">Snapshot</a>,
     branch: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>,
@@ -75,10 +75,10 @@ Retention settings from the <code>branch</code> are re-used.</p>
 <ul>
 <li>Any of the preconditions of <code>self.add_snapshot</code> are not met.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_snapshots" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#485-509">Source</a><h4 class="code-header">pub fn <a href="#method.remove_snapshots" class="fn">remove_snapshots</a>(self, snapshot_ids: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>]) -&gt; Self</h4></section></summary><div class="d [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_snapshots" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#487-511">Source</a><h4 class="code-header">pub fn <a href="#method.remove_snapshots" class="fn">remove_snapshots</a>(self, snapshot_ids: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>]) -&gt; Self</h4></section></summary><div class="d [...]
 Does nothing if a snapshot id is not present.
 Keeps as changes only the snapshots that were actually removed.</p>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_ref" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#515-567">Source</a><h4 class="code-header">pub fn <a href="#method.set_ref" class="fn">set_ref</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_ref" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#517-569">Source</a><h4 class="code-header">pub fn <a href="#method.set_ref" class="fn">set_ref</a>(
     self,
     ref_name: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>,
     reference: <a class="struct" href="struct.SnapshotReference.html" title="struct iceberg::spec::SnapshotReference">SnapshotReference</a>,
@@ -87,28 +87,28 @@ Keeps as changes only the snapshots that were actually removed.</p>
 <ul>
 <li>The snapshot id is unknown.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_ref" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#572-584">Source</a><h4 class="code-header">pub fn <a href="#method.remove_ref" class="fn">remove_ref</a>(self, ref_name: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; Self</h4></section></summary><div class="docblock"><p>Remove a ref [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_ref" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#574-586">Source</a><h4 class="code-header">pub fn <a href="#method.remove_ref" class="fn">remove_ref</a>(self, ref_name: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; Self</h4></section></summary><div class="docblock"><p>Remove a ref [...]
 <p>If <code>ref_name='main'</code> the current snapshot id is set to -1.</p>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#587-595">Source</a><h4 class="code-header">pub fn <a href="#method.set_statistics" class="fn">set_statistics</a>(self, statistics: <a class="struct" href="struct.StatisticsFile.html" title="struct iceberg::spec::StatisticsFile">StatisticsFile</a>) -&gt; Self</h4></section></summary><div  [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#598-605">Source</a><h4 class="code-header">pub fn <a href="#method.remove_statistics" class="fn">remove_statistics</a>(self, snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; Self</h4></section></summary><div class="docblo [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_partition_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#608-620">Source</a><h4 class="code-header">pub fn <a href="#method.set_partition_statistics" class="fn">set_partition_statistics</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#589-597">Source</a><h4 class="code-header">pub fn <a href="#method.set_statistics" class="fn">set_statistics</a>(self, statistics: <a class="struct" href="struct.StatisticsFile.html" title="struct iceberg::spec::StatisticsFile">StatisticsFile</a>) -&gt; Self</h4></section></summary><div  [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#600-607">Source</a><h4 class="code-header">pub fn <a href="#method.remove_statistics" class="fn">remove_statistics</a>(self, snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; Self</h4></section></summary><div class="docblo [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_partition_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#610-622">Source</a><h4 class="code-header">pub fn <a href="#method.set_partition_statistics" class="fn">set_partition_statistics</a>(
     self,
     partition_statistics_file: <a class="struct" href="struct.PartitionStatisticsFile.html" title="struct iceberg::spec::PartitionStatisticsFile">PartitionStatisticsFile</a>,
 ) -&gt; Self</h4></section></summary><div class="docblock"><p>Set partition statistics</p>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_partition_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#623-630">Source</a><h4 class="code-header">pub fn <a href="#method.remove_partition_statistics" class="fn">remove_partition_statistics</a>(self, snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; Self</h4></sectio [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#638-676">Source</a><h4 class="code-header">pub fn <a href="#method.add_schema" class="fn">add_schema</a>(self, schema: <a class="struct" href="struct.Schema.html" title="struct iceberg::spec::Schema">Schema</a>) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Re [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_partition_statistics" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#625-632">Source</a><h4 class="code-header">pub fn <a href="#method.remove_partition_statistics" class="fn">remove_partition_statistics</a>(self, snapshot_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; Self</h4></sectio [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#640-678">Source</a><h4 class="code-header">pub fn <a href="#method.add_schema" class="fn">add_schema</a>(self, schema: <a class="struct" href="struct.Schema.html" title="struct iceberg::spec::Schema">Schema</a>) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Re [...]
 <p>The provided <code>schema.schema_id</code> may not be used.</p>
 <p>Important: Use this method with caution. The builder does not check
 if the added schema is compatible with the current schema.</p>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_current_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#685-724">Source</a><h4 class="code-header">pub fn <a href="#method.set_current_schema" class="fn">set_current_schema</a>(self, schema_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>) -&gt; <a class="type" href="../type.Result.html" tit [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_current_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#687-726">Source</a><h4 class="code-header">pub fn <a href="#method.set_current_schema" class="fn">set_current_schema</a>(self, schema_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>) -&gt; <a class="type" href="../type.Result.html" tit [...]
 <p>If <code>schema_id</code> is -1, the last added schema is set as the current schema.</p>
 <p>Errors:</p>
 <ul>
 <li>provided <code>schema_id</code> is -1 but no schema has been added via <code>add_schema</code>.</li>
 <li>No schema with the provided <code>schema_id</code> exists.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_current_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#727-730">Source</a><h4 class="code-header">pub fn <a href="#method.add_current_schema" class="fn">add_current_schema</a>(self, schema: <a class="struct" href="struct.Schema.html" title="struct iceberg::spec::Schema">Schema</a>) -&gt; <a class="type" href="../type.Result.html" title=" [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#830-876">Source</a><h4 class="code-header">pub fn <a href="#method.add_partition_spec" class="fn">add_partition_spec</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_current_schema" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#729-732">Source</a><h4 class="code-header">pub fn <a href="#method.add_current_schema" class="fn">add_current_schema</a>(self, schema: <a class="struct" href="struct.Schema.html" title="struct iceberg::spec::Schema">Schema</a>) -&gt; <a class="type" href="../type.Result.html" title=" [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#832-878">Source</a><h4 class="code-header">pub fn <a href="#method.add_partition_spec" class="fn">add_partition_spec</a>(
     self,
     unbound_spec: <a class="struct" href="struct.UnboundPartitionSpec.html" title="struct iceberg::spec::UnboundPartitionSpec">UnboundPartitionSpec</a>,
 ) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;Self&gt;</h4></section></summary><div class="docblock"><p>Add a partition spec to the table metadata.</p>
@@ -120,24 +120,24 @@ If a schema is added in the same set of changes, the schema should be added firs
 <li>The partition spec cannot be bound to the current schema.</li>
 <li>The partition spec has non-sequential field ids and the table format version is 1.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_default_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#883-931">Source</a><h4 class="code-header">pub fn <a href="#method.set_default_partition_spec" class="fn">set_default_partition_spec</a>(self, spec_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>) -&gt; <a class="type" href=".. [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_default_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#885-933">Source</a><h4 class="code-header">pub fn <a href="#method.set_default_partition_spec" class="fn">set_default_partition_spec</a>(self, spec_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>) -&gt; <a class="type" href=".. [...]
 <h5 id="errors-7"><a class="doc-anchor" href="#errors-7">§</a>Errors</h5>
 <ul>
 <li>spec_id is -1 but no spec has been added via <code>add_partition_spec</code>.</li>
 <li>No partition spec with the provided <code>spec_id</code> exists.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_default_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#934-937">Source</a><h4 class="code-header">pub fn <a href="#method.add_default_partition_spec" class="fn">add_default_partition_spec</a>(
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_default_partition_spec" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#936-939">Source</a><h4 class="code-header">pub fn <a href="#method.add_default_partition_spec" class="fn">add_default_partition_spec</a>(
     self,
     unbound_spec: <a class="struct" href="struct.UnboundPartitionSpec.html" title="struct iceberg::spec::UnboundPartitionSpec">UnboundPartitionSpec</a>,
 ) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;Self&gt;</h4></section></summary><div class="docblock"><p>Add a partition spec and set it as the default</p>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_partition_specs" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#945-967">Source</a><h4 class="code-header">pub fn <a href="#method.remove_partition_specs" class="fn">remove_partition_specs</a>(self, spec_ids: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>]) -&gt; <a class="type" href="../typ [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_partition_specs" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#947-969">Source</a><h4 class="code-header">pub fn <a href="#method.remove_partition_specs" class="fn">remove_partition_specs</a>(self, spec_ids: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>]) -&gt; <a class="type" href="../typ [...]
 Does nothing if a spec id is not present. Active partition specs
 should not be removed.</p>
 <h5 id="errors-8"><a class="doc-anchor" href="#errors-8">§</a>Errors</h5>
 <ul>
 <li>Cannot remove the default partition spec.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_sort_order" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#979-1014">Source</a><h4 class="code-header">pub fn <a href="#method.add_sort_order" class="fn">add_sort_order</a>(self, sort_order: <a class="struct" href="struct.SortOrder.html" title="struct iceberg::spec::SortOrder">SortOrder</a>) -&gt; <a class="type" href="../type.Result.html" title [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_sort_order" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#981-1016">Source</a><h4 class="code-header">pub fn <a href="#method.add_sort_order" class="fn">add_sort_order</a>(self, sort_order: <a class="struct" href="struct.SortOrder.html" title="struct iceberg::spec::SortOrder">SortOrder</a>) -&gt; <a class="type" href="../type.Result.html" title [...]
 <p>The spec is bound eagerly to the current schema and must be valid for it.
 If a schema is added in the same set of changes, the schema should be added first.</p>
 <p>Even if <code>sort_order.order_id</code> is provided, it may not be used.</p>
@@ -146,16 +146,16 @@ If a schema is added in the same set of changes, the schema should be added firs
 <li>Sort order id to add already exists.</li>
 <li>Sort order is incompatible with the current schema.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.set_default_sort_order" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1021-1056">Source</a><h4 class="code-header">pub fn <a href="#method.set_default_sort_order" class="fn">set_default_sort_order</a>(self, sort_order_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; <a class="type" href="../typ [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.set_default_sort_order" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1023-1058">Source</a><h4 class="code-header">pub fn <a href="#method.set_default_sort_order" class="fn">set_default_sort_order</a>(self, sort_order_id: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i64.html">i64</a>) -&gt; <a class="type" href="../typ [...]
 <h5 id="errors-10"><a class="doc-anchor" href="#errors-10">§</a>Errors</h5>
 <ul>
 <li>sort_order_id is -1 but no sort order has been added via <code>add_sort_order</code>.</li>
 <li>No sort order with the provided <code>sort_order_id</code> exists.</li>
 </ul>
-</div></details><details class="toggle method-toggle" open><summary><section id="method.add_encryption_key" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1065-1077">Source</a><h4 class="code-header">pub fn <a href="#method.add_encryption_key" class="fn">add_encryption_key</a>(self, key: <a class="struct" href="struct.EncryptedKey.html" title="struct iceberg::spec::EncryptedKey">EncryptedKey</a>) -&gt; Self</h4></section></summary><div [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_encryption_key" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1080-1087">Source</a><h4 class="code-header">pub fn <a href="#method.remove_encryption_key" class="fn">remove_encryption_key</a>(self, key_id: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; Self</h4></section></summary><div [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.build" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1090-1125">Source</a><h4 class="code-header">pub fn <a href="#method.build" class="fn">build</a>(self) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;<a class="struct" href="struct.TableMetadataBuildResult.html" title="struct iceberg::spec::TableMetada [...]
-</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_schemas" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1382-1409">Source</a><h4 class="code-header">pub fn <a href="#method.remove_schemas" class="fn">remove_schemas</a>(self, schema_id_to_remove: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>]) -&gt; <a class="type" href="../type.Result.ht [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.add_encryption_key" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1067-1079">Source</a><h4 class="code-header">pub fn <a href="#method.add_encryption_key" class="fn">add_encryption_key</a>(self, key: <a class="struct" href="struct.EncryptedKey.html" title="struct iceberg::spec::EncryptedKey">EncryptedKey</a>) -&gt; Self</h4></section></summary><div [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_encryption_key" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1082-1089">Source</a><h4 class="code-header">pub fn <a href="#method.remove_encryption_key" class="fn">remove_encryption_key</a>(self, key_id: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; Self</h4></section></summary><div [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.build" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1092-1127">Source</a><h4 class="code-header">pub fn <a href="#method.build" class="fn">build</a>(self) -&gt; <a class="type" href="../type.Result.html" title="type iceberg::Result">Result</a>&lt;<a class="struct" href="struct.TableMetadataBuildResult.html" title="struct iceberg::spec::TableMetada [...]
+</div></details><details class="toggle method-toggle" open><summary><section id="method.remove_schemas" class="method"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#1384-1411">Source</a><h4 class="code-header">pub fn <a href="#method.remove_schemas" class="fn">remove_schemas</a>(self, schema_id_to_remove: &amp;[<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.i32.html">i32</a>]) -&gt; <a class="type" href="../type.Result.ht [...]
 Does nothing if a schema id is not present. Active schemas should not be removed.</p>
 </div></details></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Clone-for-TableMetadataBuilder" class="impl"><a class="src rightside" href="../../src/iceberg/spec/table_metadata_builder.rs.html#48">Source</a><a href="#impl-Clone-for-TableMetadataBuilder" class="anchor">§< [...]
     T: 'static + ?<a class="trait" href="https://doc.rust-lang.org/nightly/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.type_id" class="method trait-impl"><a class="src rightside" href="https://doc.rust-lang.org/nightly/src/core/any.rs.html#139">Source</a><a href="#method.type_id" class="anchor">§</a><h4 class="code-header">fn <a href [...]
diff --git a/api/src/iceberg/spec/snapshot.rs.html b/api/src/iceberg/spec/snapshot.rs.html
index 5a92a0f59..7bd4030d9 100644
--- a/api/src/iceberg/spec/snapshot.rs.html
+++ b/api/src/iceberg/spec/snapshot.rs.html
@@ -272,7 +272,7 @@
 <a href=#272 id=272 data-nosnippet>272</a>
 <a href=#273 id=273 data-nosnippet>273</a>    <span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 <a href=#274 id=274 data-nosnippet>274</a>    #[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#275 id=275 data-nosnippet>275</a>    </span><span class="doccomment">/// Defines the structure of a v2 snapshot for serialization/deserialization
+<a href=#275 id=275 data-nosnippet>275</a>    </span><span class="doccomment">/// Defines the structure of a v3 snapshot for serialization/deserialization
 <a href=#276 id=276 data-nosnippet>276</a>    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>SnapshotV3 {
 <a href=#277 id=277 data-nosnippet>277</a>        <span class="kw">pub </span>snapshot_id: i64,
 <a href=#278 id=278 data-nosnippet>278</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
@@ -283,453 +283,456 @@
 <a href=#283 id=283 data-nosnippet>283</a>        <span class="kw">pub </span>summary: Summary,
 <a href=#284 id=284 data-nosnippet>284</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
 <a href=#285 id=285 data-nosnippet>285</a>        </span><span class="kw">pub </span>schema_id: <span class="prelude-ty">Option</span>&lt;SchemaId&gt;,
-<a href=#286 id=286 data-nosnippet>286</a>        <span class="kw">pub </span>first_row_id: u64,
-<a href=#287 id=287 data-nosnippet>287</a>        <span class="kw">pub </span>added_rows: u64,
+<a href=#286 id=286 data-nosnippet>286</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#287 id=287 data-nosnippet>287</a>        </span><span class="kw">pub </span>first_row_id: <span class="prelude-ty">Option</span>&lt;u64&gt;,
 <a href=#288 id=288 data-nosnippet>288</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#289 id=289 data-nosnippet>289</a>        </span><span class="kw">pub </span>key_id: <span class="prelude-ty">Option</span>&lt;String&gt;,
-<a href=#290 id=290 data-nosnippet>290</a>    }
-<a href=#291 id=291 data-nosnippet>291</a>
-<a href=#292 id=292 data-nosnippet>292</a>    <span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-<a href=#293 id=293 data-nosnippet>293</a>    #[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#294 id=294 data-nosnippet>294</a>    </span><span class="doccomment">/// Defines the structure of a v2 snapshot for serialization/deserialization
-<a href=#295 id=295 data-nosnippet>295</a>    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>SnapshotV2 {
-<a href=#296 id=296 data-nosnippet>296</a>        <span class="kw">pub </span>snapshot_id: i64,
-<a href=#297 id=297 data-nosnippet>297</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#298 id=298 data-nosnippet>298</a>        </span><span class="kw">pub </span>parent_snapshot_id: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#299 id=299 data-nosnippet>299</a>        <span class="kw">pub </span>sequence_number: i64,
-<a href=#300 id=300 data-nosnippet>300</a>        <span class="kw">pub </span>timestamp_ms: i64,
-<a href=#301 id=301 data-nosnippet>301</a>        <span class="kw">pub </span>manifest_list: String,
-<a href=#302 id=302 data-nosnippet>302</a>        <span class="kw">pub </span>summary: Summary,
-<a href=#303 id=303 data-nosnippet>303</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#304 id=304 data-nosnippet>304</a>        </span><span class="kw">pub </span>schema_id: <span class="prelude-ty">Option</span>&lt;SchemaId&gt;,
-<a href=#305 id=305 data-nosnippet>305</a>    }
-<a href=#306 id=306 data-nosnippet>306</a>
-<a href=#307 id=307 data-nosnippet>307</a>    <span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-<a href=#308 id=308 data-nosnippet>308</a>    #[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#309 id=309 data-nosnippet>309</a>    </span><span class="doccomment">/// Defines the structure of a v1 snapshot for serialization/deserialization
-<a href=#310 id=310 data-nosnippet>310</a>    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>SnapshotV1 {
-<a href=#311 id=311 data-nosnippet>311</a>        <span class="kw">pub </span>snapshot_id: i64,
-<a href=#312 id=312 data-nosnippet>312</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#313 id=313 data-nosnippet>313</a>        </span><span class="kw">pub </span>parent_snapshot_id: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#314 id=314 data-nosnippet>314</a>        <span class="kw">pub </span>timestamp_ms: i64,
-<a href=#315 id=315 data-nosnippet>315</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#316 id=316 data-nosnippet>316</a>        </span><span class="kw">pub </span>manifest_list: <span class="prelude-ty">Option</span>&lt;String&gt;,
+<a href=#289 id=289 data-nosnippet>289</a>        </span><span class="kw">pub </span>added_rows: <span class="prelude-ty">Option</span>&lt;u64&gt;,
+<a href=#290 id=290 data-nosnippet>290</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#291 id=291 data-nosnippet>291</a>        </span><span class="kw">pub </span>key_id: <span class="prelude-ty">Option</span>&lt;String&gt;,
+<a href=#292 id=292 data-nosnippet>292</a>    }
+<a href=#293 id=293 data-nosnippet>293</a>
+<a href=#294 id=294 data-nosnippet>294</a>    <span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+<a href=#295 id=295 data-nosnippet>295</a>    #[serde(rename_all = <span class="string">"kebab-case"</span>)]
+<a href=#296 id=296 data-nosnippet>296</a>    </span><span class="doccomment">/// Defines the structure of a v2 snapshot for serialization/deserialization
+<a href=#297 id=297 data-nosnippet>297</a>    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>SnapshotV2 {
+<a href=#298 id=298 data-nosnippet>298</a>        <span class="kw">pub </span>snapshot_id: i64,
+<a href=#299 id=299 data-nosnippet>299</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#300 id=300 data-nosnippet>300</a>        </span><span class="kw">pub </span>parent_snapshot_id: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#301 id=301 data-nosnippet>301</a>        <span class="kw">pub </span>sequence_number: i64,
+<a href=#302 id=302 data-nosnippet>302</a>        <span class="kw">pub </span>timestamp_ms: i64,
+<a href=#303 id=303 data-nosnippet>303</a>        <span class="kw">pub </span>manifest_list: String,
+<a href=#304 id=304 data-nosnippet>304</a>        <span class="kw">pub </span>summary: Summary,
+<a href=#305 id=305 data-nosnippet>305</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#306 id=306 data-nosnippet>306</a>        </span><span class="kw">pub </span>schema_id: <span class="prelude-ty">Option</span>&lt;SchemaId&gt;,
+<a href=#307 id=307 data-nosnippet>307</a>    }
+<a href=#308 id=308 data-nosnippet>308</a>
+<a href=#309 id=309 data-nosnippet>309</a>    <span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+<a href=#310 id=310 data-nosnippet>310</a>    #[serde(rename_all = <span class="string">"kebab-case"</span>)]
+<a href=#311 id=311 data-nosnippet>311</a>    </span><span class="doccomment">/// Defines the structure of a v1 snapshot for serialization/deserialization
+<a href=#312 id=312 data-nosnippet>312</a>    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>SnapshotV1 {
+<a href=#313 id=313 data-nosnippet>313</a>        <span class="kw">pub </span>snapshot_id: i64,
+<a href=#314 id=314 data-nosnippet>314</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#315 id=315 data-nosnippet>315</a>        </span><span class="kw">pub </span>parent_snapshot_id: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#316 id=316 data-nosnippet>316</a>        <span class="kw">pub </span>timestamp_ms: i64,
 <a href=#317 id=317 data-nosnippet>317</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#318 id=318 data-nosnippet>318</a>        </span><span class="kw">pub </span>manifests: <span class="prelude-ty">Option</span>&lt;Vec&lt;String&gt;&gt;,
+<a href=#318 id=318 data-nosnippet>318</a>        </span><span class="kw">pub </span>manifest_list: <span class="prelude-ty">Option</span>&lt;String&gt;,
 <a href=#319 id=319 data-nosnippet>319</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#320 id=320 data-nosnippet>320</a>        </span><span class="kw">pub </span>summary: <span class="prelude-ty">Option</span>&lt;Summary&gt;,
+<a href=#320 id=320 data-nosnippet>320</a>        </span><span class="kw">pub </span>manifests: <span class="prelude-ty">Option</span>&lt;Vec&lt;String&gt;&gt;,
 <a href=#321 id=321 data-nosnippet>321</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#322 id=322 data-nosnippet>322</a>        </span><span class="kw">pub </span>schema_id: <span class="prelude-ty">Option</span>&lt;SchemaId&gt;,
-<a href=#323 id=323 data-nosnippet>323</a>    }
-<a href=#324 id=324 data-nosnippet>324</a>
-<a href=#325 id=325 data-nosnippet>325</a>    <span class="kw">impl </span>From&lt;SnapshotV3&gt; <span class="kw">for </span>Snapshot {
-<a href=#326 id=326 data-nosnippet>326</a>        <span class="kw">fn </span>from(s: SnapshotV3) -&gt; <span class="self">Self </span>{
-<a href=#327 id=327 data-nosnippet>327</a>            Snapshot {
-<a href=#328 id=328 data-nosnippet>328</a>                snapshot_id: s.snapshot_id,
-<a href=#329 id=329 data-nosnippet>329</a>                parent_snapshot_id: s.parent_snapshot_id,
-<a href=#330 id=330 data-nosnippet>330</a>                sequence_number: s.sequence_number,
-<a href=#331 id=331 data-nosnippet>331</a>                timestamp_ms: s.timestamp_ms,
-<a href=#332 id=332 data-nosnippet>332</a>                manifest_list: s.manifest_list,
-<a href=#333 id=333 data-nosnippet>333</a>                summary: s.summary,
-<a href=#334 id=334 data-nosnippet>334</a>                schema_id: s.schema_id,
-<a href=#335 id=335 data-nosnippet>335</a>                encryption_key_id: s.key_id,
-<a href=#336 id=336 data-nosnippet>336</a>                row_range: <span class="prelude-val">Some</span>(SnapshotRowRange {
-<a href=#337 id=337 data-nosnippet>337</a>                    first_row_id: s.first_row_id,
-<a href=#338 id=338 data-nosnippet>338</a>                    added_rows: s.added_rows,
-<a href=#339 id=339 data-nosnippet>339</a>                }),
-<a href=#340 id=340 data-nosnippet>340</a>            }
-<a href=#341 id=341 data-nosnippet>341</a>        }
-<a href=#342 id=342 data-nosnippet>342</a>    }
-<a href=#343 id=343 data-nosnippet>343</a>
-<a href=#344 id=344 data-nosnippet>344</a>    <span class="kw">impl </span>TryFrom&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV3 {
-<a href=#345 id=345 data-nosnippet>345</a>        <span class="kw">type </span>Error = Error;
-<a href=#346 id=346 data-nosnippet>346</a>
-<a href=#347 id=347 data-nosnippet>347</a>        <span class="kw">fn </span>try_from(s: Snapshot) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="self">Self</span>::Error&gt; {
-<a href=#348 id=348 data-nosnippet>348</a>            <span class="kw">let </span>row_range = s.row_range.ok_or_else(|| {
-<a href=#349 id=349 data-nosnippet>349</a>                Error::new(
-<a href=#350 id=350 data-nosnippet>350</a>                    <span class="kw">crate</span>::ErrorKind::DataInvalid,
-<a href=#351 id=351 data-nosnippet>351</a>                    <span class="string">"v3 Snapshots must have first-row-id and rows-added fields set."</span>.to_string(),
-<a href=#352 id=352 data-nosnippet>352</a>                )
-<a href=#353 id=353 data-nosnippet>353</a>            })<span class="question-mark">?</span>;
-<a href=#354 id=354 data-nosnippet>354</a>
-<a href=#355 id=355 data-nosnippet>355</a>            <span class="prelude-val">Ok</span>(SnapshotV3 {
-<a href=#356 id=356 data-nosnippet>356</a>                snapshot_id: s.snapshot_id,
-<a href=#357 id=357 data-nosnippet>357</a>                parent_snapshot_id: s.parent_snapshot_id,
-<a href=#358 id=358 data-nosnippet>358</a>                sequence_number: s.sequence_number,
-<a href=#359 id=359 data-nosnippet>359</a>                timestamp_ms: s.timestamp_ms,
-<a href=#360 id=360 data-nosnippet>360</a>                manifest_list: s.manifest_list,
-<a href=#361 id=361 data-nosnippet>361</a>                summary: s.summary,
-<a href=#362 id=362 data-nosnippet>362</a>                schema_id: s.schema_id,
-<a href=#363 id=363 data-nosnippet>363</a>                first_row_id: row_range.first_row_id,
-<a href=#364 id=364 data-nosnippet>364</a>                added_rows: row_range.added_rows,
-<a href=#365 id=365 data-nosnippet>365</a>                key_id: s.encryption_key_id,
-<a href=#366 id=366 data-nosnippet>366</a>            })
-<a href=#367 id=367 data-nosnippet>367</a>        }
-<a href=#368 id=368 data-nosnippet>368</a>    }
-<a href=#369 id=369 data-nosnippet>369</a>
-<a href=#370 id=370 data-nosnippet>370</a>    <span class="kw">impl </span>From&lt;SnapshotV2&gt; <span class="kw">for </span>Snapshot {
-<a href=#371 id=371 data-nosnippet>371</a>        <span class="kw">fn </span>from(v2: SnapshotV2) -&gt; <span class="self">Self </span>{
-<a href=#372 id=372 data-nosnippet>372</a>            Snapshot {
-<a href=#373 id=373 data-nosnippet>373</a>                snapshot_id: v2.snapshot_id,
-<a href=#374 id=374 data-nosnippet>374</a>                parent_snapshot_id: v2.parent_snapshot_id,
-<a href=#375 id=375 data-nosnippet>375</a>                sequence_number: v2.sequence_number,
-<a href=#376 id=376 data-nosnippet>376</a>                timestamp_ms: v2.timestamp_ms,
-<a href=#377 id=377 data-nosnippet>377</a>                manifest_list: v2.manifest_list,
-<a href=#378 id=378 data-nosnippet>378</a>                summary: v2.summary,
-<a href=#379 id=379 data-nosnippet>379</a>                schema_id: v2.schema_id,
-<a href=#380 id=380 data-nosnippet>380</a>                encryption_key_id: <span class="prelude-val">None</span>,
-<a href=#381 id=381 data-nosnippet>381</a>                row_range: <span class="prelude-val">None</span>,
-<a href=#382 id=382 data-nosnippet>382</a>            }
-<a href=#383 id=383 data-nosnippet>383</a>        }
-<a href=#384 id=384 data-nosnippet>384</a>    }
-<a href=#385 id=385 data-nosnippet>385</a>
-<a href=#386 id=386 data-nosnippet>386</a>    <span class="kw">impl </span>From&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV2 {
-<a href=#387 id=387 data-nosnippet>387</a>        <span class="kw">fn </span>from(v2: Snapshot) -&gt; <span class="self">Self </span>{
-<a href=#388 id=388 data-nosnippet>388</a>            SnapshotV2 {
-<a href=#389 id=389 data-nosnippet>389</a>                snapshot_id: v2.snapshot_id,
-<a href=#390 id=390 data-nosnippet>390</a>                parent_snapshot_id: v2.parent_snapshot_id,
-<a href=#391 id=391 data-nosnippet>391</a>                sequence_number: v2.sequence_number,
-<a href=#392 id=392 data-nosnippet>392</a>                timestamp_ms: v2.timestamp_ms,
-<a href=#393 id=393 data-nosnippet>393</a>                manifest_list: v2.manifest_list,
-<a href=#394 id=394 data-nosnippet>394</a>                summary: v2.summary,
-<a href=#395 id=395 data-nosnippet>395</a>                schema_id: v2.schema_id,
-<a href=#396 id=396 data-nosnippet>396</a>            }
-<a href=#397 id=397 data-nosnippet>397</a>        }
-<a href=#398 id=398 data-nosnippet>398</a>    }
-<a href=#399 id=399 data-nosnippet>399</a>
-<a href=#400 id=400 data-nosnippet>400</a>    <span class="kw">impl </span>TryFrom&lt;SnapshotV1&gt; <span class="kw">for </span>Snapshot {
-<a href=#401 id=401 data-nosnippet>401</a>        <span class="kw">type </span>Error = Error;
+<a href=#322 id=322 data-nosnippet>322</a>        </span><span class="kw">pub </span>summary: <span class="prelude-ty">Option</span>&lt;Summary&gt;,
+<a href=#323 id=323 data-nosnippet>323</a>        <span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#324 id=324 data-nosnippet>324</a>        </span><span class="kw">pub </span>schema_id: <span class="prelude-ty">Option</span>&lt;SchemaId&gt;,
+<a href=#325 id=325 data-nosnippet>325</a>    }
+<a href=#326 id=326 data-nosnippet>326</a>
+<a href=#327 id=327 data-nosnippet>327</a>    <span class="kw">impl </span>From&lt;SnapshotV3&gt; <span class="kw">for </span>Snapshot {
+<a href=#328 id=328 data-nosnippet>328</a>        <span class="kw">fn </span>from(s: SnapshotV3) -&gt; <span class="self">Self </span>{
+<a href=#329 id=329 data-nosnippet>329</a>            Snapshot {
+<a href=#330 id=330 data-nosnippet>330</a>                snapshot_id: s.snapshot_id,
+<a href=#331 id=331 data-nosnippet>331</a>                parent_snapshot_id: s.parent_snapshot_id,
+<a href=#332 id=332 data-nosnippet>332</a>                sequence_number: s.sequence_number,
+<a href=#333 id=333 data-nosnippet>333</a>                timestamp_ms: s.timestamp_ms,
+<a href=#334 id=334 data-nosnippet>334</a>                manifest_list: s.manifest_list,
+<a href=#335 id=335 data-nosnippet>335</a>                summary: s.summary,
+<a href=#336 id=336 data-nosnippet>336</a>                schema_id: s.schema_id,
+<a href=#337 id=337 data-nosnippet>337</a>                encryption_key_id: s.key_id,
+<a href=#338 id=338 data-nosnippet>338</a>                row_range: <span class="kw">match </span>(s.first_row_id, s.added_rows) {
+<a href=#339 id=339 data-nosnippet>339</a>                    (<span class="prelude-val">Some</span>(first_row_id), <span class="prelude-val">Some</span>(added_rows)) =&gt; <span class="prelude-val">Some</span>(SnapshotRowRange {
+<a href=#340 id=340 data-nosnippet>340</a>                        first_row_id,
+<a href=#341 id=341 data-nosnippet>341</a>                        added_rows,
+<a href=#342 id=342 data-nosnippet>342</a>                    }),
+<a href=#343 id=343 data-nosnippet>343</a>                    <span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,
+<a href=#344 id=344 data-nosnippet>344</a>                },
+<a href=#345 id=345 data-nosnippet>345</a>            }
+<a href=#346 id=346 data-nosnippet>346</a>        }
+<a href=#347 id=347 data-nosnippet>347</a>    }
+<a href=#348 id=348 data-nosnippet>348</a>
+<a href=#349 id=349 data-nosnippet>349</a>    <span class="kw">impl </span>TryFrom&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV3 {
+<a href=#350 id=350 data-nosnippet>350</a>        <span class="kw">type </span>Error = Error;
+<a href=#351 id=351 data-nosnippet>351</a>
+<a href=#352 id=352 data-nosnippet>352</a>        <span class="kw">fn </span>try_from(s: Snapshot) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="self">Self</span>::Error&gt; {
+<a href=#353 id=353 data-nosnippet>353</a>            <span class="kw">let </span>(first_row_id, added_rows) = <span class="kw">match </span>s.row_range {
+<a href=#354 id=354 data-nosnippet>354</a>                <span class="prelude-val">Some</span>(row_range) =&gt; (<span class="prelude-val">Some</span>(row_range.first_row_id), <span class="prelude-val">Some</span>(row_range.added_rows)),
+<a href=#355 id=355 data-nosnippet>355</a>                <span class="prelude-val">None </span>=&gt; (<span class="prelude-val">None</span>, <span class="prelude-val">None</span>),
+<a href=#356 id=356 data-nosnippet>356</a>            };
+<a href=#357 id=357 data-nosnippet>357</a>
+<a href=#358 id=358 data-nosnippet>358</a>            <span class="prelude-val">Ok</span>(SnapshotV3 {
+<a href=#359 id=359 data-nosnippet>359</a>                snapshot_id: s.snapshot_id,
+<a href=#360 id=360 data-nosnippet>360</a>                parent_snapshot_id: s.parent_snapshot_id,
+<a href=#361 id=361 data-nosnippet>361</a>                sequence_number: s.sequence_number,
+<a href=#362 id=362 data-nosnippet>362</a>                timestamp_ms: s.timestamp_ms,
+<a href=#363 id=363 data-nosnippet>363</a>                manifest_list: s.manifest_list,
+<a href=#364 id=364 data-nosnippet>364</a>                summary: s.summary,
+<a href=#365 id=365 data-nosnippet>365</a>                schema_id: s.schema_id,
+<a href=#366 id=366 data-nosnippet>366</a>                first_row_id,
+<a href=#367 id=367 data-nosnippet>367</a>                added_rows,
+<a href=#368 id=368 data-nosnippet>368</a>                key_id: s.encryption_key_id,
+<a href=#369 id=369 data-nosnippet>369</a>            })
+<a href=#370 id=370 data-nosnippet>370</a>        }
+<a href=#371 id=371 data-nosnippet>371</a>    }
+<a href=#372 id=372 data-nosnippet>372</a>
+<a href=#373 id=373 data-nosnippet>373</a>    <span class="kw">impl </span>From&lt;SnapshotV2&gt; <span class="kw">for </span>Snapshot {
+<a href=#374 id=374 data-nosnippet>374</a>        <span class="kw">fn </span>from(v2: SnapshotV2) -&gt; <span class="self">Self </span>{
+<a href=#375 id=375 data-nosnippet>375</a>            Snapshot {
+<a href=#376 id=376 data-nosnippet>376</a>                snapshot_id: v2.snapshot_id,
+<a href=#377 id=377 data-nosnippet>377</a>                parent_snapshot_id: v2.parent_snapshot_id,
+<a href=#378 id=378 data-nosnippet>378</a>                sequence_number: v2.sequence_number,
+<a href=#379 id=379 data-nosnippet>379</a>                timestamp_ms: v2.timestamp_ms,
+<a href=#380 id=380 data-nosnippet>380</a>                manifest_list: v2.manifest_list,
+<a href=#381 id=381 data-nosnippet>381</a>                summary: v2.summary,
+<a href=#382 id=382 data-nosnippet>382</a>                schema_id: v2.schema_id,
+<a href=#383 id=383 data-nosnippet>383</a>                encryption_key_id: <span class="prelude-val">None</span>,
+<a href=#384 id=384 data-nosnippet>384</a>                row_range: <span class="prelude-val">None</span>,
+<a href=#385 id=385 data-nosnippet>385</a>            }
+<a href=#386 id=386 data-nosnippet>386</a>        }
+<a href=#387 id=387 data-nosnippet>387</a>    }
+<a href=#388 id=388 data-nosnippet>388</a>
+<a href=#389 id=389 data-nosnippet>389</a>    <span class="kw">impl </span>From&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV2 {
+<a href=#390 id=390 data-nosnippet>390</a>        <span class="kw">fn </span>from(v2: Snapshot) -&gt; <span class="self">Self </span>{
+<a href=#391 id=391 data-nosnippet>391</a>            SnapshotV2 {
+<a href=#392 id=392 data-nosnippet>392</a>                snapshot_id: v2.snapshot_id,
+<a href=#393 id=393 data-nosnippet>393</a>                parent_snapshot_id: v2.parent_snapshot_id,
+<a href=#394 id=394 data-nosnippet>394</a>                sequence_number: v2.sequence_number,
+<a href=#395 id=395 data-nosnippet>395</a>                timestamp_ms: v2.timestamp_ms,
+<a href=#396 id=396 data-nosnippet>396</a>                manifest_list: v2.manifest_list,
+<a href=#397 id=397 data-nosnippet>397</a>                summary: v2.summary,
+<a href=#398 id=398 data-nosnippet>398</a>                schema_id: v2.schema_id,
+<a href=#399 id=399 data-nosnippet>399</a>            }
+<a href=#400 id=400 data-nosnippet>400</a>        }
+<a href=#401 id=401 data-nosnippet>401</a>    }
 <a href=#402 id=402 data-nosnippet>402</a>
-<a href=#403 id=403 data-nosnippet>403</a>        <span class="kw">fn </span>try_from(v1: SnapshotV1) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="self">Self</span>::Error&gt; {
-<a href=#404 id=404 data-nosnippet>404</a>            <span class="prelude-val">Ok</span>(Snapshot {
-<a href=#405 id=405 data-nosnippet>405</a>                snapshot_id: v1.snapshot_id,
-<a href=#406 id=406 data-nosnippet>406</a>                parent_snapshot_id: v1.parent_snapshot_id,
-<a href=#407 id=407 data-nosnippet>407</a>                sequence_number: <span class="number">0</span>,
-<a href=#408 id=408 data-nosnippet>408</a>                timestamp_ms: v1.timestamp_ms,
-<a href=#409 id=409 data-nosnippet>409</a>                manifest_list: <span class="kw">match </span>(v1.manifest_list, v1.manifests) {
-<a href=#410 id=410 data-nosnippet>410</a>                    (<span class="prelude-val">Some</span>(file), <span class="prelude-val">None</span>) =&gt; file,
-<a href=#411 id=411 data-nosnippet>411</a>                    (<span class="prelude-val">Some</span>(<span class="kw">_</span>), <span class="prelude-val">Some</span>(<span class="kw">_</span>)) =&gt; {
-<a href=#412 id=412 data-nosnippet>412</a>                        <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#413 id=413 data-nosnippet>413</a>                            ErrorKind::DataInvalid,
-<a href=#414 id=414 data-nosnippet>414</a>                            <span class="string">"Invalid v1 snapshot, when manifest list provided, manifest files should be omitted"</span>,
-<a href=#415 id=415 data-nosnippet>415</a>                        ));
-<a href=#416 id=416 data-nosnippet>416</a>                    }
-<a href=#417 id=417 data-nosnippet>417</a>                    (<span class="prelude-val">None</span>, <span class="kw">_</span>) =&gt; {
-<a href=#418 id=418 data-nosnippet>418</a>                        <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#419 id=419 data-nosnippet>419</a>                            ErrorKind::DataInvalid,
-<a href=#420 id=420 data-nosnippet>420</a>                            <span class="string">"Unsupported v1 snapshot, only manifest list is supported"</span>,
-<a href=#421 id=421 data-nosnippet>421</a>                        ));
-<a href=#422 id=422 data-nosnippet>422</a>                    }
-<a href=#423 id=423 data-nosnippet>423</a>                },
-<a href=#424 id=424 data-nosnippet>424</a>                summary: v1.summary.unwrap_or(Summary {
-<a href=#425 id=425 data-nosnippet>425</a>                    operation: Operation::default(),
-<a href=#426 id=426 data-nosnippet>426</a>                    additional_properties: HashMap::new(),
-<a href=#427 id=427 data-nosnippet>427</a>                }),
-<a href=#428 id=428 data-nosnippet>428</a>                schema_id: v1.schema_id,
-<a href=#429 id=429 data-nosnippet>429</a>                encryption_key_id: <span class="prelude-val">None</span>,
-<a href=#430 id=430 data-nosnippet>430</a>                row_range: <span class="prelude-val">None</span>,
-<a href=#431 id=431 data-nosnippet>431</a>            })
-<a href=#432 id=432 data-nosnippet>432</a>        }
-<a href=#433 id=433 data-nosnippet>433</a>    }
-<a href=#434 id=434 data-nosnippet>434</a>
-<a href=#435 id=435 data-nosnippet>435</a>    <span class="kw">impl </span>From&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV1 {
-<a href=#436 id=436 data-nosnippet>436</a>        <span class="kw">fn </span>from(v2: Snapshot) -&gt; <span class="self">Self </span>{
-<a href=#437 id=437 data-nosnippet>437</a>            SnapshotV1 {
-<a href=#438 id=438 data-nosnippet>438</a>                snapshot_id: v2.snapshot_id,
-<a href=#439 id=439 data-nosnippet>439</a>                parent_snapshot_id: v2.parent_snapshot_id,
-<a href=#440 id=440 data-nosnippet>440</a>                timestamp_ms: v2.timestamp_ms,
-<a href=#441 id=441 data-nosnippet>441</a>                manifest_list: <span class="prelude-val">Some</span>(v2.manifest_list),
-<a href=#442 id=442 data-nosnippet>442</a>                summary: <span class="prelude-val">Some</span>(v2.summary),
-<a href=#443 id=443 data-nosnippet>443</a>                schema_id: v2.schema_id,
-<a href=#444 id=444 data-nosnippet>444</a>                manifests: <span class="prelude-val">None</span>,
-<a href=#445 id=445 data-nosnippet>445</a>            }
-<a href=#446 id=446 data-nosnippet>446</a>        }
-<a href=#447 id=447 data-nosnippet>447</a>    }
-<a href=#448 id=448 data-nosnippet>448</a>}
-<a href=#449 id=449 data-nosnippet>449</a>
-<a href=#450 id=450 data-nosnippet>450</a><span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-<a href=#451 id=451 data-nosnippet>451</a>#[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#452 id=452 data-nosnippet>452</a></span><span class="doccomment">/// Iceberg tables keep track of branches and tags using snapshot references.
-<a href=#453 id=453 data-nosnippet>453</a></span><span class="kw">pub struct </span>SnapshotReference {
-<a href=#454 id=454 data-nosnippet>454</a>    <span class="doccomment">/// A reference’s snapshot ID. The tagged snapshot or latest snapshot of a branch.
-<a href=#455 id=455 data-nosnippet>455</a>    </span><span class="kw">pub </span>snapshot_id: i64,
-<a href=#456 id=456 data-nosnippet>456</a>    <span class="attr">#[serde(flatten)]
-<a href=#457 id=457 data-nosnippet>457</a>    </span><span class="doccomment">/// Snapshot retention policy
-<a href=#458 id=458 data-nosnippet>458</a>    </span><span class="kw">pub </span>retention: SnapshotRetention,
-<a href=#459 id=459 data-nosnippet>459</a>}
-<a href=#460 id=460 data-nosnippet>460</a>
-<a href=#461 id=461 data-nosnippet>461</a><span class="kw">impl </span>SnapshotReference {
-<a href=#462 id=462 data-nosnippet>462</a>    <span class="doccomment">/// Returns true if the snapshot reference is a branch.
-<a href=#463 id=463 data-nosnippet>463</a>    </span><span class="kw">pub fn </span>is_branch(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; bool {
-<a href=#464 id=464 data-nosnippet>464</a>        <span class="macro">matches!</span>(<span class="self">self</span>.retention, SnapshotRetention::Branch { .. })
-<a href=#465 id=465 data-nosnippet>465</a>    }
-<a href=#466 id=466 data-nosnippet>466</a>}
-<a href=#467 id=467 data-nosnippet>467</a>
-<a href=#468 id=468 data-nosnippet>468</a><span class="kw">impl </span>SnapshotReference {
-<a href=#469 id=469 data-nosnippet>469</a>    <span class="doccomment">/// Create new snapshot reference
-<a href=#470 id=470 data-nosnippet>470</a>    </span><span class="kw">pub fn </span>new(snapshot_id: i64, retention: SnapshotRetention) -&gt; <span class="self">Self </span>{
-<a href=#471 id=471 data-nosnippet>471</a>        SnapshotReference {
-<a href=#472 id=472 data-nosnippet>472</a>            snapshot_id,
-<a href=#473 id=473 data-nosnippet>473</a>            retention,
-<a href=#474 id=474 data-nosnippet>474</a>        }
-<a href=#475 id=475 data-nosnippet>475</a>    }
-<a href=#476 id=476 data-nosnippet>476</a>}
-<a href=#477 id=477 data-nosnippet>477</a>
-<a href=#478 id=478 data-nosnippet>478</a><span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-<a href=#479 id=479 data-nosnippet>479</a>#[serde(rename_all = <span class="string">"lowercase"</span>, tag = <span class="string">"type"</span>)]
-<a href=#480 id=480 data-nosnippet>480</a></span><span class="doccomment">/// The snapshot expiration procedure removes snapshots from table metadata and applies the table’s retention policy.
-<a href=#481 id=481 data-nosnippet>481</a></span><span class="kw">pub enum </span>SnapshotRetention {
-<a href=#482 id=482 data-nosnippet>482</a>    <span class="attr">#[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#483 id=483 data-nosnippet>483</a>    </span><span class="doccomment">/// Branches are mutable named references that can be updated by committing a new snapshot as
-<a href=#484 id=484 data-nosnippet>484</a>    /// the branch’s referenced snapshot using the Commit Conflict Resolution and Retry procedures.
-<a href=#485 id=485 data-nosnippet>485</a>    </span>Branch {
-<a href=#486 id=486 data-nosnippet>486</a>        <span class="doccomment">/// A positive number for the minimum number of snapshots to keep in a branch while expiring snapshots.
-<a href=#487 id=487 data-nosnippet>487</a>        /// Defaults to table property history.expire.min-snapshots-to-keep.
-<a href=#488 id=488 data-nosnippet>488</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#489 id=489 data-nosnippet>489</a>        </span>min_snapshots_to_keep: <span class="prelude-ty">Option</span>&lt;i32&gt;,
-<a href=#490 id=490 data-nosnippet>490</a>        <span class="doccomment">/// A positive number for the max age of snapshots to keep when expiring, including the latest snapshot.
-<a href=#491 id=491 data-nosnippet>491</a>        /// Defaults to table property history.expire.max-snapshot-age-ms.
-<a href=#492 id=492 data-nosnippet>492</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#493 id=493 data-nosnippet>493</a>        </span>max_snapshot_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#494 id=494 data-nosnippet>494</a>        <span class="doccomment">/// For snapshot references except the main branch, a positive number for the max age of the snapshot reference to keep while expiring snapshots.
-<a href=#495 id=495 data-nosnippet>495</a>        /// Defaults to table property history.expire.max-ref-age-ms. The main branch never expires.
-<a href=#496 id=496 data-nosnippet>496</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#497 id=497 data-nosnippet>497</a>        </span>max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#498 id=498 data-nosnippet>498</a>    },
-<a href=#499 id=499 data-nosnippet>499</a>    <span class="attr">#[serde(rename_all = <span class="string">"kebab-case"</span>)]
-<a href=#500 id=500 data-nosnippet>500</a>    </span><span class="doccomment">/// Tags are labels for individual snapshots.
-<a href=#501 id=501 data-nosnippet>501</a>    </span>Tag {
-<a href=#502 id=502 data-nosnippet>502</a>        <span class="doccomment">/// For snapshot references except the main branch, a positive number for the max age of the snapshot reference to keep while expiring snapshots.
-<a href=#503 id=503 data-nosnippet>503</a>        /// Defaults to table property history.expire.max-ref-age-ms. The main branch never expires.
-<a href=#504 id=504 data-nosnippet>504</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
-<a href=#505 id=505 data-nosnippet>505</a>        </span>max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#506 id=506 data-nosnippet>506</a>    },
-<a href=#507 id=507 data-nosnippet>507</a>}
-<a href=#508 id=508 data-nosnippet>508</a>
-<a href=#509 id=509 data-nosnippet>509</a><span class="kw">impl </span>SnapshotRetention {
-<a href=#510 id=510 data-nosnippet>510</a>    <span class="doccomment">/// Create a new branch retention policy
-<a href=#511 id=511 data-nosnippet>511</a>    </span><span class="kw">pub fn </span>branch(
-<a href=#512 id=512 data-nosnippet>512</a>        min_snapshots_to_keep: <span class="prelude-ty">Option</span>&lt;i32&gt;,
-<a href=#513 id=513 data-nosnippet>513</a>        max_snapshot_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#514 id=514 data-nosnippet>514</a>        max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
-<a href=#515 id=515 data-nosnippet>515</a>    ) -&gt; <span class="self">Self </span>{
-<a href=#516 id=516 data-nosnippet>516</a>        SnapshotRetention::Branch {
-<a href=#517 id=517 data-nosnippet>517</a>            min_snapshots_to_keep,
-<a href=#518 id=518 data-nosnippet>518</a>            max_snapshot_age_ms,
-<a href=#519 id=519 data-nosnippet>519</a>            max_ref_age_ms,
-<a href=#520 id=520 data-nosnippet>520</a>        }
-<a href=#521 id=521 data-nosnippet>521</a>    }
-<a href=#522 id=522 data-nosnippet>522</a>}
-<a href=#523 id=523 data-nosnippet>523</a>
-<a href=#524 id=524 data-nosnippet>524</a><span class="attr">#[cfg(test)]
-<a href=#525 id=525 data-nosnippet>525</a></span><span class="kw">mod </span>tests {
-<a href=#526 id=526 data-nosnippet>526</a>    <span class="kw">use </span>std::collections::HashMap;
-<a href=#527 id=527 data-nosnippet>527</a>
-<a href=#528 id=528 data-nosnippet>528</a>    <span class="kw">use </span>chrono::{TimeZone, Utc};
-<a href=#529 id=529 data-nosnippet>529</a>
-<a href=#530 id=530 data-nosnippet>530</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::TableMetadata;
-<a href=#531 id=531 data-nosnippet>531</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
-<a href=#532 id=532 data-nosnippet>532</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::{Operation, Snapshot, Summary};
-<a href=#533 id=533 data-nosnippet>533</a>
-<a href=#534 id=534 data-nosnippet>534</a>    <span class="attr">#[test]
-<a href=#535 id=535 data-nosnippet>535</a>    </span><span class="kw">fn </span>schema() {
-<a href=#536 id=536 data-nosnippet>536</a>        <span class="kw">let </span>record = <span class="string">r#"
-<a href=#537 id=537 data-nosnippet>537</a>        {
-<a href=#538 id=538 data-nosnippet>538</a>            "snapshot-id": 3051729675574597004,
-<a href=#539 id=539 data-nosnippet>539</a>            "timestamp-ms": 1515100955770,
-<a href=#540 id=540 data-nosnippet>540</a>            "summary": {
-<a href=#541 id=541 data-nosnippet>541</a>                "operation": "append"
-<a href=#542 id=542 data-nosnippet>542</a>            },
-<a href=#543 id=543 data-nosnippet>543</a>            "manifest-list": "s3://b/wh/.../s1.avro",
-<a href=#544 id=544 data-nosnippet>544</a>            "schema-id": 0
-<a href=#545 id=545 data-nosnippet>545</a>        }
-<a href=#546 id=546 data-nosnippet>546</a>        "#</span>;
-<a href=#547 id=547 data-nosnippet>547</a>
-<a href=#548 id=548 data-nosnippet>548</a>        <span class="kw">let </span>result: Snapshot = serde_json::from_str::&lt;SnapshotV1&gt;(record)
-<a href=#549 id=549 data-nosnippet>549</a>            .unwrap()
-<a href=#550 id=550 data-nosnippet>550</a>            .try_into()
-<a href=#551 id=551 data-nosnippet>551</a>            .unwrap();
-<a href=#552 id=552 data-nosnippet>552</a>        <span class="macro">assert_eq!</span>(<span class="number">3051729675574597004</span>, result.snapshot_id());
-<a href=#553 id=553 data-nosnippet>553</a>        <span class="macro">assert_eq!</span>(
-<a href=#554 id=554 data-nosnippet>554</a>            Utc.timestamp_millis_opt(<span class="number">1515100955770</span>).unwrap(),
-<a href=#555 id=555 data-nosnippet>555</a>            result.timestamp().unwrap()
-<a href=#556 id=556 data-nosnippet>556</a>        );
-<a href=#557 id=557 data-nosnippet>557</a>        <span class="macro">assert_eq!</span>(<span class="number">1515100955770</span>, result.timestamp_ms());
-<a href=#558 id=558 data-nosnippet>558</a>        <span class="macro">assert_eq!</span>(
-<a href=#559 id=559 data-nosnippet>559</a>            Summary {
-<a href=#560 id=560 data-nosnippet>560</a>                operation: Operation::Append,
-<a href=#561 id=561 data-nosnippet>561</a>                additional_properties: HashMap::new()
-<a href=#562 id=562 data-nosnippet>562</a>            },
-<a href=#563 id=563 data-nosnippet>563</a>            <span class="kw-2">*</span>result.summary()
-<a href=#564 id=564 data-nosnippet>564</a>        );
-<a href=#565 id=565 data-nosnippet>565</a>        <span class="macro">assert_eq!</span>(<span class="string">"s3://b/wh/.../s1.avro"</span>.to_string(), <span class="kw-2">*</span>result.manifest_list());
-<a href=#566 id=566 data-nosnippet>566</a>    }
-<a href=#567 id=567 data-nosnippet>567</a>
-<a href=#568 id=568 data-nosnippet>568</a>    <span class="attr">#[test]
-<a href=#569 id=569 data-nosnippet>569</a>    </span><span class="kw">fn </span>test_snapshot_v1_to_v2_projection() {
-<a href=#570 id=570 data-nosnippet>570</a>        <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
-<a href=#571 id=571 data-nosnippet>571</a>
-<a href=#572 id=572 data-nosnippet>572</a>        <span class="comment">// Create a V1 snapshot (without sequence-number field)
-<a href=#573 id=573 data-nosnippet>573</a>        </span><span class="kw">let </span>v1_snapshot = SnapshotV1 {
-<a href=#574 id=574 data-nosnippet>574</a>            snapshot_id: <span class="number">1234567890</span>,
-<a href=#575 id=575 data-nosnippet>575</a>            parent_snapshot_id: <span class="prelude-val">Some</span>(<span class="number">987654321</span>),
-<a href=#576 id=576 data-nosnippet>576</a>            timestamp_ms: <span class="number">1515100955770</span>,
-<a href=#577 id=577 data-nosnippet>577</a>            manifest_list: <span class="prelude-val">Some</span>(<span class="string">"s3://bucket/manifest-list.avro"</span>.to_string()),
-<a href=#578 id=578 data-nosnippet>578</a>            manifests: <span class="prelude-val">None</span>, <span class="comment">// V1 can have either manifest_list or manifests, but not both
-<a href=#579 id=579 data-nosnippet>579</a>            </span>summary: <span class="prelude-val">Some</span>(Summary {
-<a href=#580 id=580 data-nosnippet>580</a>                operation: Operation::Append,
-<a href=#581 id=581 data-nosnippet>581</a>                additional_properties: HashMap::from([
-<a href=#582 id=582 data-nosnippet>582</a>                    (<span class="string">"added-files"</span>.to_string(), <span class="string">"5"</span>.to_string()),
-<a href=#583 id=583 data-nosnippet>583</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"100"</span>.to_string()),
-<a href=#584 id=584 data-nosnippet>584</a>                ]),
-<a href=#585 id=585 data-nosnippet>585</a>            }),
-<a href=#586 id=586 data-nosnippet>586</a>            schema_id: <span class="prelude-val">Some</span>(<span class="number">1</span>),
-<a href=#587 id=587 data-nosnippet>587</a>        };
-<a href=#588 id=588 data-nosnippet>588</a>
-<a href=#589 id=589 data-nosnippet>589</a>        <span class="comment">// Convert V1 to V2 - this should apply defaults for missing V2 fields
-<a href=#590 id=590 data-nosnippet>590</a>        </span><span class="kw">let </span>v2_snapshot: Snapshot = v1_snapshot.try_into().unwrap();
+<a href=#403 id=403 data-nosnippet>403</a>    <span class="kw">impl </span>TryFrom&lt;SnapshotV1&gt; <span class="kw">for </span>Snapshot {
+<a href=#404 id=404 data-nosnippet>404</a>        <span class="kw">type </span>Error = Error;
+<a href=#405 id=405 data-nosnippet>405</a>
+<a href=#406 id=406 data-nosnippet>406</a>        <span class="kw">fn </span>try_from(v1: SnapshotV1) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="self">Self</span>::Error&gt; {
+<a href=#407 id=407 data-nosnippet>407</a>            <span class="prelude-val">Ok</span>(Snapshot {
+<a href=#408 id=408 data-nosnippet>408</a>                snapshot_id: v1.snapshot_id,
+<a href=#409 id=409 data-nosnippet>409</a>                parent_snapshot_id: v1.parent_snapshot_id,
+<a href=#410 id=410 data-nosnippet>410</a>                sequence_number: <span class="number">0</span>,
+<a href=#411 id=411 data-nosnippet>411</a>                timestamp_ms: v1.timestamp_ms,
+<a href=#412 id=412 data-nosnippet>412</a>                manifest_list: <span class="kw">match </span>(v1.manifest_list, v1.manifests) {
+<a href=#413 id=413 data-nosnippet>413</a>                    (<span class="prelude-val">Some</span>(file), <span class="prelude-val">None</span>) =&gt; file,
+<a href=#414 id=414 data-nosnippet>414</a>                    (<span class="prelude-val">Some</span>(<span class="kw">_</span>), <span class="prelude-val">Some</span>(<span class="kw">_</span>)) =&gt; {
+<a href=#415 id=415 data-nosnippet>415</a>                        <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#416 id=416 data-nosnippet>416</a>                            ErrorKind::DataInvalid,
+<a href=#417 id=417 data-nosnippet>417</a>                            <span class="string">"Invalid v1 snapshot, when manifest list provided, manifest files should be omitted"</span>,
+<a href=#418 id=418 data-nosnippet>418</a>                        ));
+<a href=#419 id=419 data-nosnippet>419</a>                    }
+<a href=#420 id=420 data-nosnippet>420</a>                    (<span class="prelude-val">None</span>, <span class="kw">_</span>) =&gt; {
+<a href=#421 id=421 data-nosnippet>421</a>                        <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#422 id=422 data-nosnippet>422</a>                            ErrorKind::DataInvalid,
+<a href=#423 id=423 data-nosnippet>423</a>                            <span class="string">"Unsupported v1 snapshot, only manifest list is supported"</span>,
+<a href=#424 id=424 data-nosnippet>424</a>                        ));
+<a href=#425 id=425 data-nosnippet>425</a>                    }
+<a href=#426 id=426 data-nosnippet>426</a>                },
+<a href=#427 id=427 data-nosnippet>427</a>                summary: v1.summary.unwrap_or(Summary {
+<a href=#428 id=428 data-nosnippet>428</a>                    operation: Operation::default(),
+<a href=#429 id=429 data-nosnippet>429</a>                    additional_properties: HashMap::new(),
+<a href=#430 id=430 data-nosnippet>430</a>                }),
+<a href=#431 id=431 data-nosnippet>431</a>                schema_id: v1.schema_id,
+<a href=#432 id=432 data-nosnippet>432</a>                encryption_key_id: <span class="prelude-val">None</span>,
+<a href=#433 id=433 data-nosnippet>433</a>                row_range: <span class="prelude-val">None</span>,
+<a href=#434 id=434 data-nosnippet>434</a>            })
+<a href=#435 id=435 data-nosnippet>435</a>        }
+<a href=#436 id=436 data-nosnippet>436</a>    }
+<a href=#437 id=437 data-nosnippet>437</a>
+<a href=#438 id=438 data-nosnippet>438</a>    <span class="kw">impl </span>From&lt;Snapshot&gt; <span class="kw">for </span>SnapshotV1 {
+<a href=#439 id=439 data-nosnippet>439</a>        <span class="kw">fn </span>from(v2: Snapshot) -&gt; <span class="self">Self </span>{
+<a href=#440 id=440 data-nosnippet>440</a>            SnapshotV1 {
+<a href=#441 id=441 data-nosnippet>441</a>                snapshot_id: v2.snapshot_id,
+<a href=#442 id=442 data-nosnippet>442</a>                parent_snapshot_id: v2.parent_snapshot_id,
+<a href=#443 id=443 data-nosnippet>443</a>                timestamp_ms: v2.timestamp_ms,
+<a href=#444 id=444 data-nosnippet>444</a>                manifest_list: <span class="prelude-val">Some</span>(v2.manifest_list),
+<a href=#445 id=445 data-nosnippet>445</a>                summary: <span class="prelude-val">Some</span>(v2.summary),
+<a href=#446 id=446 data-nosnippet>446</a>                schema_id: v2.schema_id,
+<a href=#447 id=447 data-nosnippet>447</a>                manifests: <span class="prelude-val">None</span>,
+<a href=#448 id=448 data-nosnippet>448</a>            }
+<a href=#449 id=449 data-nosnippet>449</a>        }
+<a href=#450 id=450 data-nosnippet>450</a>    }
+<a href=#451 id=451 data-nosnippet>451</a>}
+<a href=#452 id=452 data-nosnippet>452</a>
+<a href=#453 id=453 data-nosnippet>453</a><span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+<a href=#454 id=454 data-nosnippet>454</a>#[serde(rename_all = <span class="string">"kebab-case"</span>)]
+<a href=#455 id=455 data-nosnippet>455</a></span><span class="doccomment">/// Iceberg tables keep track of branches and tags using snapshot references.
+<a href=#456 id=456 data-nosnippet>456</a></span><span class="kw">pub struct </span>SnapshotReference {
+<a href=#457 id=457 data-nosnippet>457</a>    <span class="doccomment">/// A reference’s snapshot ID. The tagged snapshot or latest snapshot of a branch.
+<a href=#458 id=458 data-nosnippet>458</a>    </span><span class="kw">pub </span>snapshot_id: i64,
+<a href=#459 id=459 data-nosnippet>459</a>    <span class="attr">#[serde(flatten)]
+<a href=#460 id=460 data-nosnippet>460</a>    </span><span class="doccomment">/// Snapshot retention policy
+<a href=#461 id=461 data-nosnippet>461</a>    </span><span class="kw">pub </span>retention: SnapshotRetention,
+<a href=#462 id=462 data-nosnippet>462</a>}
+<a href=#463 id=463 data-nosnippet>463</a>
+<a href=#464 id=464 data-nosnippet>464</a><span class="kw">impl </span>SnapshotReference {
+<a href=#465 id=465 data-nosnippet>465</a>    <span class="doccomment">/// Returns true if the snapshot reference is a branch.
+<a href=#466 id=466 data-nosnippet>466</a>    </span><span class="kw">pub fn </span>is_branch(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; bool {
+<a href=#467 id=467 data-nosnippet>467</a>        <span class="macro">matches!</span>(<span class="self">self</span>.retention, SnapshotRetention::Branch { .. })
+<a href=#468 id=468 data-nosnippet>468</a>    }
+<a href=#469 id=469 data-nosnippet>469</a>}
+<a href=#470 id=470 data-nosnippet>470</a>
+<a href=#471 id=471 data-nosnippet>471</a><span class="kw">impl </span>SnapshotReference {
+<a href=#472 id=472 data-nosnippet>472</a>    <span class="doccomment">/// Create new snapshot reference
+<a href=#473 id=473 data-nosnippet>473</a>    </span><span class="kw">pub fn </span>new(snapshot_id: i64, retention: SnapshotRetention) -&gt; <span class="self">Self </span>{
+<a href=#474 id=474 data-nosnippet>474</a>        SnapshotReference {
+<a href=#475 id=475 data-nosnippet>475</a>            snapshot_id,
+<a href=#476 id=476 data-nosnippet>476</a>            retention,
+<a href=#477 id=477 data-nosnippet>477</a>        }
+<a href=#478 id=478 data-nosnippet>478</a>    }
+<a href=#479 id=479 data-nosnippet>479</a>}
+<a href=#480 id=480 data-nosnippet>480</a>
+<a href=#481 id=481 data-nosnippet>481</a><span class="attr">#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+<a href=#482 id=482 data-nosnippet>482</a>#[serde(rename_all = <span class="string">"lowercase"</span>, tag = <span class="string">"type"</span>)]
+<a href=#483 id=483 data-nosnippet>483</a></span><span class="doccomment">/// The snapshot expiration procedure removes snapshots from table metadata and applies the table’s retention policy.
+<a href=#484 id=484 data-nosnippet>484</a></span><span class="kw">pub enum </span>SnapshotRetention {
+<a href=#485 id=485 data-nosnippet>485</a>    <span class="attr">#[serde(rename_all = <span class="string">"kebab-case"</span>)]
+<a href=#486 id=486 data-nosnippet>486</a>    </span><span class="doccomment">/// Branches are mutable named references that can be updated by committing a new snapshot as
+<a href=#487 id=487 data-nosnippet>487</a>    /// the branch’s referenced snapshot using the Commit Conflict Resolution and Retry procedures.
+<a href=#488 id=488 data-nosnippet>488</a>    </span>Branch {
+<a href=#489 id=489 data-nosnippet>489</a>        <span class="doccomment">/// A positive number for the minimum number of snapshots to keep in a branch while expiring snapshots.
+<a href=#490 id=490 data-nosnippet>490</a>        /// Defaults to table property history.expire.min-snapshots-to-keep.
+<a href=#491 id=491 data-nosnippet>491</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#492 id=492 data-nosnippet>492</a>        </span>min_snapshots_to_keep: <span class="prelude-ty">Option</span>&lt;i32&gt;,
+<a href=#493 id=493 data-nosnippet>493</a>        <span class="doccomment">/// A positive number for the max age of snapshots to keep when expiring, including the latest snapshot.
+<a href=#494 id=494 data-nosnippet>494</a>        /// Defaults to table property history.expire.max-snapshot-age-ms.
+<a href=#495 id=495 data-nosnippet>495</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#496 id=496 data-nosnippet>496</a>        </span>max_snapshot_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#497 id=497 data-nosnippet>497</a>        <span class="doccomment">/// For snapshot references except the main branch, a positive number for the max age of the snapshot reference to keep while expiring snapshots.
+<a href=#498 id=498 data-nosnippet>498</a>        /// Defaults to table property history.expire.max-ref-age-ms. The main branch never expires.
+<a href=#499 id=499 data-nosnippet>499</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#500 id=500 data-nosnippet>500</a>        </span>max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#501 id=501 data-nosnippet>501</a>    },
+<a href=#502 id=502 data-nosnippet>502</a>    <span class="attr">#[serde(rename_all = <span class="string">"kebab-case"</span>)]
+<a href=#503 id=503 data-nosnippet>503</a>    </span><span class="doccomment">/// Tags are labels for individual snapshots.
+<a href=#504 id=504 data-nosnippet>504</a>    </span>Tag {
+<a href=#505 id=505 data-nosnippet>505</a>        <span class="doccomment">/// For snapshot references except the main branch, a positive number for the max age of the snapshot reference to keep while expiring snapshots.
+<a href=#506 id=506 data-nosnippet>506</a>        /// Defaults to table property history.expire.max-ref-age-ms. The main branch never expires.
+<a href=#507 id=507 data-nosnippet>507</a>        </span><span class="attr">#[serde(skip_serializing_if = <span class="string">"Option::is_none"</span>)]
+<a href=#508 id=508 data-nosnippet>508</a>        </span>max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#509 id=509 data-nosnippet>509</a>    },
+<a href=#510 id=510 data-nosnippet>510</a>}
+<a href=#511 id=511 data-nosnippet>511</a>
+<a href=#512 id=512 data-nosnippet>512</a><span class="kw">impl </span>SnapshotRetention {
+<a href=#513 id=513 data-nosnippet>513</a>    <span class="doccomment">/// Create a new branch retention policy
+<a href=#514 id=514 data-nosnippet>514</a>    </span><span class="kw">pub fn </span>branch(
+<a href=#515 id=515 data-nosnippet>515</a>        min_snapshots_to_keep: <span class="prelude-ty">Option</span>&lt;i32&gt;,
+<a href=#516 id=516 data-nosnippet>516</a>        max_snapshot_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#517 id=517 data-nosnippet>517</a>        max_ref_age_ms: <span class="prelude-ty">Option</span>&lt;i64&gt;,
+<a href=#518 id=518 data-nosnippet>518</a>    ) -&gt; <span class="self">Self </span>{
+<a href=#519 id=519 data-nosnippet>519</a>        SnapshotRetention::Branch {
+<a href=#520 id=520 data-nosnippet>520</a>            min_snapshots_to_keep,
+<a href=#521 id=521 data-nosnippet>521</a>            max_snapshot_age_ms,
+<a href=#522 id=522 data-nosnippet>522</a>            max_ref_age_ms,
+<a href=#523 id=523 data-nosnippet>523</a>        }
+<a href=#524 id=524 data-nosnippet>524</a>    }
+<a href=#525 id=525 data-nosnippet>525</a>}
+<a href=#526 id=526 data-nosnippet>526</a>
+<a href=#527 id=527 data-nosnippet>527</a><span class="attr">#[cfg(test)]
+<a href=#528 id=528 data-nosnippet>528</a></span><span class="kw">mod </span>tests {
+<a href=#529 id=529 data-nosnippet>529</a>    <span class="kw">use </span>std::collections::HashMap;
+<a href=#530 id=530 data-nosnippet>530</a>
+<a href=#531 id=531 data-nosnippet>531</a>    <span class="kw">use </span>chrono::{TimeZone, Utc};
+<a href=#532 id=532 data-nosnippet>532</a>
+<a href=#533 id=533 data-nosnippet>533</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::TableMetadata;
+<a href=#534 id=534 data-nosnippet>534</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
+<a href=#535 id=535 data-nosnippet>535</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::{Operation, Snapshot, Summary};
+<a href=#536 id=536 data-nosnippet>536</a>
+<a href=#537 id=537 data-nosnippet>537</a>    <span class="attr">#[test]
+<a href=#538 id=538 data-nosnippet>538</a>    </span><span class="kw">fn </span>schema() {
+<a href=#539 id=539 data-nosnippet>539</a>        <span class="kw">let </span>record = <span class="string">r#"
+<a href=#540 id=540 data-nosnippet>540</a>        {
+<a href=#541 id=541 data-nosnippet>541</a>            "snapshot-id": 3051729675574597004,
+<a href=#542 id=542 data-nosnippet>542</a>            "timestamp-ms": 1515100955770,
+<a href=#543 id=543 data-nosnippet>543</a>            "summary": {
+<a href=#544 id=544 data-nosnippet>544</a>                "operation": "append"
+<a href=#545 id=545 data-nosnippet>545</a>            },
+<a href=#546 id=546 data-nosnippet>546</a>            "manifest-list": "s3://b/wh/.../s1.avro",
+<a href=#547 id=547 data-nosnippet>547</a>            "schema-id": 0
+<a href=#548 id=548 data-nosnippet>548</a>        }
+<a href=#549 id=549 data-nosnippet>549</a>        "#</span>;
+<a href=#550 id=550 data-nosnippet>550</a>
+<a href=#551 id=551 data-nosnippet>551</a>        <span class="kw">let </span>result: Snapshot = serde_json::from_str::&lt;SnapshotV1&gt;(record)
+<a href=#552 id=552 data-nosnippet>552</a>            .unwrap()
+<a href=#553 id=553 data-nosnippet>553</a>            .try_into()
+<a href=#554 id=554 data-nosnippet>554</a>            .unwrap();
+<a href=#555 id=555 data-nosnippet>555</a>        <span class="macro">assert_eq!</span>(<span class="number">3051729675574597004</span>, result.snapshot_id());
+<a href=#556 id=556 data-nosnippet>556</a>        <span class="macro">assert_eq!</span>(
+<a href=#557 id=557 data-nosnippet>557</a>            Utc.timestamp_millis_opt(<span class="number">1515100955770</span>).unwrap(),
+<a href=#558 id=558 data-nosnippet>558</a>            result.timestamp().unwrap()
+<a href=#559 id=559 data-nosnippet>559</a>        );
+<a href=#560 id=560 data-nosnippet>560</a>        <span class="macro">assert_eq!</span>(<span class="number">1515100955770</span>, result.timestamp_ms());
+<a href=#561 id=561 data-nosnippet>561</a>        <span class="macro">assert_eq!</span>(
+<a href=#562 id=562 data-nosnippet>562</a>            Summary {
+<a href=#563 id=563 data-nosnippet>563</a>                operation: Operation::Append,
+<a href=#564 id=564 data-nosnippet>564</a>                additional_properties: HashMap::new()
+<a href=#565 id=565 data-nosnippet>565</a>            },
+<a href=#566 id=566 data-nosnippet>566</a>            <span class="kw-2">*</span>result.summary()
+<a href=#567 id=567 data-nosnippet>567</a>        );
+<a href=#568 id=568 data-nosnippet>568</a>        <span class="macro">assert_eq!</span>(<span class="string">"s3://b/wh/.../s1.avro"</span>.to_string(), <span class="kw-2">*</span>result.manifest_list());
+<a href=#569 id=569 data-nosnippet>569</a>    }
+<a href=#570 id=570 data-nosnippet>570</a>
+<a href=#571 id=571 data-nosnippet>571</a>    <span class="attr">#[test]
+<a href=#572 id=572 data-nosnippet>572</a>    </span><span class="kw">fn </span>test_snapshot_v1_to_v2_projection() {
+<a href=#573 id=573 data-nosnippet>573</a>        <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
+<a href=#574 id=574 data-nosnippet>574</a>
+<a href=#575 id=575 data-nosnippet>575</a>        <span class="comment">// Create a V1 snapshot (without sequence-number field)
+<a href=#576 id=576 data-nosnippet>576</a>        </span><span class="kw">let </span>v1_snapshot = SnapshotV1 {
+<a href=#577 id=577 data-nosnippet>577</a>            snapshot_id: <span class="number">1234567890</span>,
+<a href=#578 id=578 data-nosnippet>578</a>            parent_snapshot_id: <span class="prelude-val">Some</span>(<span class="number">987654321</span>),
+<a href=#579 id=579 data-nosnippet>579</a>            timestamp_ms: <span class="number">1515100955770</span>,
+<a href=#580 id=580 data-nosnippet>580</a>            manifest_list: <span class="prelude-val">Some</span>(<span class="string">"s3://bucket/manifest-list.avro"</span>.to_string()),
+<a href=#581 id=581 data-nosnippet>581</a>            manifests: <span class="prelude-val">None</span>, <span class="comment">// V1 can have either manifest_list or manifests, but not both
+<a href=#582 id=582 data-nosnippet>582</a>            </span>summary: <span class="prelude-val">Some</span>(Summary {
+<a href=#583 id=583 data-nosnippet>583</a>                operation: Operation::Append,
+<a href=#584 id=584 data-nosnippet>584</a>                additional_properties: HashMap::from([
+<a href=#585 id=585 data-nosnippet>585</a>                    (<span class="string">"added-files"</span>.to_string(), <span class="string">"5"</span>.to_string()),
+<a href=#586 id=586 data-nosnippet>586</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"100"</span>.to_string()),
+<a href=#587 id=587 data-nosnippet>587</a>                ]),
+<a href=#588 id=588 data-nosnippet>588</a>            }),
+<a href=#589 id=589 data-nosnippet>589</a>            schema_id: <span class="prelude-val">Some</span>(<span class="number">1</span>),
+<a href=#590 id=590 data-nosnippet>590</a>        };
 <a href=#591 id=591 data-nosnippet>591</a>
-<a href=#592 id=592 data-nosnippet>592</a>        <span class="comment">// Verify V1→V2 projection defaults are applied correctly
-<a href=#593 id=593 data-nosnippet>593</a>        </span><span class="macro">assert_eq!</span>(
-<a href=#594 id=594 data-nosnippet>594</a>            v2_snapshot.sequence_number(),
-<a href=#595 id=595 data-nosnippet>595</a>            <span class="number">0</span>,
-<a href=#596 id=596 data-nosnippet>596</a>            <span class="string">"V1 snapshot sequence_number should default to 0"
-<a href=#597 id=597 data-nosnippet>597</a>        </span>);
-<a href=#598 id=598 data-nosnippet>598</a>
-<a href=#599 id=599 data-nosnippet>599</a>        <span class="comment">// Verify other fields are preserved correctly during conversion
-<a href=#600 id=600 data-nosnippet>600</a>        </span><span class="macro">assert_eq!</span>(v2_snapshot.snapshot_id(), <span class="number">1234567890</span>);
-<a href=#601 id=601 data-nosnippet>601</a>        <span class="macro">assert_eq!</span>(v2_snapshot.parent_snapshot_id(), <span class="prelude-val">Some</span>(<span class="number">987654321</span>));
-<a href=#602 id=602 data-nosnippet>602</a>        <span class="macro">assert_eq!</span>(v2_snapshot.timestamp_ms(), <span class="number">1515100955770</span>);
-<a href=#603 id=603 data-nosnippet>603</a>        <span class="macro">assert_eq!</span>(
-<a href=#604 id=604 data-nosnippet>604</a>            v2_snapshot.manifest_list(),
-<a href=#605 id=605 data-nosnippet>605</a>            <span class="string">"s3://bucket/manifest-list.avro"
-<a href=#606 id=606 data-nosnippet>606</a>        </span>);
-<a href=#607 id=607 data-nosnippet>607</a>        <span class="macro">assert_eq!</span>(v2_snapshot.schema_id(), <span class="prelude-val">Some</span>(<span class="number">1</span>));
-<a href=#608 id=608 data-nosnippet>608</a>        <span class="macro">assert_eq!</span>(v2_snapshot.summary().operation, Operation::Append);
-<a href=#609 id=609 data-nosnippet>609</a>        <span class="macro">assert_eq!</span>(
-<a href=#610 id=610 data-nosnippet>610</a>            v2_snapshot
-<a href=#611 id=611 data-nosnippet>611</a>                .summary()
-<a href=#612 id=612 data-nosnippet>612</a>                .additional_properties
-<a href=#613 id=613 data-nosnippet>613</a>                .get(<span class="string">"added-files"</span>),
-<a href=#614 id=614 data-nosnippet>614</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="string">"5"</span>.to_string())
-<a href=#615 id=615 data-nosnippet>615</a>        );
-<a href=#616 id=616 data-nosnippet>616</a>    }
-<a href=#617 id=617 data-nosnippet>617</a>
-<a href=#618 id=618 data-nosnippet>618</a>    <span class="attr">#[test]
-<a href=#619 id=619 data-nosnippet>619</a>    </span><span class="kw">fn </span>test_v1_snapshot_with_manifest_list_and_manifests() {
-<a href=#620 id=620 data-nosnippet>620</a>        {
-<a href=#621 id=621 data-nosnippet>621</a>            <span class="kw">let </span>metadata = <span class="string">r#"
-<a href=#622 id=622 data-nosnippet>622</a>    {
-<a href=#623 id=623 data-nosnippet>623</a>        "format-version": 1,
-<a href=#624 id=624 data-nosnippet>624</a>        "table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
-<a href=#625 id=625 data-nosnippet>625</a>        "location": "s3://bucket/test/location",
-<a href=#626 id=626 data-nosnippet>626</a>        "last-updated-ms": 1700000000000,
-<a href=#627 id=627 data-nosnippet>627</a>        "last-column-id": 1,
-<a href=#628 id=628 data-nosnippet>628</a>        "schema": {
-<a href=#629 id=629 data-nosnippet>629</a>            "type": "struct",
-<a href=#630 id=630 data-nosnippet>630</a>            "fields": [
-<a href=#631 id=631 data-nosnippet>631</a>                {"id": 1, "name": "x", "required": true, "type": "long"}
-<a href=#632 id=632 data-nosnippet>632</a>            ]
-<a href=#633 id=633 data-nosnippet>633</a>        },
-<a href=#634 id=634 data-nosnippet>634</a>        "partition-spec": [],
-<a href=#635 id=635 data-nosnippet>635</a>        "properties": {},
-<a href=#636 id=636 data-nosnippet>636</a>        "current-snapshot-id": 111111111,
-<a href=#637 id=637 data-nosnippet>637</a>        "snapshots": [
-<a href=#638 id=638 data-nosnippet>638</a>            {
-<a href=#639 id=639 data-nosnippet>639</a>                "snapshot-id": 111111111,
-<a href=#640 id=640 data-nosnippet>640</a>                "timestamp-ms": 1600000000000,
-<a href=#641 id=641 data-nosnippet>641</a>                "summary": {"operation": "append"},
-<a href=#642 id=642 data-nosnippet>642</a>                "manifest-list": "s3://bucket/metadata/snap-123.avro",
-<a href=#643 id=643 data-nosnippet>643</a>                "manifests": ["s3://bucket/metadata/manifest-1.avro"]
-<a href=#644 id=644 data-nosnippet>644</a>            }
-<a href=#645 id=645 data-nosnippet>645</a>        ]
-<a href=#646 id=646 data-nosnippet>646</a>    }
-<a href=#647 id=647 data-nosnippet>647</a>    "#</span>;
-<a href=#648 id=648 data-nosnippet>648</a>
-<a href=#649 id=649 data-nosnippet>649</a>            <span class="kw">let </span>result_both_manifest_list_and_manifest_set =
-<a href=#650 id=650 data-nosnippet>650</a>                serde_json::from_str::&lt;TableMetadata&gt;(metadata);
-<a href=#651 id=651 data-nosnippet>651</a>            <span class="macro">assert!</span>(result_both_manifest_list_and_manifest_set.is_err());
-<a href=#652 id=652 data-nosnippet>652</a>            <span class="macro">assert_eq!</span>(
-<a href=#653 id=653 data-nosnippet>653</a>                result_both_manifest_list_and_manifest_set
-<a href=#654 id=654 data-nosnippet>654</a>                    .unwrap_err()
-<a href=#655 id=655 data-nosnippet>655</a>                    .to_string(),
-<a href=#656 id=656 data-nosnippet>656</a>                <span class="string">"DataInvalid =&gt; Invalid v1 snapshot, when manifest list provided, manifest files should be omitted"
-<a href=#657 id=657 data-nosnippet>657</a>            </span>)
-<a href=#658 id=658 data-nosnippet>658</a>        }
-<a href=#659 id=659 data-nosnippet>659</a>
-<a href=#660 id=660 data-nosnippet>660</a>        {
-<a href=#661 id=661 data-nosnippet>661</a>            <span class="kw">let </span>metadata = <span class="string">r#"
-<a href=#662 id=662 data-nosnippet>662</a>    {
-<a href=#663 id=663 data-nosnippet>663</a>        "format-version": 1,
-<a href=#664 id=664 data-nosnippet>664</a>        "table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
-<a href=#665 id=665 data-nosnippet>665</a>        "location": "s3://bucket/test/location",
-<a href=#666 id=666 data-nosnippet>666</a>        "last-updated-ms": 1700000000000,
-<a href=#667 id=667 data-nosnippet>667</a>        "last-column-id": 1,
-<a href=#668 id=668 data-nosnippet>668</a>        "schema": {
-<a href=#669 id=669 data-nosnippet>669</a>            "type": "struct",
-<a href=#670 id=670 data-nosnippet>670</a>            "fields": [
-<a href=#671 id=671 data-nosnippet>671</a>                {"id": 1, "name": "x", "required": true, "type": "long"}
-<a href=#672 id=672 data-nosnippet>672</a>            ]
-<a href=#673 id=673 data-nosnippet>673</a>        },
-<a href=#674 id=674 data-nosnippet>674</a>        "partition-spec": [],
-<a href=#675 id=675 data-nosnippet>675</a>        "properties": {},
-<a href=#676 id=676 data-nosnippet>676</a>        "current-snapshot-id": 111111111,
-<a href=#677 id=677 data-nosnippet>677</a>        "snapshots": [
-<a href=#678 id=678 data-nosnippet>678</a>            {
-<a href=#679 id=679 data-nosnippet>679</a>                "snapshot-id": 111111111,
-<a href=#680 id=680 data-nosnippet>680</a>                "timestamp-ms": 1600000000000,
-<a href=#681 id=681 data-nosnippet>681</a>                "summary": {"operation": "append"},
-<a href=#682 id=682 data-nosnippet>682</a>                "manifests": ["s3://bucket/metadata/manifest-1.avro"]
-<a href=#683 id=683 data-nosnippet>683</a>            }
-<a href=#684 id=684 data-nosnippet>684</a>        ]
-<a href=#685 id=685 data-nosnippet>685</a>    }
-<a href=#686 id=686 data-nosnippet>686</a>    "#</span>;
-<a href=#687 id=687 data-nosnippet>687</a>            <span class="kw">let </span>result_missing_manifest_list = serde_json::from_str::&lt;TableMetadata&gt;(metadata);
-<a href=#688 id=688 data-nosnippet>688</a>            <span class="macro">assert!</span>(result_missing_manifest_list.is_err());
-<a href=#689 id=689 data-nosnippet>689</a>            <span class="macro">assert_eq!</span>(
-<a href=#690 id=690 data-nosnippet>690</a>                result_missing_manifest_list.unwrap_err().to_string(),
-<a href=#691 id=691 data-nosnippet>691</a>                <span class="string">"DataInvalid =&gt; Unsupported v1 snapshot, only manifest list is supported"
-<a href=#692 id=692 data-nosnippet>692</a>            </span>)
-<a href=#693 id=693 data-nosnippet>693</a>        }
-<a href=#694 id=694 data-nosnippet>694</a>    }
-<a href=#695 id=695 data-nosnippet>695</a>
-<a href=#696 id=696 data-nosnippet>696</a>    <span class="attr">#[test]
-<a href=#697 id=697 data-nosnippet>697</a>    </span><span class="kw">fn </span>test_snapshot_v1_to_v2_with_missing_summary() {
-<a href=#698 id=698 data-nosnippet>698</a>        <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
-<a href=#699 id=699 data-nosnippet>699</a>
-<a href=#700 id=700 data-nosnippet>700</a>        <span class="comment">// Create a V1 snapshot without summary (should get default)
-<a href=#701 id=701 data-nosnippet>701</a>        </span><span class="kw">let </span>v1_snapshot = SnapshotV1 {
-<a href=#702 id=702 data-nosnippet>702</a>            snapshot_id: <span class="number">1111111111</span>,
-<a href=#703 id=703 data-nosnippet>703</a>            parent_snapshot_id: <span class="prelude-val">None</span>,
-<a href=#704 id=704 data-nosnippet>704</a>            timestamp_ms: <span class="number">1515100955770</span>,
-<a href=#705 id=705 data-nosnippet>705</a>            manifest_list: <span class="prelude-val">Some</span>(<span class="string">"s3://bucket/manifest-list.avro"</span>.to_string()),
-<a href=#706 id=706 data-nosnippet>706</a>            manifests: <span class="prelude-val">None</span>,
-<a href=#707 id=707 data-nosnippet>707</a>            summary: <span class="prelude-val">None</span>, <span class="comment">// V1 summary is optional
-<a href=#708 id=708 data-nosnippet>708</a>            </span>schema_id: <span class="prelude-val">None</span>,
-<a href=#709 id=709 data-nosnippet>709</a>        };
-<a href=#710 id=710 data-nosnippet>710</a>
-<a href=#711 id=711 data-nosnippet>711</a>        <span class="comment">// Convert V1 to V2 - this should apply default summary
-<a href=#712 id=712 data-nosnippet>712</a>        </span><span class="kw">let </span>v2_snapshot: Snapshot = v1_snapshot.try_into().unwrap();
+<a href=#592 id=592 data-nosnippet>592</a>        <span class="comment">// Convert V1 to V2 - this should apply defaults for missing V2 fields
+<a href=#593 id=593 data-nosnippet>593</a>        </span><span class="kw">let </span>v2_snapshot: Snapshot = v1_snapshot.try_into().unwrap();
+<a href=#594 id=594 data-nosnippet>594</a>
+<a href=#595 id=595 data-nosnippet>595</a>        <span class="comment">// Verify V1→V2 projection defaults are applied correctly
+<a href=#596 id=596 data-nosnippet>596</a>        </span><span class="macro">assert_eq!</span>(
+<a href=#597 id=597 data-nosnippet>597</a>            v2_snapshot.sequence_number(),
+<a href=#598 id=598 data-nosnippet>598</a>            <span class="number">0</span>,
+<a href=#599 id=599 data-nosnippet>599</a>            <span class="string">"V1 snapshot sequence_number should default to 0"
+<a href=#600 id=600 data-nosnippet>600</a>        </span>);
+<a href=#601 id=601 data-nosnippet>601</a>
+<a href=#602 id=602 data-nosnippet>602</a>        <span class="comment">// Verify other fields are preserved correctly during conversion
+<a href=#603 id=603 data-nosnippet>603</a>        </span><span class="macro">assert_eq!</span>(v2_snapshot.snapshot_id(), <span class="number">1234567890</span>);
+<a href=#604 id=604 data-nosnippet>604</a>        <span class="macro">assert_eq!</span>(v2_snapshot.parent_snapshot_id(), <span class="prelude-val">Some</span>(<span class="number">987654321</span>));
+<a href=#605 id=605 data-nosnippet>605</a>        <span class="macro">assert_eq!</span>(v2_snapshot.timestamp_ms(), <span class="number">1515100955770</span>);
+<a href=#606 id=606 data-nosnippet>606</a>        <span class="macro">assert_eq!</span>(
+<a href=#607 id=607 data-nosnippet>607</a>            v2_snapshot.manifest_list(),
+<a href=#608 id=608 data-nosnippet>608</a>            <span class="string">"s3://bucket/manifest-list.avro"
+<a href=#609 id=609 data-nosnippet>609</a>        </span>);
+<a href=#610 id=610 data-nosnippet>610</a>        <span class="macro">assert_eq!</span>(v2_snapshot.schema_id(), <span class="prelude-val">Some</span>(<span class="number">1</span>));
+<a href=#611 id=611 data-nosnippet>611</a>        <span class="macro">assert_eq!</span>(v2_snapshot.summary().operation, Operation::Append);
+<a href=#612 id=612 data-nosnippet>612</a>        <span class="macro">assert_eq!</span>(
+<a href=#613 id=613 data-nosnippet>613</a>            v2_snapshot
+<a href=#614 id=614 data-nosnippet>614</a>                .summary()
+<a href=#615 id=615 data-nosnippet>615</a>                .additional_properties
+<a href=#616 id=616 data-nosnippet>616</a>                .get(<span class="string">"added-files"</span>),
+<a href=#617 id=617 data-nosnippet>617</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="string">"5"</span>.to_string())
+<a href=#618 id=618 data-nosnippet>618</a>        );
+<a href=#619 id=619 data-nosnippet>619</a>    }
+<a href=#620 id=620 data-nosnippet>620</a>
+<a href=#621 id=621 data-nosnippet>621</a>    <span class="attr">#[test]
+<a href=#622 id=622 data-nosnippet>622</a>    </span><span class="kw">fn </span>test_v1_snapshot_with_manifest_list_and_manifests() {
+<a href=#623 id=623 data-nosnippet>623</a>        {
+<a href=#624 id=624 data-nosnippet>624</a>            <span class="kw">let </span>metadata = <span class="string">r#"
+<a href=#625 id=625 data-nosnippet>625</a>    {
+<a href=#626 id=626 data-nosnippet>626</a>        "format-version": 1,
+<a href=#627 id=627 data-nosnippet>627</a>        "table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
+<a href=#628 id=628 data-nosnippet>628</a>        "location": "s3://bucket/test/location",
+<a href=#629 id=629 data-nosnippet>629</a>        "last-updated-ms": 1700000000000,
+<a href=#630 id=630 data-nosnippet>630</a>        "last-column-id": 1,
+<a href=#631 id=631 data-nosnippet>631</a>        "schema": {
+<a href=#632 id=632 data-nosnippet>632</a>            "type": "struct",
+<a href=#633 id=633 data-nosnippet>633</a>            "fields": [
+<a href=#634 id=634 data-nosnippet>634</a>                {"id": 1, "name": "x", "required": true, "type": "long"}
+<a href=#635 id=635 data-nosnippet>635</a>            ]
+<a href=#636 id=636 data-nosnippet>636</a>        },
+<a href=#637 id=637 data-nosnippet>637</a>        "partition-spec": [],
+<a href=#638 id=638 data-nosnippet>638</a>        "properties": {},
+<a href=#639 id=639 data-nosnippet>639</a>        "current-snapshot-id": 111111111,
+<a href=#640 id=640 data-nosnippet>640</a>        "snapshots": [
+<a href=#641 id=641 data-nosnippet>641</a>            {
+<a href=#642 id=642 data-nosnippet>642</a>                "snapshot-id": 111111111,
+<a href=#643 id=643 data-nosnippet>643</a>                "timestamp-ms": 1600000000000,
+<a href=#644 id=644 data-nosnippet>644</a>                "summary": {"operation": "append"},
+<a href=#645 id=645 data-nosnippet>645</a>                "manifest-list": "s3://bucket/metadata/snap-123.avro",
+<a href=#646 id=646 data-nosnippet>646</a>                "manifests": ["s3://bucket/metadata/manifest-1.avro"]
+<a href=#647 id=647 data-nosnippet>647</a>            }
+<a href=#648 id=648 data-nosnippet>648</a>        ]
+<a href=#649 id=649 data-nosnippet>649</a>    }
+<a href=#650 id=650 data-nosnippet>650</a>    "#</span>;
+<a href=#651 id=651 data-nosnippet>651</a>
+<a href=#652 id=652 data-nosnippet>652</a>            <span class="kw">let </span>result_both_manifest_list_and_manifest_set =
+<a href=#653 id=653 data-nosnippet>653</a>                serde_json::from_str::&lt;TableMetadata&gt;(metadata);
+<a href=#654 id=654 data-nosnippet>654</a>            <span class="macro">assert!</span>(result_both_manifest_list_and_manifest_set.is_err());
+<a href=#655 id=655 data-nosnippet>655</a>            <span class="macro">assert_eq!</span>(
+<a href=#656 id=656 data-nosnippet>656</a>                result_both_manifest_list_and_manifest_set
+<a href=#657 id=657 data-nosnippet>657</a>                    .unwrap_err()
+<a href=#658 id=658 data-nosnippet>658</a>                    .to_string(),
+<a href=#659 id=659 data-nosnippet>659</a>                <span class="string">"DataInvalid =&gt; Invalid v1 snapshot, when manifest list provided, manifest files should be omitted"
+<a href=#660 id=660 data-nosnippet>660</a>            </span>)
+<a href=#661 id=661 data-nosnippet>661</a>        }
+<a href=#662 id=662 data-nosnippet>662</a>
+<a href=#663 id=663 data-nosnippet>663</a>        {
+<a href=#664 id=664 data-nosnippet>664</a>            <span class="kw">let </span>metadata = <span class="string">r#"
+<a href=#665 id=665 data-nosnippet>665</a>    {
+<a href=#666 id=666 data-nosnippet>666</a>        "format-version": 1,
+<a href=#667 id=667 data-nosnippet>667</a>        "table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
+<a href=#668 id=668 data-nosnippet>668</a>        "location": "s3://bucket/test/location",
+<a href=#669 id=669 data-nosnippet>669</a>        "last-updated-ms": 1700000000000,
+<a href=#670 id=670 data-nosnippet>670</a>        "last-column-id": 1,
+<a href=#671 id=671 data-nosnippet>671</a>        "schema": {
+<a href=#672 id=672 data-nosnippet>672</a>            "type": "struct",
+<a href=#673 id=673 data-nosnippet>673</a>            "fields": [
+<a href=#674 id=674 data-nosnippet>674</a>                {"id": 1, "name": "x", "required": true, "type": "long"}
+<a href=#675 id=675 data-nosnippet>675</a>            ]
+<a href=#676 id=676 data-nosnippet>676</a>        },
+<a href=#677 id=677 data-nosnippet>677</a>        "partition-spec": [],
+<a href=#678 id=678 data-nosnippet>678</a>        "properties": {},
+<a href=#679 id=679 data-nosnippet>679</a>        "current-snapshot-id": 111111111,
+<a href=#680 id=680 data-nosnippet>680</a>        "snapshots": [
+<a href=#681 id=681 data-nosnippet>681</a>            {
+<a href=#682 id=682 data-nosnippet>682</a>                "snapshot-id": 111111111,
+<a href=#683 id=683 data-nosnippet>683</a>                "timestamp-ms": 1600000000000,
+<a href=#684 id=684 data-nosnippet>684</a>                "summary": {"operation": "append"},
+<a href=#685 id=685 data-nosnippet>685</a>                "manifests": ["s3://bucket/metadata/manifest-1.avro"]
+<a href=#686 id=686 data-nosnippet>686</a>            }
+<a href=#687 id=687 data-nosnippet>687</a>        ]
+<a href=#688 id=688 data-nosnippet>688</a>    }
+<a href=#689 id=689 data-nosnippet>689</a>    "#</span>;
+<a href=#690 id=690 data-nosnippet>690</a>            <span class="kw">let </span>result_missing_manifest_list = serde_json::from_str::&lt;TableMetadata&gt;(metadata);
+<a href=#691 id=691 data-nosnippet>691</a>            <span class="macro">assert!</span>(result_missing_manifest_list.is_err());
+<a href=#692 id=692 data-nosnippet>692</a>            <span class="macro">assert_eq!</span>(
+<a href=#693 id=693 data-nosnippet>693</a>                result_missing_manifest_list.unwrap_err().to_string(),
+<a href=#694 id=694 data-nosnippet>694</a>                <span class="string">"DataInvalid =&gt; Unsupported v1 snapshot, only manifest list is supported"
+<a href=#695 id=695 data-nosnippet>695</a>            </span>)
+<a href=#696 id=696 data-nosnippet>696</a>        }
+<a href=#697 id=697 data-nosnippet>697</a>    }
+<a href=#698 id=698 data-nosnippet>698</a>
+<a href=#699 id=699 data-nosnippet>699</a>    <span class="attr">#[test]
+<a href=#700 id=700 data-nosnippet>700</a>    </span><span class="kw">fn </span>test_snapshot_v1_to_v2_with_missing_summary() {
+<a href=#701 id=701 data-nosnippet>701</a>        <span class="kw">use </span><span class="kw">crate</span>::spec::snapshot::_serde::SnapshotV1;
+<a href=#702 id=702 data-nosnippet>702</a>
+<a href=#703 id=703 data-nosnippet>703</a>        <span class="comment">// Create a V1 snapshot without summary (should get default)
+<a href=#704 id=704 data-nosnippet>704</a>        </span><span class="kw">let </span>v1_snapshot = SnapshotV1 {
+<a href=#705 id=705 data-nosnippet>705</a>            snapshot_id: <span class="number">1111111111</span>,
+<a href=#706 id=706 data-nosnippet>706</a>            parent_snapshot_id: <span class="prelude-val">None</span>,
+<a href=#707 id=707 data-nosnippet>707</a>            timestamp_ms: <span class="number">1515100955770</span>,
+<a href=#708 id=708 data-nosnippet>708</a>            manifest_list: <span class="prelude-val">Some</span>(<span class="string">"s3://bucket/manifest-list.avro"</span>.to_string()),
+<a href=#709 id=709 data-nosnippet>709</a>            manifests: <span class="prelude-val">None</span>,
+<a href=#710 id=710 data-nosnippet>710</a>            summary: <span class="prelude-val">None</span>, <span class="comment">// V1 summary is optional
+<a href=#711 id=711 data-nosnippet>711</a>            </span>schema_id: <span class="prelude-val">None</span>,
+<a href=#712 id=712 data-nosnippet>712</a>        };
 <a href=#713 id=713 data-nosnippet>713</a>
-<a href=#714 id=714 data-nosnippet>714</a>        <span class="comment">// Verify defaults are applied correctly
-<a href=#715 id=715 data-nosnippet>715</a>        </span><span class="macro">assert_eq!</span>(
-<a href=#716 id=716 data-nosnippet>716</a>            v2_snapshot.sequence_number(),
-<a href=#717 id=717 data-nosnippet>717</a>            <span class="number">0</span>,
-<a href=#718 id=718 data-nosnippet>718</a>            <span class="string">"V1 snapshot sequence_number should default to 0"
-<a href=#719 id=719 data-nosnippet>719</a>        </span>);
-<a href=#720 id=720 data-nosnippet>720</a>        <span class="macro">assert_eq!</span>(
-<a href=#721 id=721 data-nosnippet>721</a>            v2_snapshot.summary().operation,
-<a href=#722 id=722 data-nosnippet>722</a>            Operation::Append,
-<a href=#723 id=723 data-nosnippet>723</a>            <span class="string">"Missing V1 summary should default to Append operation"
-<a href=#724 id=724 data-nosnippet>724</a>        </span>);
-<a href=#725 id=725 data-nosnippet>725</a>        <span class="macro">assert!</span>(
-<a href=#726 id=726 data-nosnippet>726</a>            v2_snapshot.summary().additional_properties.is_empty(),
-<a href=#727 id=727 data-nosnippet>727</a>            <span class="string">"Default summary should have empty additional_properties"
-<a href=#728 id=728 data-nosnippet>728</a>        </span>);
-<a href=#729 id=729 data-nosnippet>729</a>
-<a href=#730 id=730 data-nosnippet>730</a>        <span class="comment">// Verify other fields
-<a href=#731 id=731 data-nosnippet>731</a>        </span><span class="macro">assert_eq!</span>(v2_snapshot.snapshot_id(), <span class="number">1111111111</span>);
-<a href=#732 id=732 data-nosnippet>732</a>        <span class="macro">assert_eq!</span>(v2_snapshot.parent_snapshot_id(), <span class="prelude-val">None</span>);
-<a href=#733 id=733 data-nosnippet>733</a>        <span class="macro">assert_eq!</span>(v2_snapshot.schema_id(), <span class="prelude-val">None</span>);
-<a href=#734 id=734 data-nosnippet>734</a>    }
-<a href=#735 id=735 data-nosnippet>735</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file
+<a href=#714 id=714 data-nosnippet>714</a>        <span class="comment">// Convert V1 to V2 - this should apply default summary
+<a href=#715 id=715 data-nosnippet>715</a>        </span><span class="kw">let </span>v2_snapshot: Snapshot = v1_snapshot.try_into().unwrap();
+<a href=#716 id=716 data-nosnippet>716</a>
+<a href=#717 id=717 data-nosnippet>717</a>        <span class="comment">// Verify defaults are applied correctly
+<a href=#718 id=718 data-nosnippet>718</a>        </span><span class="macro">assert_eq!</span>(
+<a href=#719 id=719 data-nosnippet>719</a>            v2_snapshot.sequence_number(),
+<a href=#720 id=720 data-nosnippet>720</a>            <span class="number">0</span>,
+<a href=#721 id=721 data-nosnippet>721</a>            <span class="string">"V1 snapshot sequence_number should default to 0"
+<a href=#722 id=722 data-nosnippet>722</a>        </span>);
+<a href=#723 id=723 data-nosnippet>723</a>        <span class="macro">assert_eq!</span>(
+<a href=#724 id=724 data-nosnippet>724</a>            v2_snapshot.summary().operation,
+<a href=#725 id=725 data-nosnippet>725</a>            Operation::Append,
+<a href=#726 id=726 data-nosnippet>726</a>            <span class="string">"Missing V1 summary should default to Append operation"
+<a href=#727 id=727 data-nosnippet>727</a>        </span>);
+<a href=#728 id=728 data-nosnippet>728</a>        <span class="macro">assert!</span>(
+<a href=#729 id=729 data-nosnippet>729</a>            v2_snapshot.summary().additional_properties.is_empty(),
+<a href=#730 id=730 data-nosnippet>730</a>            <span class="string">"Default summary should have empty additional_properties"
+<a href=#731 id=731 data-nosnippet>731</a>        </span>);
+<a href=#732 id=732 data-nosnippet>732</a>
+<a href=#733 id=733 data-nosnippet>733</a>        <span class="comment">// Verify other fields
+<a href=#734 id=734 data-nosnippet>734</a>        </span><span class="macro">assert_eq!</span>(v2_snapshot.snapshot_id(), <span class="number">1111111111</span>);
+<a href=#735 id=735 data-nosnippet>735</a>        <span class="macro">assert_eq!</span>(v2_snapshot.parent_snapshot_id(), <span class="prelude-val">None</span>);
+<a href=#736 id=736 data-nosnippet>736</a>        <span class="macro">assert_eq!</span>(v2_snapshot.schema_id(), <span class="prelude-val">None</span>);
+<a href=#737 id=737 data-nosnippet>737</a>    }
+<a href=#738 id=738 data-nosnippet>738</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file
diff --git a/api/src/iceberg/spec/table_metadata.rs.html b/api/src/iceberg/spec/table_metadata.rs.html
index 1f9ea633a..415667c7a 100644
--- a/api/src/iceberg/spec/table_metadata.rs.html
+++ b/api/src/iceberg/spec/table_metadata.rs.html
@@ -3978,4 +3978,195 @@
 <a href=#3978 id=3978 data-nosnippet>3978</a>        <span class="macro">assert_eq!</span>(err.kind(), ErrorKind::DataInvalid);
 <a href=#3979 id=3979 data-nosnippet>3979</a>        <span class="macro">assert!</span>(err.message().contains(<span class="string">"Invalid table properties"</span>));
 <a href=#3980 id=3980 data-nosnippet>3980</a>    }
-<a href=#3981 id=3981 data-nosnippet>3981</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file
+<a href=#3981 id=3981 data-nosnippet>3981</a>
+<a href=#3982 id=3982 data-nosnippet>3982</a>    <span class="attr">#[test]
+<a href=#3983 id=3983 data-nosnippet>3983</a>    </span><span class="kw">fn </span>test_v2_to_v3_upgrade_preserves_existing_snapshots_without_row_lineage() {
+<a href=#3984 id=3984 data-nosnippet>3984</a>        <span class="comment">// Create a v2 table metadata
+<a href=#3985 id=3985 data-nosnippet>3985</a>        </span><span class="kw">let </span>schema = Schema::builder()
+<a href=#3986 id=3986 data-nosnippet>3986</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#3987 id=3987 data-nosnippet>3987</a>                NestedField::required(<span class="number">1</span>, <span class="string">"id"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#3988 id=3988 data-nosnippet>3988</a>            ])
+<a href=#3989 id=3989 data-nosnippet>3989</a>            .build()
+<a href=#3990 id=3990 data-nosnippet>3990</a>            .unwrap();
+<a href=#3991 id=3991 data-nosnippet>3991</a>
+<a href=#3992 id=3992 data-nosnippet>3992</a>        <span class="kw">let </span>v2_metadata = TableMetadataBuilder::new(
+<a href=#3993 id=3993 data-nosnippet>3993</a>            schema,
+<a href=#3994 id=3994 data-nosnippet>3994</a>            PartitionSpec::unpartition_spec().into_unbound(),
+<a href=#3995 id=3995 data-nosnippet>3995</a>            SortOrder::unsorted_order(),
+<a href=#3996 id=3996 data-nosnippet>3996</a>            <span class="string">"s3://bucket/test/location"</span>.to_string(),
+<a href=#3997 id=3997 data-nosnippet>3997</a>            FormatVersion::V2,
+<a href=#3998 id=3998 data-nosnippet>3998</a>            HashMap::new(),
+<a href=#3999 id=3999 data-nosnippet>3999</a>        )
+<a href=#4000 id=4000 data-nosnippet>4000</a>        .unwrap()
+<a href=#4001 id=4001 data-nosnippet>4001</a>        .build()
+<a href=#4002 id=4002 data-nosnippet>4002</a>        .unwrap()
+<a href=#4003 id=4003 data-nosnippet>4003</a>        .metadata;
+<a href=#4004 id=4004 data-nosnippet>4004</a>
+<a href=#4005 id=4005 data-nosnippet>4005</a>        <span class="comment">// Add a v2 snapshot
+<a href=#4006 id=4006 data-nosnippet>4006</a>        </span><span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#4007 id=4007 data-nosnippet>4007</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#4008 id=4008 data-nosnippet>4008</a>            .with_timestamp_ms(v2_metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#4009 id=4009 data-nosnippet>4009</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#4010 id=4010 data-nosnippet>4010</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#4011 id=4011 data-nosnippet>4011</a>            .with_manifest_list(<span class="string">"s3://bucket/test/metadata/snap-1.avro"</span>)
+<a href=#4012 id=4012 data-nosnippet>4012</a>            .with_summary(Summary {
+<a href=#4013 id=4013 data-nosnippet>4013</a>                operation: Operation::Append,
+<a href=#4014 id=4014 data-nosnippet>4014</a>                additional_properties: HashMap::from([(
+<a href=#4015 id=4015 data-nosnippet>4015</a>                    <span class="string">"added-data-files"</span>.to_string(),
+<a href=#4016 id=4016 data-nosnippet>4016</a>                    <span class="string">"1"</span>.to_string(),
+<a href=#4017 id=4017 data-nosnippet>4017</a>                )]),
+<a href=#4018 id=4018 data-nosnippet>4018</a>            })
+<a href=#4019 id=4019 data-nosnippet>4019</a>            .build();
+<a href=#4020 id=4020 data-nosnippet>4020</a>
+<a href=#4021 id=4021 data-nosnippet>4021</a>        <span class="kw">let </span>v2_with_snapshot = v2_metadata
+<a href=#4022 id=4022 data-nosnippet>4022</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"s3://bucket/test/metadata/v00001.json"</span>.to_string()))
+<a href=#4023 id=4023 data-nosnippet>4023</a>            .add_snapshot(snapshot)
+<a href=#4024 id=4024 data-nosnippet>4024</a>            .unwrap()
+<a href=#4025 id=4025 data-nosnippet>4025</a>            .set_ref(<span class="string">"main"</span>, SnapshotReference {
+<a href=#4026 id=4026 data-nosnippet>4026</a>                snapshot_id: <span class="number">1</span>,
+<a href=#4027 id=4027 data-nosnippet>4027</a>                retention: SnapshotRetention::Branch {
+<a href=#4028 id=4028 data-nosnippet>4028</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
+<a href=#4029 id=4029 data-nosnippet>4029</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#4030 id=4030 data-nosnippet>4030</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#4031 id=4031 data-nosnippet>4031</a>                },
+<a href=#4032 id=4032 data-nosnippet>4032</a>            })
+<a href=#4033 id=4033 data-nosnippet>4033</a>            .unwrap()
+<a href=#4034 id=4034 data-nosnippet>4034</a>            .build()
+<a href=#4035 id=4035 data-nosnippet>4035</a>            .unwrap()
+<a href=#4036 id=4036 data-nosnippet>4036</a>            .metadata;
+<a href=#4037 id=4037 data-nosnippet>4037</a>
+<a href=#4038 id=4038 data-nosnippet>4038</a>        <span class="comment">// Verify v2 serialization works fine
+<a href=#4039 id=4039 data-nosnippet>4039</a>        </span><span class="kw">let </span>v2_json = serde_json::to_string(<span class="kw-2">&amp;</span>v2_with_snapshot);
+<a href=#4040 id=4040 data-nosnippet>4040</a>        <span class="macro">assert!</span>(v2_json.is_ok(), <span class="string">"v2 serialization should work"</span>);
+<a href=#4041 id=4041 data-nosnippet>4041</a>
+<a href=#4042 id=4042 data-nosnippet>4042</a>        <span class="comment">// Upgrade to v3
+<a href=#4043 id=4043 data-nosnippet>4043</a>        </span><span class="kw">let </span>v3_metadata = v2_with_snapshot
+<a href=#4044 id=4044 data-nosnippet>4044</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"s3://bucket/test/metadata/v00002.json"</span>.to_string()))
+<a href=#4045 id=4045 data-nosnippet>4045</a>            .upgrade_format_version(FormatVersion::V3)
+<a href=#4046 id=4046 data-nosnippet>4046</a>            .unwrap()
+<a href=#4047 id=4047 data-nosnippet>4047</a>            .build()
+<a href=#4048 id=4048 data-nosnippet>4048</a>            .unwrap()
+<a href=#4049 id=4049 data-nosnippet>4049</a>            .metadata;
+<a href=#4050 id=4050 data-nosnippet>4050</a>
+<a href=#4051 id=4051 data-nosnippet>4051</a>        <span class="macro">assert_eq!</span>(v3_metadata.format_version, FormatVersion::V3);
+<a href=#4052 id=4052 data-nosnippet>4052</a>        <span class="macro">assert_eq!</span>(v3_metadata.next_row_id, INITIAL_ROW_ID);
+<a href=#4053 id=4053 data-nosnippet>4053</a>        <span class="macro">assert_eq!</span>(v3_metadata.snapshots.len(), <span class="number">1</span>);
+<a href=#4054 id=4054 data-nosnippet>4054</a>
+<a href=#4055 id=4055 data-nosnippet>4055</a>        <span class="comment">// Verify the snapshot has no row_range
+<a href=#4056 id=4056 data-nosnippet>4056</a>        </span><span class="kw">let </span>snapshot = v3_metadata.snapshots.values().next().unwrap();
+<a href=#4057 id=4057 data-nosnippet>4057</a>        <span class="macro">assert!</span>(
+<a href=#4058 id=4058 data-nosnippet>4058</a>            snapshot.row_range().is_none(),
+<a href=#4059 id=4059 data-nosnippet>4059</a>            <span class="string">"Snapshot should have no row_range after upgrade"
+<a href=#4060 id=4060 data-nosnippet>4060</a>        </span>);
+<a href=#4061 id=4061 data-nosnippet>4061</a>
+<a href=#4062 id=4062 data-nosnippet>4062</a>        <span class="comment">// Try to serialize v3 metadata - this should now work
+<a href=#4063 id=4063 data-nosnippet>4063</a>        </span><span class="kw">let </span>v3_json = serde_json::to_string(<span class="kw-2">&amp;</span>v3_metadata);
+<a href=#4064 id=4064 data-nosnippet>4064</a>        <span class="macro">assert!</span>(
+<a href=#4065 id=4065 data-nosnippet>4065</a>            v3_json.is_ok(),
+<a href=#4066 id=4066 data-nosnippet>4066</a>            <span class="string">"v3 serialization should work for upgraded tables"
+<a href=#4067 id=4067 data-nosnippet>4067</a>        </span>);
+<a href=#4068 id=4068 data-nosnippet>4068</a>
+<a href=#4069 id=4069 data-nosnippet>4069</a>        <span class="comment">// Verify we can deserialize it back
+<a href=#4070 id=4070 data-nosnippet>4070</a>        </span><span class="kw">let </span>deserialized: TableMetadata = serde_json::from_str(<span class="kw-2">&amp;</span>v3_json.unwrap()).unwrap();
+<a href=#4071 id=4071 data-nosnippet>4071</a>        <span class="macro">assert_eq!</span>(deserialized.format_version, FormatVersion::V3);
+<a href=#4072 id=4072 data-nosnippet>4072</a>        <span class="macro">assert_eq!</span>(deserialized.snapshots.len(), <span class="number">1</span>);
+<a href=#4073 id=4073 data-nosnippet>4073</a>
+<a href=#4074 id=4074 data-nosnippet>4074</a>        <span class="comment">// Verify the deserialized snapshot still has no row_range
+<a href=#4075 id=4075 data-nosnippet>4075</a>        </span><span class="kw">let </span>deserialized_snapshot = deserialized.snapshots.values().next().unwrap();
+<a href=#4076 id=4076 data-nosnippet>4076</a>        <span class="macro">assert!</span>(
+<a href=#4077 id=4077 data-nosnippet>4077</a>            deserialized_snapshot.row_range().is_none(),
+<a href=#4078 id=4078 data-nosnippet>4078</a>            <span class="string">"Deserialized snapshot should have no row_range"
+<a href=#4079 id=4079 data-nosnippet>4079</a>        </span>);
+<a href=#4080 id=4080 data-nosnippet>4080</a>    }
+<a href=#4081 id=4081 data-nosnippet>4081</a>
+<a href=#4082 id=4082 data-nosnippet>4082</a>    <span class="attr">#[test]
+<a href=#4083 id=4083 data-nosnippet>4083</a>    </span><span class="kw">fn </span>test_v3_snapshot_with_row_lineage_serialization() {
+<a href=#4084 id=4084 data-nosnippet>4084</a>        <span class="comment">// Create a v3 table metadata
+<a href=#4085 id=4085 data-nosnippet>4085</a>        </span><span class="kw">let </span>schema = Schema::builder()
+<a href=#4086 id=4086 data-nosnippet>4086</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#4087 id=4087 data-nosnippet>4087</a>                NestedField::required(<span class="number">1</span>, <span class="string">"id"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#4088 id=4088 data-nosnippet>4088</a>            ])
+<a href=#4089 id=4089 data-nosnippet>4089</a>            .build()
+<a href=#4090 id=4090 data-nosnippet>4090</a>            .unwrap();
+<a href=#4091 id=4091 data-nosnippet>4091</a>
+<a href=#4092 id=4092 data-nosnippet>4092</a>        <span class="kw">let </span>v3_metadata = TableMetadataBuilder::new(
+<a href=#4093 id=4093 data-nosnippet>4093</a>            schema,
+<a href=#4094 id=4094 data-nosnippet>4094</a>            PartitionSpec::unpartition_spec().into_unbound(),
+<a href=#4095 id=4095 data-nosnippet>4095</a>            SortOrder::unsorted_order(),
+<a href=#4096 id=4096 data-nosnippet>4096</a>            <span class="string">"s3://bucket/test/location"</span>.to_string(),
+<a href=#4097 id=4097 data-nosnippet>4097</a>            FormatVersion::V3,
+<a href=#4098 id=4098 data-nosnippet>4098</a>            HashMap::new(),
+<a href=#4099 id=4099 data-nosnippet>4099</a>        )
+<a href=#4100 id=4100 data-nosnippet>4100</a>        .unwrap()
+<a href=#4101 id=4101 data-nosnippet>4101</a>        .build()
+<a href=#4102 id=4102 data-nosnippet>4102</a>        .unwrap()
+<a href=#4103 id=4103 data-nosnippet>4103</a>        .metadata;
+<a href=#4104 id=4104 data-nosnippet>4104</a>
+<a href=#4105 id=4105 data-nosnippet>4105</a>        <span class="comment">// Add a v3 snapshot with row lineage
+<a href=#4106 id=4106 data-nosnippet>4106</a>        </span><span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#4107 id=4107 data-nosnippet>4107</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#4108 id=4108 data-nosnippet>4108</a>            .with_timestamp_ms(v3_metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#4109 id=4109 data-nosnippet>4109</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#4110 id=4110 data-nosnippet>4110</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#4111 id=4111 data-nosnippet>4111</a>            .with_manifest_list(<span class="string">"s3://bucket/test/metadata/snap-1.avro"</span>)
+<a href=#4112 id=4112 data-nosnippet>4112</a>            .with_summary(Summary {
+<a href=#4113 id=4113 data-nosnippet>4113</a>                operation: Operation::Append,
+<a href=#4114 id=4114 data-nosnippet>4114</a>                additional_properties: HashMap::from([(
+<a href=#4115 id=4115 data-nosnippet>4115</a>                    <span class="string">"added-data-files"</span>.to_string(),
+<a href=#4116 id=4116 data-nosnippet>4116</a>                    <span class="string">"1"</span>.to_string(),
+<a href=#4117 id=4117 data-nosnippet>4117</a>                )]),
+<a href=#4118 id=4118 data-nosnippet>4118</a>            })
+<a href=#4119 id=4119 data-nosnippet>4119</a>            .with_row_range(<span class="number">100</span>, <span class="number">50</span>) <span class="comment">// first_row_id=100, added_rows=50
+<a href=#4120 id=4120 data-nosnippet>4120</a>            </span>.build();
+<a href=#4121 id=4121 data-nosnippet>4121</a>
+<a href=#4122 id=4122 data-nosnippet>4122</a>        <span class="kw">let </span>v3_with_snapshot = v3_metadata
+<a href=#4123 id=4123 data-nosnippet>4123</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"s3://bucket/test/metadata/v00001.json"</span>.to_string()))
+<a href=#4124 id=4124 data-nosnippet>4124</a>            .add_snapshot(snapshot)
+<a href=#4125 id=4125 data-nosnippet>4125</a>            .unwrap()
+<a href=#4126 id=4126 data-nosnippet>4126</a>            .set_ref(<span class="string">"main"</span>, SnapshotReference {
+<a href=#4127 id=4127 data-nosnippet>4127</a>                snapshot_id: <span class="number">1</span>,
+<a href=#4128 id=4128 data-nosnippet>4128</a>                retention: SnapshotRetention::Branch {
+<a href=#4129 id=4129 data-nosnippet>4129</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
+<a href=#4130 id=4130 data-nosnippet>4130</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#4131 id=4131 data-nosnippet>4131</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#4132 id=4132 data-nosnippet>4132</a>                },
+<a href=#4133 id=4133 data-nosnippet>4133</a>            })
+<a href=#4134 id=4134 data-nosnippet>4134</a>            .unwrap()
+<a href=#4135 id=4135 data-nosnippet>4135</a>            .build()
+<a href=#4136 id=4136 data-nosnippet>4136</a>            .unwrap()
+<a href=#4137 id=4137 data-nosnippet>4137</a>            .metadata;
+<a href=#4138 id=4138 data-nosnippet>4138</a>
+<a href=#4139 id=4139 data-nosnippet>4139</a>        <span class="comment">// Verify the snapshot has row_range
+<a href=#4140 id=4140 data-nosnippet>4140</a>        </span><span class="kw">let </span>snapshot = v3_with_snapshot.snapshots.values().next().unwrap();
+<a href=#4141 id=4141 data-nosnippet>4141</a>        <span class="macro">assert!</span>(
+<a href=#4142 id=4142 data-nosnippet>4142</a>            snapshot.row_range().is_some(),
+<a href=#4143 id=4143 data-nosnippet>4143</a>            <span class="string">"Snapshot should have row_range"
+<a href=#4144 id=4144 data-nosnippet>4144</a>        </span>);
+<a href=#4145 id=4145 data-nosnippet>4145</a>        <span class="kw">let </span>(first_row_id, added_rows) = snapshot.row_range().unwrap();
+<a href=#4146 id=4146 data-nosnippet>4146</a>        <span class="macro">assert_eq!</span>(first_row_id, <span class="number">100</span>);
+<a href=#4147 id=4147 data-nosnippet>4147</a>        <span class="macro">assert_eq!</span>(added_rows, <span class="number">50</span>);
+<a href=#4148 id=4148 data-nosnippet>4148</a>
+<a href=#4149 id=4149 data-nosnippet>4149</a>        <span class="comment">// Serialize v3 metadata - this should work
+<a href=#4150 id=4150 data-nosnippet>4150</a>        </span><span class="kw">let </span>v3_json = serde_json::to_string(<span class="kw-2">&amp;</span>v3_with_snapshot);
+<a href=#4151 id=4151 data-nosnippet>4151</a>        <span class="macro">assert!</span>(
+<a href=#4152 id=4152 data-nosnippet>4152</a>            v3_json.is_ok(),
+<a href=#4153 id=4153 data-nosnippet>4153</a>            <span class="string">"v3 serialization should work for snapshots with row lineage"
+<a href=#4154 id=4154 data-nosnippet>4154</a>        </span>);
+<a href=#4155 id=4155 data-nosnippet>4155</a>
+<a href=#4156 id=4156 data-nosnippet>4156</a>        <span class="comment">// Verify we can deserialize it back
+<a href=#4157 id=4157 data-nosnippet>4157</a>        </span><span class="kw">let </span>deserialized: TableMetadata = serde_json::from_str(<span class="kw-2">&amp;</span>v3_json.unwrap()).unwrap();
+<a href=#4158 id=4158 data-nosnippet>4158</a>        <span class="macro">assert_eq!</span>(deserialized.format_version, FormatVersion::V3);
+<a href=#4159 id=4159 data-nosnippet>4159</a>        <span class="macro">assert_eq!</span>(deserialized.snapshots.len(), <span class="number">1</span>);
+<a href=#4160 id=4160 data-nosnippet>4160</a>
+<a href=#4161 id=4161 data-nosnippet>4161</a>        <span class="comment">// Verify the deserialized snapshot has the correct row_range
+<a href=#4162 id=4162 data-nosnippet>4162</a>        </span><span class="kw">let </span>deserialized_snapshot = deserialized.snapshots.values().next().unwrap();
+<a href=#4163 id=4163 data-nosnippet>4163</a>        <span class="macro">assert!</span>(
+<a href=#4164 id=4164 data-nosnippet>4164</a>            deserialized_snapshot.row_range().is_some(),
+<a href=#4165 id=4165 data-nosnippet>4165</a>            <span class="string">"Deserialized snapshot should have row_range"
+<a href=#4166 id=4166 data-nosnippet>4166</a>        </span>);
+<a href=#4167 id=4167 data-nosnippet>4167</a>        <span class="kw">let </span>(deserialized_first_row_id, deserialized_added_rows) =
+<a href=#4168 id=4168 data-nosnippet>4168</a>            deserialized_snapshot.row_range().unwrap();
+<a href=#4169 id=4169 data-nosnippet>4169</a>        <span class="macro">assert_eq!</span>(deserialized_first_row_id, <span class="number">100</span>);
+<a href=#4170 id=4170 data-nosnippet>4170</a>        <span class="macro">assert_eq!</span>(deserialized_added_rows, <span class="number">50</span>);
+<a href=#4171 id=4171 data-nosnippet>4171</a>    }
+<a href=#4172 id=4172 data-nosnippet>4172</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file
diff --git a/api/src/iceberg/spec/table_metadata_builder.rs.html b/api/src/iceberg/spec/table_metadata_builder.rs.html
index 2f0e10954..83826cb87 100644
--- a/api/src/iceberg/spec/table_metadata_builder.rs.html
+++ b/api/src/iceberg/spec/table_metadata_builder.rs.html
@@ -233,3276 +233,3278 @@
 <a href=#233 id=233 data-nosnippet>233</a>                }
 <a href=#234 id=234 data-nosnippet>234</a>                FormatVersion::V3 =&gt; {
 <a href=#235 id=235 data-nosnippet>235</a>                    <span class="self">self</span>.metadata.format_version = format_version;
-<a href=#236 id=236 data-nosnippet>236</a>                    <span class="self">self</span>.changes
-<a href=#237 id=237 data-nosnippet>237</a>                        .push(TableUpdate::UpgradeFormatVersion { format_version });
-<a href=#238 id=238 data-nosnippet>238</a>                }
-<a href=#239 id=239 data-nosnippet>239</a>            }
-<a href=#240 id=240 data-nosnippet>240</a>        }
-<a href=#241 id=241 data-nosnippet>241</a>
-<a href=#242 id=242 data-nosnippet>242</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#243 id=243 data-nosnippet>243</a>    }
-<a href=#244 id=244 data-nosnippet>244</a>
-<a href=#245 id=245 data-nosnippet>245</a>    <span class="doccomment">/// Set properties. If a property already exists, it will be overwritten.
-<a href=#246 id=246 data-nosnippet>246</a>    ///
-<a href=#247 id=247 data-nosnippet>247</a>    /// If a reserved property is set, the corresponding action is performed and the property is not persisted.
-<a href=#248 id=248 data-nosnippet>248</a>    /// Currently the following reserved properties are supported:
-<a href=#249 id=249 data-nosnippet>249</a>    /// * format-version: Set the format version of the table.
-<a href=#250 id=250 data-nosnippet>250</a>    ///
-<a href=#251 id=251 data-nosnippet>251</a>    /// # Errors
-<a href=#252 id=252 data-nosnippet>252</a>    /// - If properties contains a reserved property
-<a href=#253 id=253 data-nosnippet>253</a>    </span><span class="kw">pub fn </span>set_properties(<span class="kw-2">mut </span><span class="self">self</span>, properties: HashMap&lt;String, String&gt;) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#254 id=254 data-nosnippet>254</a>        <span class="comment">// List of specified properties that are RESERVED and should not be persisted.
-<a href=#255 id=255 data-nosnippet>255</a>        </span><span class="kw">let </span>reserved_properties = properties
-<a href=#256 id=256 data-nosnippet>256</a>            .keys()
-<a href=#257 id=257 data-nosnippet>257</a>            .filter(|key| TableProperties::RESERVED_PROPERTIES.contains(<span class="kw-2">&amp;</span>key.as_str()))
-<a href=#258 id=258 data-nosnippet>258</a>            .map(ToString::to_string)
-<a href=#259 id=259 data-nosnippet>259</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
-<a href=#260 id=260 data-nosnippet>260</a>
-<a href=#261 id=261 data-nosnippet>261</a>        <span class="kw">if </span>!reserved_properties.is_empty() {
-<a href=#262 id=262 data-nosnippet>262</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#263 id=263 data-nosnippet>263</a>                ErrorKind::DataInvalid,
-<a href=#264 id=264 data-nosnippet>264</a>                <span class="macro">format!</span>(
-<a href=#265 id=265 data-nosnippet>265</a>                    <span class="string">"Table properties should not contain reserved properties, but got: [{}]"</span>,
-<a href=#266 id=266 data-nosnippet>266</a>                    reserved_properties.join(<span class="string">", "</span>)
-<a href=#267 id=267 data-nosnippet>267</a>                ),
-<a href=#268 id=268 data-nosnippet>268</a>            ));
-<a href=#269 id=269 data-nosnippet>269</a>        }
-<a href=#270 id=270 data-nosnippet>270</a>
-<a href=#271 id=271 data-nosnippet>271</a>        <span class="kw">if </span>properties.is_empty() {
-<a href=#272 id=272 data-nosnippet>272</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#273 id=273 data-nosnippet>273</a>        }
-<a href=#274 id=274 data-nosnippet>274</a>
-<a href=#275 id=275 data-nosnippet>275</a>        <span class="self">self</span>.metadata.properties.extend(properties.clone());
-<a href=#276 id=276 data-nosnippet>276</a>        <span class="self">self</span>.changes.push(TableUpdate::SetProperties {
-<a href=#277 id=277 data-nosnippet>277</a>            updates: properties,
-<a href=#278 id=278 data-nosnippet>278</a>        });
-<a href=#279 id=279 data-nosnippet>279</a>
-<a href=#280 id=280 data-nosnippet>280</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#281 id=281 data-nosnippet>281</a>    }
-<a href=#282 id=282 data-nosnippet>282</a>
-<a href=#283 id=283 data-nosnippet>283</a>    <span class="doccomment">/// Remove properties from the table metadata.
-<a href=#284 id=284 data-nosnippet>284</a>    /// Does nothing if the key is not present.
-<a href=#285 id=285 data-nosnippet>285</a>    ///
-<a href=#286 id=286 data-nosnippet>286</a>    /// # Errors
-<a href=#287 id=287 data-nosnippet>287</a>    /// - If properties to remove contains a reserved property
-<a href=#288 id=288 data-nosnippet>288</a>    </span><span class="kw">pub fn </span>remove_properties(<span class="kw-2">mut </span><span class="self">self</span>, properties: <span class="kw-2">&amp;</span>[String]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#289 id=289 data-nosnippet>289</a>        <span class="comment">// remove duplicates
-<a href=#290 id=290 data-nosnippet>290</a>        </span><span class="kw">let </span>properties = properties.iter().cloned().collect::&lt;HashSet&lt;<span class="kw">_</span>&gt;&gt;();
-<a href=#291 id=291 data-nosnippet>291</a>
-<a href=#292 id=292 data-nosnippet>292</a>        <span class="comment">// disallow removal of reserved properties
-<a href=#293 id=293 data-nosnippet>293</a>        </span><span class="kw">let </span>reserved_properties = properties
-<a href=#294 id=294 data-nosnippet>294</a>            .iter()
-<a href=#295 id=295 data-nosnippet>295</a>            .filter(|key| TableProperties::RESERVED_PROPERTIES.contains(<span class="kw-2">&amp;</span>key.as_str()))
-<a href=#296 id=296 data-nosnippet>296</a>            .map(ToString::to_string)
-<a href=#297 id=297 data-nosnippet>297</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
-<a href=#298 id=298 data-nosnippet>298</a>
-<a href=#299 id=299 data-nosnippet>299</a>        <span class="kw">if </span>!reserved_properties.is_empty() {
-<a href=#300 id=300 data-nosnippet>300</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#301 id=301 data-nosnippet>301</a>                ErrorKind::DataInvalid,
-<a href=#302 id=302 data-nosnippet>302</a>                <span class="macro">format!</span>(
-<a href=#303 id=303 data-nosnippet>303</a>                    <span class="string">"Table properties to remove contain reserved properties: [{}]"</span>,
-<a href=#304 id=304 data-nosnippet>304</a>                    reserved_properties.join(<span class="string">", "</span>)
-<a href=#305 id=305 data-nosnippet>305</a>                ),
-<a href=#306 id=306 data-nosnippet>306</a>            ));
-<a href=#307 id=307 data-nosnippet>307</a>        }
-<a href=#308 id=308 data-nosnippet>308</a>
-<a href=#309 id=309 data-nosnippet>309</a>        <span class="kw">for </span>property <span class="kw">in </span><span class="kw-2">&amp;</span>properties {
-<a href=#310 id=310 data-nosnippet>310</a>            <span class="self">self</span>.metadata.properties.remove(property);
-<a href=#311 id=311 data-nosnippet>311</a>        }
-<a href=#312 id=312 data-nosnippet>312</a>
-<a href=#313 id=313 data-nosnippet>313</a>        <span class="kw">if </span>!properties.is_empty() {
-<a href=#314 id=314 data-nosnippet>314</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveProperties {
-<a href=#315 id=315 data-nosnippet>315</a>                removals: properties.into_iter().collect(),
-<a href=#316 id=316 data-nosnippet>316</a>            });
-<a href=#317 id=317 data-nosnippet>317</a>        }
-<a href=#318 id=318 data-nosnippet>318</a>
-<a href=#319 id=319 data-nosnippet>319</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#320 id=320 data-nosnippet>320</a>    }
-<a href=#321 id=321 data-nosnippet>321</a>
-<a href=#322 id=322 data-nosnippet>322</a>    <span class="doccomment">/// Set the location of the table, stripping any trailing slashes.
-<a href=#323 id=323 data-nosnippet>323</a>    </span><span class="kw">pub fn </span>set_location(<span class="kw-2">mut </span><span class="self">self</span>, location: String) -&gt; <span class="self">Self </span>{
-<a href=#324 id=324 data-nosnippet>324</a>        <span class="kw">let </span>location = location.trim_end_matches(<span class="string">'/'</span>).to_string();
-<a href=#325 id=325 data-nosnippet>325</a>        <span class="kw">if </span><span class="self">self</span>.metadata.location != location {
-<a href=#326 id=326 data-nosnippet>326</a>            <span class="self">self</span>.changes.push(TableUpdate::SetLocation {
-<a href=#327 id=327 data-nosnippet>327</a>                location: location.clone(),
-<a href=#328 id=328 data-nosnippet>328</a>            });
-<a href=#329 id=329 data-nosnippet>329</a>            <span class="self">self</span>.metadata.location = location;
-<a href=#330 id=330 data-nosnippet>330</a>        }
-<a href=#331 id=331 data-nosnippet>331</a>
-<a href=#332 id=332 data-nosnippet>332</a>        <span class="self">self
-<a href=#333 id=333 data-nosnippet>333</a>    </span>}
-<a href=#334 id=334 data-nosnippet>334</a>
-<a href=#335 id=335 data-nosnippet>335</a>    <span class="doccomment">/// Add a snapshot to the table metadata.
-<a href=#336 id=336 data-nosnippet>336</a>    ///
-<a href=#337 id=337 data-nosnippet>337</a>    /// # Errors
-<a href=#338 id=338 data-nosnippet>338</a>    /// - Snapshot id already exists.
-<a href=#339 id=339 data-nosnippet>339</a>    /// - For format version &gt; 1: the sequence number of the snapshot is lower than the highest sequence number specified so far.
-<a href=#340 id=340 data-nosnippet>340</a>    /// - For format version &gt;= 3: the first-row-id of the snapshot is lower than the next-row-id of the table.
-<a href=#341 id=341 data-nosnippet>341</a>    /// - For format version &gt;= 3: added-rows is null or first-row-id is null.
-<a href=#342 id=342 data-nosnippet>342</a>    /// - For format version &gt;= 3: next-row-id would overflow when adding added-rows.
-<a href=#343 id=343 data-nosnippet>343</a>    </span><span class="kw">pub fn </span>add_snapshot(<span class="kw-2">mut </span><span class="self">self</span>, snapshot: Snapshot) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#344 id=344 data-nosnippet>344</a>        <span class="kw">if </span><span class="self">self
-<a href=#345 id=345 data-nosnippet>345</a>            </span>.metadata
-<a href=#346 id=346 data-nosnippet>346</a>            .snapshots
-<a href=#347 id=347 data-nosnippet>347</a>            .contains_key(<span class="kw-2">&amp;</span>snapshot.snapshot_id())
-<a href=#348 id=348 data-nosnippet>348</a>        {
-<a href=#349 id=349 data-nosnippet>349</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#350 id=350 data-nosnippet>350</a>                ErrorKind::DataInvalid,
-<a href=#351 id=351 data-nosnippet>351</a>                <span class="macro">format!</span>(<span class="string">"Snapshot already exists for: '{}'"</span>, snapshot.snapshot_id()),
-<a href=#352 id=352 data-nosnippet>352</a>            ));
-<a href=#353 id=353 data-nosnippet>353</a>        }
-<a href=#354 id=354 data-nosnippet>354</a>
-<a href=#355 id=355 data-nosnippet>355</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version != FormatVersion::V1
-<a href=#356 id=356 data-nosnippet>356</a>            &amp;&amp; snapshot.sequence_number() &lt;= <span class="self">self</span>.metadata.last_sequence_number
-<a href=#357 id=357 data-nosnippet>357</a>            &amp;&amp; snapshot.parent_snapshot_id().is_some()
-<a href=#358 id=358 data-nosnippet>358</a>        {
-<a href=#359 id=359 data-nosnippet>359</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#360 id=360 data-nosnippet>360</a>                ErrorKind::DataInvalid,
-<a href=#361 id=361 data-nosnippet>361</a>                <span class="macro">format!</span>(
-<a href=#362 id=362 data-nosnippet>362</a>                    <span class="string">"Cannot add snapshot with sequence number {} older than last sequence number {}"</span>,
-<a href=#363 id=363 data-nosnippet>363</a>                    snapshot.sequence_number(),
-<a href=#364 id=364 data-nosnippet>364</a>                    <span class="self">self</span>.metadata.last_sequence_number
-<a href=#365 id=365 data-nosnippet>365</a>                ),
-<a href=#366 id=366 data-nosnippet>366</a>            ));
-<a href=#367 id=367 data-nosnippet>367</a>        }
-<a href=#368 id=368 data-nosnippet>368</a>
-<a href=#369 id=369 data-nosnippet>369</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(last) = <span class="self">self</span>.metadata.snapshot_log.last() {
-<a href=#370 id=370 data-nosnippet>370</a>            <span class="comment">// commits can happen concurrently from different machines.
-<a href=#371 id=371 data-nosnippet>371</a>            // A tolerance helps us avoid failure for small clock skew
-<a href=#372 id=372 data-nosnippet>372</a>            </span><span class="kw">if </span>snapshot.timestamp_ms() - last.timestamp_ms &lt; -ONE_MINUTE_MS {
-<a href=#373 id=373 data-nosnippet>373</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#374 id=374 data-nosnippet>374</a>                    ErrorKind::DataInvalid,
-<a href=#375 id=375 data-nosnippet>375</a>                    <span class="macro">format!</span>(
-<a href=#376 id=376 data-nosnippet>376</a>                        <span class="string">"Invalid snapshot timestamp {}: before last snapshot timestamp {}"</span>,
-<a href=#377 id=377 data-nosnippet>377</a>                        snapshot.timestamp_ms(),
-<a href=#378 id=378 data-nosnippet>378</a>                        last.timestamp_ms
-<a href=#379 id=379 data-nosnippet>379</a>                    ),
-<a href=#380 id=380 data-nosnippet>380</a>                ));
-<a href=#381 id=381 data-nosnippet>381</a>            }
-<a href=#382 id=382 data-nosnippet>382</a>        }
-<a href=#383 id=383 data-nosnippet>383</a>
-<a href=#384 id=384 data-nosnippet>384</a>        <span class="kw">let </span>max_last_updated = <span class="self">self
-<a href=#385 id=385 data-nosnippet>385</a>            </span>.last_updated_ms
-<a href=#386 id=386 data-nosnippet>386</a>            .unwrap_or_default()
-<a href=#387 id=387 data-nosnippet>387</a>            .max(<span class="self">self</span>.metadata.last_updated_ms);
-<a href=#388 id=388 data-nosnippet>388</a>        <span class="kw">if </span>snapshot.timestamp_ms() - max_last_updated &lt; -ONE_MINUTE_MS {
-<a href=#389 id=389 data-nosnippet>389</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#390 id=390 data-nosnippet>390</a>                ErrorKind::DataInvalid,
-<a href=#391 id=391 data-nosnippet>391</a>                <span class="macro">format!</span>(
-<a href=#392 id=392 data-nosnippet>392</a>                    <span class="string">"Invalid snapshot timestamp {}: before last updated timestamp {}"</span>,
-<a href=#393 id=393 data-nosnippet>393</a>                    snapshot.timestamp_ms(),
-<a href=#394 id=394 data-nosnippet>394</a>                    max_last_updated
-<a href=#395 id=395 data-nosnippet>395</a>                ),
-<a href=#396 id=396 data-nosnippet>396</a>            ));
-<a href=#397 id=397 data-nosnippet>397</a>        }
-<a href=#398 id=398 data-nosnippet>398</a>
-<a href=#399 id=399 data-nosnippet>399</a>        <span class="kw">let </span><span class="kw-2">mut </span>added_rows = <span class="prelude-val">None</span>;
-<a href=#400 id=400 data-nosnippet>400</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version &gt;= MIN_FORMAT_VERSION_ROW_LINEAGE {
-<a href=#401 id=401 data-nosnippet>401</a>            <span class="kw">if let </span><span class="prelude-val">Some</span>((first_row_id, added_rows_count)) = snapshot.row_range() {
-<a href=#402 id=402 data-nosnippet>402</a>                <span class="kw">if </span>first_row_id &lt; <span class="self">self</span>.metadata.next_row_id {
-<a href=#403 id=403 data-nosnippet>403</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#404 id=404 data-nosnippet>404</a>                        ErrorKind::DataInvalid,
-<a href=#405 id=405 data-nosnippet>405</a>                        <span class="macro">format!</span>(
-<a href=#406 id=406 data-nosnippet>406</a>                            <span class="string">"Cannot add a snapshot, first-row-id is behind table next-row-id: {first_row_id} &lt; {}"</span>,
-<a href=#407 id=407 data-nosnippet>407</a>                            <span class="self">self</span>.metadata.next_row_id
-<a href=#408 id=408 data-nosnippet>408</a>                        ),
-<a href=#409 id=409 data-nosnippet>409</a>                    ));
-<a href=#410 id=410 data-nosnippet>410</a>                }
-<a href=#411 id=411 data-nosnippet>411</a>
-<a href=#412 id=412 data-nosnippet>412</a>                added_rows = <span class="prelude-val">Some</span>(added_rows_count);
-<a href=#413 id=413 data-nosnippet>413</a>            } <span class="kw">else </span>{
-<a href=#414 id=414 data-nosnippet>414</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#415 id=415 data-nosnippet>415</a>                    ErrorKind::DataInvalid,
-<a href=#416 id=416 data-nosnippet>416</a>                    <span class="macro">format!</span>(
-<a href=#417 id=417 data-nosnippet>417</a>                        <span class="string">"Cannot add a snapshot: first-row-id is null. first-row-id must be set for format version &gt;= {MIN_FORMAT_VERSION_ROW_LINEAGE}"</span>,
-<a href=#418 id=418 data-nosnippet>418</a>                    ),
-<a href=#419 id=419 data-nosnippet>419</a>                ));
-<a href=#420 id=420 data-nosnippet>420</a>            }
-<a href=#421 id=421 data-nosnippet>421</a>        }
-<a href=#422 id=422 data-nosnippet>422</a>
-<a href=#423 id=423 data-nosnippet>423</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(added_rows) = added_rows {
-<a href=#424 id=424 data-nosnippet>424</a>            <span class="self">self</span>.metadata.next_row_id = <span class="self">self
-<a href=#425 id=425 data-nosnippet>425</a>                </span>.metadata
-<a href=#426 id=426 data-nosnippet>426</a>                .next_row_id
-<a href=#427 id=427 data-nosnippet>427</a>                .checked_add(added_rows)
-<a href=#428 id=428 data-nosnippet>428</a>                .ok_or_else(|| {
-<a href=#429 id=429 data-nosnippet>429</a>                    Error::new(
-<a href=#430 id=430 data-nosnippet>430</a>                        ErrorKind::DataInvalid,
-<a href=#431 id=431 data-nosnippet>431</a>                        <span class="string">"Cannot add snapshot: next-row-id overflowed when adding added-rows"</span>,
-<a href=#432 id=432 data-nosnippet>432</a>                    )
-<a href=#433 id=433 data-nosnippet>433</a>                })<span class="question-mark">?</span>;
-<a href=#434 id=434 data-nosnippet>434</a>        }
-<a href=#435 id=435 data-nosnippet>435</a>
-<a href=#436 id=436 data-nosnippet>436</a>        <span class="comment">// Mutation happens in next line - must be infallible from here
-<a href=#437 id=437 data-nosnippet>437</a>        </span><span class="self">self</span>.changes.push(TableUpdate::AddSnapshot {
-<a href=#438 id=438 data-nosnippet>438</a>            snapshot: snapshot.clone(),
-<a href=#439 id=439 data-nosnippet>439</a>        });
-<a href=#440 id=440 data-nosnippet>440</a>
-<a href=#441 id=441 data-nosnippet>441</a>        <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(snapshot.timestamp_ms());
-<a href=#442 id=442 data-nosnippet>442</a>        <span class="self">self</span>.metadata.last_sequence_number = snapshot.sequence_number();
-<a href=#443 id=443 data-nosnippet>443</a>        <span class="self">self</span>.metadata
-<a href=#444 id=444 data-nosnippet>444</a>            .snapshots
-<a href=#445 id=445 data-nosnippet>445</a>            .insert(snapshot.snapshot_id(), snapshot.into());
-<a href=#446 id=446 data-nosnippet>446</a>
-<a href=#447 id=447 data-nosnippet>447</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#448 id=448 data-nosnippet>448</a>    }
-<a href=#449 id=449 data-nosnippet>449</a>
-<a href=#450 id=450 data-nosnippet>450</a>    <span class="doccomment">/// Append a snapshot to the specified branch.
-<a href=#451 id=451 data-nosnippet>451</a>    /// Retention settings from the `branch` are re-used.
-<a href=#452 id=452 data-nosnippet>452</a>    ///
-<a href=#453 id=453 data-nosnippet>453</a>    /// # Errors
-<a href=#454 id=454 data-nosnippet>454</a>    /// - Any of the preconditions of `self.add_snapshot` are not met.
-<a href=#455 id=455 data-nosnippet>455</a>    </span><span class="kw">pub fn </span>set_branch_snapshot(<span class="self">self</span>, snapshot: Snapshot, branch: <span class="kw-2">&amp;</span>str) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#456 id=456 data-nosnippet>456</a>        <span class="kw">let </span>reference = <span class="self">self</span>.metadata.refs.get(branch).cloned();
-<a href=#457 id=457 data-nosnippet>457</a>
-<a href=#458 id=458 data-nosnippet>458</a>        <span class="kw">let </span>reference = <span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">mut </span>reference) = reference {
-<a href=#459 id=459 data-nosnippet>459</a>            <span class="kw">if </span>!reference.is_branch() {
-<a href=#460 id=460 data-nosnippet>460</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#461 id=461 data-nosnippet>461</a>                    ErrorKind::DataInvalid,
-<a href=#462 id=462 data-nosnippet>462</a>                    <span class="macro">format!</span>(<span class="string">"Cannot append snapshot to non-branch reference '{branch}'"</span>,),
-<a href=#463 id=463 data-nosnippet>463</a>                ));
-<a href=#464 id=464 data-nosnippet>464</a>            }
-<a href=#465 id=465 data-nosnippet>465</a>
-<a href=#466 id=466 data-nosnippet>466</a>            reference.snapshot_id = snapshot.snapshot_id();
-<a href=#467 id=467 data-nosnippet>467</a>            reference
-<a href=#468 id=468 data-nosnippet>468</a>        } <span class="kw">else </span>{
-<a href=#469 id=469 data-nosnippet>469</a>            SnapshotReference {
-<a href=#470 id=470 data-nosnippet>470</a>                snapshot_id: snapshot.snapshot_id(),
-<a href=#471 id=471 data-nosnippet>471</a>                retention: SnapshotRetention::Branch {
-<a href=#472 id=472 data-nosnippet>472</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
-<a href=#473 id=473 data-nosnippet>473</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#474 id=474 data-nosnippet>474</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#475 id=475 data-nosnippet>475</a>                },
-<a href=#476 id=476 data-nosnippet>476</a>            }
-<a href=#477 id=477 data-nosnippet>477</a>        };
-<a href=#478 id=478 data-nosnippet>478</a>
-<a href=#479 id=479 data-nosnippet>479</a>        <span class="self">self</span>.add_snapshot(snapshot)<span class="question-mark">?</span>.set_ref(branch, reference)
-<a href=#480 id=480 data-nosnippet>480</a>    }
-<a href=#481 id=481 data-nosnippet>481</a>
-<a href=#482 id=482 data-nosnippet>482</a>    <span class="doccomment">/// Remove snapshots by its ids from the table metadata.
-<a href=#483 id=483 data-nosnippet>483</a>    /// Does nothing if a snapshot id is not present.
-<a href=#484 id=484 data-nosnippet>484</a>    /// Keeps as changes only the snapshots that were actually removed.
-<a href=#485 id=485 data-nosnippet>485</a>    </span><span class="kw">pub fn </span>remove_snapshots(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_ids: <span class="kw-2">&amp;</span>[i64]) -&gt; <span class="self">Self </span>{
-<a href=#486 id=486 data-nosnippet>486</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_snapshots = Vec::with_capacity(snapshot_ids.len());
-<a href=#487 id=487 data-nosnippet>487</a>
-<a href=#488 id=488 data-nosnippet>488</a>        <span class="self">self</span>.metadata.snapshots.retain(|k, <span class="kw">_</span>| {
-<a href=#489 id=489 data-nosnippet>489</a>            <span class="kw">if </span>snapshot_ids.contains(k) {
-<a href=#490 id=490 data-nosnippet>490</a>                removed_snapshots.push(<span class="kw-2">*</span>k);
-<a href=#491 id=491 data-nosnippet>491</a>                <span class="bool-val">false
-<a href=#492 id=492 data-nosnippet>492</a>            </span>} <span class="kw">else </span>{
-<a href=#493 id=493 data-nosnippet>493</a>                <span class="bool-val">true
-<a href=#494 id=494 data-nosnippet>494</a>            </span>}
-<a href=#495 id=495 data-nosnippet>495</a>        });
-<a href=#496 id=496 data-nosnippet>496</a>
-<a href=#497 id=497 data-nosnippet>497</a>        <span class="kw">if </span>!removed_snapshots.is_empty() {
-<a href=#498 id=498 data-nosnippet>498</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveSnapshots {
-<a href=#499 id=499 data-nosnippet>499</a>                snapshot_ids: removed_snapshots,
-<a href=#500 id=500 data-nosnippet>500</a>            });
-<a href=#501 id=501 data-nosnippet>501</a>        }
-<a href=#502 id=502 data-nosnippet>502</a>
-<a href=#503 id=503 data-nosnippet>503</a>        <span class="comment">// Remove refs that are no longer valid
-<a href=#504 id=504 data-nosnippet>504</a>        </span><span class="self">self</span>.metadata
-<a href=#505 id=505 data-nosnippet>505</a>            .refs
-<a href=#506 id=506 data-nosnippet>506</a>            .retain(|<span class="kw">_</span>, v| <span class="self">self</span>.metadata.snapshots.contains_key(<span class="kw-2">&amp;</span>v.snapshot_id));
-<a href=#507 id=507 data-nosnippet>507</a>
-<a href=#508 id=508 data-nosnippet>508</a>        <span class="self">self
-<a href=#509 id=509 data-nosnippet>509</a>    </span>}
-<a href=#510 id=510 data-nosnippet>510</a>
-<a href=#511 id=511 data-nosnippet>511</a>    <span class="doccomment">/// Set a reference to a snapshot.
-<a href=#512 id=512 data-nosnippet>512</a>    ///
-<a href=#513 id=513 data-nosnippet>513</a>    /// # Errors
-<a href=#514 id=514 data-nosnippet>514</a>    /// - The snapshot id is unknown.
-<a href=#515 id=515 data-nosnippet>515</a>    </span><span class="kw">pub fn </span>set_ref(<span class="kw-2">mut </span><span class="self">self</span>, ref_name: <span class="kw-2">&amp;</span>str, reference: SnapshotReference) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#516 id=516 data-nosnippet>516</a>        <span class="kw">if </span><span class="self">self
-<a href=#517 id=517 data-nosnippet>517</a>            </span>.metadata
-<a href=#518 id=518 data-nosnippet>518</a>            .refs
-<a href=#519 id=519 data-nosnippet>519</a>            .get(ref_name)
-<a href=#520 id=520 data-nosnippet>520</a>            .is_some_and(|snap_ref| snap_ref.eq(<span class="kw-2">&amp;</span>reference))
-<a href=#521 id=521 data-nosnippet>521</a>        {
-<a href=#522 id=522 data-nosnippet>522</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#523 id=523 data-nosnippet>523</a>        }
-<a href=#524 id=524 data-nosnippet>524</a>
-<a href=#525 id=525 data-nosnippet>525</a>        <span class="kw">let </span><span class="prelude-val">Some</span>(snapshot) = <span class="self">self</span>.metadata.snapshots.get(<span class="kw-2">&amp;</span>reference.snapshot_id) <span class="kw">else </span>{
-<a href=#526 id=526 data-nosnippet>526</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#527 id=527 data-nosnippet>527</a>                ErrorKind::DataInvalid,
-<a href=#528 id=528 data-nosnippet>528</a>                <span class="macro">format!</span>(
-<a href=#529 id=529 data-nosnippet>529</a>                    <span class="string">"Cannot set '{ref_name}' to unknown snapshot: '{}'"</span>,
-<a href=#530 id=530 data-nosnippet>530</a>                    reference.snapshot_id
-<a href=#531 id=531 data-nosnippet>531</a>                ),
-<a href=#532 id=532 data-nosnippet>532</a>            ));
-<a href=#533 id=533 data-nosnippet>533</a>        };
-<a href=#534 id=534 data-nosnippet>534</a>
-<a href=#535 id=535 data-nosnippet>535</a>        <span class="comment">// Update last_updated_ms to the exact timestamp of the snapshot if it was added in this commit
-<a href=#536 id=536 data-nosnippet>536</a>        </span><span class="kw">let </span>is_added_snapshot = <span class="self">self</span>.changes.iter().any(|update| {
-<a href=#537 id=537 data-nosnippet>537</a>            <span class="macro">matches!</span>(update, TableUpdate::AddSnapshot { snapshot: snap } <span class="kw">if </span>snap.snapshot_id() == snapshot.snapshot_id())
-<a href=#538 id=538 data-nosnippet>538</a>        });
-<a href=#539 id=539 data-nosnippet>539</a>        <span class="kw">if </span>is_added_snapshot {
-<a href=#540 id=540 data-nosnippet>540</a>            <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(snapshot.timestamp_ms());
-<a href=#541 id=541 data-nosnippet>541</a>        }
-<a href=#542 id=542 data-nosnippet>542</a>
-<a href=#543 id=543 data-nosnippet>543</a>        <span class="comment">// Current snapshot id is set only for the main branch
-<a href=#544 id=544 data-nosnippet>544</a>        </span><span class="kw">if </span>ref_name == MAIN_BRANCH {
-<a href=#545 id=545 data-nosnippet>545</a>            <span class="self">self</span>.metadata.current_snapshot_id = <span class="prelude-val">Some</span>(snapshot.snapshot_id());
-<a href=#546 id=546 data-nosnippet>546</a>            <span class="kw">let </span>timestamp_ms = <span class="kw">if let </span><span class="prelude-val">Some</span>(last_updated_ms) = <span class="self">self</span>.last_updated_ms {
-<a href=#547 id=547 data-nosnippet>547</a>                last_updated_ms
-<a href=#548 id=548 data-nosnippet>548</a>            } <span class="kw">else </span>{
-<a href=#549 id=549 data-nosnippet>549</a>                <span class="kw">let </span>last_updated_ms = chrono::Utc::now().timestamp_millis();
-<a href=#550 id=550 data-nosnippet>550</a>                <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(last_updated_ms);
-<a href=#551 id=551 data-nosnippet>551</a>                last_updated_ms
-<a href=#552 id=552 data-nosnippet>552</a>            };
-<a href=#553 id=553 data-nosnippet>553</a>
-<a href=#554 id=554 data-nosnippet>554</a>            <span class="self">self</span>.metadata.snapshot_log.push(SnapshotLog {
-<a href=#555 id=555 data-nosnippet>555</a>                snapshot_id: snapshot.snapshot_id(),
-<a href=#556 id=556 data-nosnippet>556</a>                timestamp_ms,
-<a href=#557 id=557 data-nosnippet>557</a>            });
-<a href=#558 id=558 data-nosnippet>558</a>        }
-<a href=#559 id=559 data-nosnippet>559</a>
-<a href=#560 id=560 data-nosnippet>560</a>        <span class="self">self</span>.changes.push(TableUpdate::SetSnapshotRef {
-<a href=#561 id=561 data-nosnippet>561</a>            ref_name: ref_name.to_string(),
-<a href=#562 id=562 data-nosnippet>562</a>            reference: reference.clone(),
-<a href=#563 id=563 data-nosnippet>563</a>        });
-<a href=#564 id=564 data-nosnippet>564</a>        <span class="self">self</span>.metadata.refs.insert(ref_name.to_string(), reference);
-<a href=#565 id=565 data-nosnippet>565</a>
-<a href=#566 id=566 data-nosnippet>566</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#567 id=567 data-nosnippet>567</a>    }
-<a href=#568 id=568 data-nosnippet>568</a>
-<a href=#569 id=569 data-nosnippet>569</a>    <span class="doccomment">/// Remove a reference
-<a href=#570 id=570 data-nosnippet>570</a>    ///
-<a href=#571 id=571 data-nosnippet>571</a>    /// If `ref_name='main'` the current snapshot id is set to -1.
-<a href=#572 id=572 data-nosnippet>572</a>    </span><span class="kw">pub fn </span>remove_ref(<span class="kw-2">mut </span><span class="self">self</span>, ref_name: <span class="kw-2">&amp;</span>str) -&gt; <span class="self">Self </span>{
-<a href=#573 id=573 data-nosnippet>573</a>        <span class="kw">if </span>ref_name == MAIN_BRANCH {
-<a href=#574 id=574 data-nosnippet>574</a>            <span class="self">self</span>.metadata.current_snapshot_id = <span class="prelude-val">None</span>;
-<a href=#575 id=575 data-nosnippet>575</a>        }
-<a href=#576 id=576 data-nosnippet>576</a>
-<a href=#577 id=577 data-nosnippet>577</a>        <span class="kw">if </span><span class="self">self</span>.metadata.refs.remove(ref_name).is_some() || ref_name == MAIN_BRANCH {
-<a href=#578 id=578 data-nosnippet>578</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveSnapshotRef {
-<a href=#579 id=579 data-nosnippet>579</a>                ref_name: ref_name.to_string(),
-<a href=#580 id=580 data-nosnippet>580</a>            });
-<a href=#581 id=581 data-nosnippet>581</a>        }
-<a href=#582 id=582 data-nosnippet>582</a>
-<a href=#583 id=583 data-nosnippet>583</a>        <span class="self">self
-<a href=#584 id=584 data-nosnippet>584</a>    </span>}
-<a href=#585 id=585 data-nosnippet>585</a>
-<a href=#586 id=586 data-nosnippet>586</a>    <span class="doccomment">/// Set statistics for a snapshot
-<a href=#587 id=587 data-nosnippet>587</a>    </span><span class="kw">pub fn </span>set_statistics(<span class="kw-2">mut </span><span class="self">self</span>, statistics: StatisticsFile) -&gt; <span class="self">Self </span>{
-<a href=#588 id=588 data-nosnippet>588</a>        <span class="self">self</span>.metadata
-<a href=#589 id=589 data-nosnippet>589</a>            .statistics
-<a href=#590 id=590 data-nosnippet>590</a>            .insert(statistics.snapshot_id, statistics.clone());
-<a href=#591 id=591 data-nosnippet>591</a>        <span class="self">self</span>.changes.push(TableUpdate::SetStatistics {
-<a href=#592 id=592 data-nosnippet>592</a>            statistics: statistics.clone(),
-<a href=#593 id=593 data-nosnippet>593</a>        });
-<a href=#594 id=594 data-nosnippet>594</a>        <span class="self">self
-<a href=#595 id=595 data-nosnippet>595</a>    </span>}
-<a href=#596 id=596 data-nosnippet>596</a>
-<a href=#597 id=597 data-nosnippet>597</a>    <span class="doccomment">/// Remove statistics for a snapshot
-<a href=#598 id=598 data-nosnippet>598</a>    </span><span class="kw">pub fn </span>remove_statistics(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_id: i64) -&gt; <span class="self">Self </span>{
-<a href=#599 id=599 data-nosnippet>599</a>        <span class="kw">let </span>previous = <span class="self">self</span>.metadata.statistics.remove(<span class="kw-2">&amp;</span>snapshot_id);
-<a href=#600 id=600 data-nosnippet>600</a>        <span class="kw">if </span>previous.is_some() {
-<a href=#601 id=601 data-nosnippet>601</a>            <span class="self">self</span>.changes
-<a href=#602 id=602 data-nosnippet>602</a>                .push(TableUpdate::RemoveStatistics { snapshot_id });
-<a href=#603 id=603 data-nosnippet>603</a>        }
-<a href=#604 id=604 data-nosnippet>604</a>        <span class="self">self
-<a href=#605 id=605 data-nosnippet>605</a>    </span>}
-<a href=#606 id=606 data-nosnippet>606</a>
-<a href=#607 id=607 data-nosnippet>607</a>    <span class="doccomment">/// Set partition statistics
-<a href=#608 id=608 data-nosnippet>608</a>    </span><span class="kw">pub fn </span>set_partition_statistics(
-<a href=#609 id=609 data-nosnippet>609</a>        <span class="kw-2">mut </span><span class="self">self</span>,
-<a href=#610 id=610 data-nosnippet>610</a>        partition_statistics_file: PartitionStatisticsFile,
-<a href=#611 id=611 data-nosnippet>611</a>    ) -&gt; <span class="self">Self </span>{
-<a href=#612 id=612 data-nosnippet>612</a>        <span class="self">self</span>.metadata.partition_statistics.insert(
-<a href=#613 id=613 data-nosnippet>613</a>            partition_statistics_file.snapshot_id,
-<a href=#614 id=614 data-nosnippet>614</a>            partition_statistics_file.clone(),
-<a href=#615 id=615 data-nosnippet>615</a>        );
-<a href=#616 id=616 data-nosnippet>616</a>        <span class="self">self</span>.changes.push(TableUpdate::SetPartitionStatistics {
-<a href=#617 id=617 data-nosnippet>617</a>            partition_statistics: partition_statistics_file,
-<a href=#618 id=618 data-nosnippet>618</a>        });
-<a href=#619 id=619 data-nosnippet>619</a>        <span class="self">self
-<a href=#620 id=620 data-nosnippet>620</a>    </span>}
-<a href=#621 id=621 data-nosnippet>621</a>
-<a href=#622 id=622 data-nosnippet>622</a>    <span class="doccomment">/// Remove partition statistics
-<a href=#623 id=623 data-nosnippet>623</a>    </span><span class="kw">pub fn </span>remove_partition_statistics(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_id: i64) -&gt; <span class="self">Self </span>{
-<a href=#624 id=624 data-nosnippet>624</a>        <span class="kw">let </span>previous = <span class="self">self</span>.metadata.partition_statistics.remove(<span class="kw-2">&amp;</span>snapshot_id);
-<a href=#625 id=625 data-nosnippet>625</a>        <span class="kw">if </span>previous.is_some() {
-<a href=#626 id=626 data-nosnippet>626</a>            <span class="self">self</span>.changes
-<a href=#627 id=627 data-nosnippet>627</a>                .push(TableUpdate::RemovePartitionStatistics { snapshot_id });
-<a href=#628 id=628 data-nosnippet>628</a>        }
-<a href=#629 id=629 data-nosnippet>629</a>        <span class="self">self
-<a href=#630 id=630 data-nosnippet>630</a>    </span>}
-<a href=#631 id=631 data-nosnippet>631</a>
-<a href=#632 id=632 data-nosnippet>632</a>    <span class="doccomment">/// Add a schema to the table metadata.
-<a href=#633 id=633 data-nosnippet>633</a>    ///
-<a href=#634 id=634 data-nosnippet>634</a>    /// The provided `schema.schema_id` may not be used.
+<a href=#236 id=236 data-nosnippet>236</a>                    <span class="comment">// Set next-row-id to 0 when upgrading to v3 as per Iceberg spec
+<a href=#237 id=237 data-nosnippet>237</a>                    </span><span class="self">self</span>.metadata.next_row_id = INITIAL_ROW_ID;
+<a href=#238 id=238 data-nosnippet>238</a>                    <span class="self">self</span>.changes
+<a href=#239 id=239 data-nosnippet>239</a>                        .push(TableUpdate::UpgradeFormatVersion { format_version });
+<a href=#240 id=240 data-nosnippet>240</a>                }
+<a href=#241 id=241 data-nosnippet>241</a>            }
+<a href=#242 id=242 data-nosnippet>242</a>        }
+<a href=#243 id=243 data-nosnippet>243</a>
+<a href=#244 id=244 data-nosnippet>244</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#245 id=245 data-nosnippet>245</a>    }
+<a href=#246 id=246 data-nosnippet>246</a>
+<a href=#247 id=247 data-nosnippet>247</a>    <span class="doccomment">/// Set properties. If a property already exists, it will be overwritten.
+<a href=#248 id=248 data-nosnippet>248</a>    ///
+<a href=#249 id=249 data-nosnippet>249</a>    /// If a reserved property is set, the corresponding action is performed and the property is not persisted.
+<a href=#250 id=250 data-nosnippet>250</a>    /// Currently the following reserved properties are supported:
+<a href=#251 id=251 data-nosnippet>251</a>    /// * format-version: Set the format version of the table.
+<a href=#252 id=252 data-nosnippet>252</a>    ///
+<a href=#253 id=253 data-nosnippet>253</a>    /// # Errors
+<a href=#254 id=254 data-nosnippet>254</a>    /// - If properties contains a reserved property
+<a href=#255 id=255 data-nosnippet>255</a>    </span><span class="kw">pub fn </span>set_properties(<span class="kw-2">mut </span><span class="self">self</span>, properties: HashMap&lt;String, String&gt;) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#256 id=256 data-nosnippet>256</a>        <span class="comment">// List of specified properties that are RESERVED and should not be persisted.
+<a href=#257 id=257 data-nosnippet>257</a>        </span><span class="kw">let </span>reserved_properties = properties
+<a href=#258 id=258 data-nosnippet>258</a>            .keys()
+<a href=#259 id=259 data-nosnippet>259</a>            .filter(|key| TableProperties::RESERVED_PROPERTIES.contains(<span class="kw-2">&amp;</span>key.as_str()))
+<a href=#260 id=260 data-nosnippet>260</a>            .map(ToString::to_string)
+<a href=#261 id=261 data-nosnippet>261</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
+<a href=#262 id=262 data-nosnippet>262</a>
+<a href=#263 id=263 data-nosnippet>263</a>        <span class="kw">if </span>!reserved_properties.is_empty() {
+<a href=#264 id=264 data-nosnippet>264</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#265 id=265 data-nosnippet>265</a>                ErrorKind::DataInvalid,
+<a href=#266 id=266 data-nosnippet>266</a>                <span class="macro">format!</span>(
+<a href=#267 id=267 data-nosnippet>267</a>                    <span class="string">"Table properties should not contain reserved properties, but got: [{}]"</span>,
+<a href=#268 id=268 data-nosnippet>268</a>                    reserved_properties.join(<span class="string">", "</span>)
+<a href=#269 id=269 data-nosnippet>269</a>                ),
+<a href=#270 id=270 data-nosnippet>270</a>            ));
+<a href=#271 id=271 data-nosnippet>271</a>        }
+<a href=#272 id=272 data-nosnippet>272</a>
+<a href=#273 id=273 data-nosnippet>273</a>        <span class="kw">if </span>properties.is_empty() {
+<a href=#274 id=274 data-nosnippet>274</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#275 id=275 data-nosnippet>275</a>        }
+<a href=#276 id=276 data-nosnippet>276</a>
+<a href=#277 id=277 data-nosnippet>277</a>        <span class="self">self</span>.metadata.properties.extend(properties.clone());
+<a href=#278 id=278 data-nosnippet>278</a>        <span class="self">self</span>.changes.push(TableUpdate::SetProperties {
+<a href=#279 id=279 data-nosnippet>279</a>            updates: properties,
+<a href=#280 id=280 data-nosnippet>280</a>        });
+<a href=#281 id=281 data-nosnippet>281</a>
+<a href=#282 id=282 data-nosnippet>282</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#283 id=283 data-nosnippet>283</a>    }
+<a href=#284 id=284 data-nosnippet>284</a>
+<a href=#285 id=285 data-nosnippet>285</a>    <span class="doccomment">/// Remove properties from the table metadata.
+<a href=#286 id=286 data-nosnippet>286</a>    /// Does nothing if the key is not present.
+<a href=#287 id=287 data-nosnippet>287</a>    ///
+<a href=#288 id=288 data-nosnippet>288</a>    /// # Errors
+<a href=#289 id=289 data-nosnippet>289</a>    /// - If properties to remove contains a reserved property
+<a href=#290 id=290 data-nosnippet>290</a>    </span><span class="kw">pub fn </span>remove_properties(<span class="kw-2">mut </span><span class="self">self</span>, properties: <span class="kw-2">&amp;</span>[String]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#291 id=291 data-nosnippet>291</a>        <span class="comment">// remove duplicates
+<a href=#292 id=292 data-nosnippet>292</a>        </span><span class="kw">let </span>properties = properties.iter().cloned().collect::&lt;HashSet&lt;<span class="kw">_</span>&gt;&gt;();
+<a href=#293 id=293 data-nosnippet>293</a>
+<a href=#294 id=294 data-nosnippet>294</a>        <span class="comment">// disallow removal of reserved properties
+<a href=#295 id=295 data-nosnippet>295</a>        </span><span class="kw">let </span>reserved_properties = properties
+<a href=#296 id=296 data-nosnippet>296</a>            .iter()
+<a href=#297 id=297 data-nosnippet>297</a>            .filter(|key| TableProperties::RESERVED_PROPERTIES.contains(<span class="kw-2">&amp;</span>key.as_str()))
+<a href=#298 id=298 data-nosnippet>298</a>            .map(ToString::to_string)
+<a href=#299 id=299 data-nosnippet>299</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
+<a href=#300 id=300 data-nosnippet>300</a>
+<a href=#301 id=301 data-nosnippet>301</a>        <span class="kw">if </span>!reserved_properties.is_empty() {
+<a href=#302 id=302 data-nosnippet>302</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#303 id=303 data-nosnippet>303</a>                ErrorKind::DataInvalid,
+<a href=#304 id=304 data-nosnippet>304</a>                <span class="macro">format!</span>(
+<a href=#305 id=305 data-nosnippet>305</a>                    <span class="string">"Table properties to remove contain reserved properties: [{}]"</span>,
+<a href=#306 id=306 data-nosnippet>306</a>                    reserved_properties.join(<span class="string">", "</span>)
+<a href=#307 id=307 data-nosnippet>307</a>                ),
+<a href=#308 id=308 data-nosnippet>308</a>            ));
+<a href=#309 id=309 data-nosnippet>309</a>        }
+<a href=#310 id=310 data-nosnippet>310</a>
+<a href=#311 id=311 data-nosnippet>311</a>        <span class="kw">for </span>property <span class="kw">in </span><span class="kw-2">&amp;</span>properties {
+<a href=#312 id=312 data-nosnippet>312</a>            <span class="self">self</span>.metadata.properties.remove(property);
+<a href=#313 id=313 data-nosnippet>313</a>        }
+<a href=#314 id=314 data-nosnippet>314</a>
+<a href=#315 id=315 data-nosnippet>315</a>        <span class="kw">if </span>!properties.is_empty() {
+<a href=#316 id=316 data-nosnippet>316</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveProperties {
+<a href=#317 id=317 data-nosnippet>317</a>                removals: properties.into_iter().collect(),
+<a href=#318 id=318 data-nosnippet>318</a>            });
+<a href=#319 id=319 data-nosnippet>319</a>        }
+<a href=#320 id=320 data-nosnippet>320</a>
+<a href=#321 id=321 data-nosnippet>321</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#322 id=322 data-nosnippet>322</a>    }
+<a href=#323 id=323 data-nosnippet>323</a>
+<a href=#324 id=324 data-nosnippet>324</a>    <span class="doccomment">/// Set the location of the table, stripping any trailing slashes.
+<a href=#325 id=325 data-nosnippet>325</a>    </span><span class="kw">pub fn </span>set_location(<span class="kw-2">mut </span><span class="self">self</span>, location: String) -&gt; <span class="self">Self </span>{
+<a href=#326 id=326 data-nosnippet>326</a>        <span class="kw">let </span>location = location.trim_end_matches(<span class="string">'/'</span>).to_string();
+<a href=#327 id=327 data-nosnippet>327</a>        <span class="kw">if </span><span class="self">self</span>.metadata.location != location {
+<a href=#328 id=328 data-nosnippet>328</a>            <span class="self">self</span>.changes.push(TableUpdate::SetLocation {
+<a href=#329 id=329 data-nosnippet>329</a>                location: location.clone(),
+<a href=#330 id=330 data-nosnippet>330</a>            });
+<a href=#331 id=331 data-nosnippet>331</a>            <span class="self">self</span>.metadata.location = location;
+<a href=#332 id=332 data-nosnippet>332</a>        }
+<a href=#333 id=333 data-nosnippet>333</a>
+<a href=#334 id=334 data-nosnippet>334</a>        <span class="self">self
+<a href=#335 id=335 data-nosnippet>335</a>    </span>}
+<a href=#336 id=336 data-nosnippet>336</a>
+<a href=#337 id=337 data-nosnippet>337</a>    <span class="doccomment">/// Add a snapshot to the table metadata.
+<a href=#338 id=338 data-nosnippet>338</a>    ///
+<a href=#339 id=339 data-nosnippet>339</a>    /// # Errors
+<a href=#340 id=340 data-nosnippet>340</a>    /// - Snapshot id already exists.
+<a href=#341 id=341 data-nosnippet>341</a>    /// - For format version &gt; 1: the sequence number of the snapshot is lower than the highest sequence number specified so far.
+<a href=#342 id=342 data-nosnippet>342</a>    /// - For format version &gt;= 3: the first-row-id of the snapshot is lower than the next-row-id of the table.
+<a href=#343 id=343 data-nosnippet>343</a>    /// - For format version &gt;= 3: added-rows is null or first-row-id is null.
+<a href=#344 id=344 data-nosnippet>344</a>    /// - For format version &gt;= 3: next-row-id would overflow when adding added-rows.
+<a href=#345 id=345 data-nosnippet>345</a>    </span><span class="kw">pub fn </span>add_snapshot(<span class="kw-2">mut </span><span class="self">self</span>, snapshot: Snapshot) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#346 id=346 data-nosnippet>346</a>        <span class="kw">if </span><span class="self">self
+<a href=#347 id=347 data-nosnippet>347</a>            </span>.metadata
+<a href=#348 id=348 data-nosnippet>348</a>            .snapshots
+<a href=#349 id=349 data-nosnippet>349</a>            .contains_key(<span class="kw-2">&amp;</span>snapshot.snapshot_id())
+<a href=#350 id=350 data-nosnippet>350</a>        {
+<a href=#351 id=351 data-nosnippet>351</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#352 id=352 data-nosnippet>352</a>                ErrorKind::DataInvalid,
+<a href=#353 id=353 data-nosnippet>353</a>                <span class="macro">format!</span>(<span class="string">"Snapshot already exists for: '{}'"</span>, snapshot.snapshot_id()),
+<a href=#354 id=354 data-nosnippet>354</a>            ));
+<a href=#355 id=355 data-nosnippet>355</a>        }
+<a href=#356 id=356 data-nosnippet>356</a>
+<a href=#357 id=357 data-nosnippet>357</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version != FormatVersion::V1
+<a href=#358 id=358 data-nosnippet>358</a>            &amp;&amp; snapshot.sequence_number() &lt;= <span class="self">self</span>.metadata.last_sequence_number
+<a href=#359 id=359 data-nosnippet>359</a>            &amp;&amp; snapshot.parent_snapshot_id().is_some()
+<a href=#360 id=360 data-nosnippet>360</a>        {
+<a href=#361 id=361 data-nosnippet>361</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#362 id=362 data-nosnippet>362</a>                ErrorKind::DataInvalid,
+<a href=#363 id=363 data-nosnippet>363</a>                <span class="macro">format!</span>(
+<a href=#364 id=364 data-nosnippet>364</a>                    <span class="string">"Cannot add snapshot with sequence number {} older than last sequence number {}"</span>,
+<a href=#365 id=365 data-nosnippet>365</a>                    snapshot.sequence_number(),
+<a href=#366 id=366 data-nosnippet>366</a>                    <span class="self">self</span>.metadata.last_sequence_number
+<a href=#367 id=367 data-nosnippet>367</a>                ),
+<a href=#368 id=368 data-nosnippet>368</a>            ));
+<a href=#369 id=369 data-nosnippet>369</a>        }
+<a href=#370 id=370 data-nosnippet>370</a>
+<a href=#371 id=371 data-nosnippet>371</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(last) = <span class="self">self</span>.metadata.snapshot_log.last() {
+<a href=#372 id=372 data-nosnippet>372</a>            <span class="comment">// commits can happen concurrently from different machines.
+<a href=#373 id=373 data-nosnippet>373</a>            // A tolerance helps us avoid failure for small clock skew
+<a href=#374 id=374 data-nosnippet>374</a>            </span><span class="kw">if </span>snapshot.timestamp_ms() - last.timestamp_ms &lt; -ONE_MINUTE_MS {
+<a href=#375 id=375 data-nosnippet>375</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#376 id=376 data-nosnippet>376</a>                    ErrorKind::DataInvalid,
+<a href=#377 id=377 data-nosnippet>377</a>                    <span class="macro">format!</span>(
+<a href=#378 id=378 data-nosnippet>378</a>                        <span class="string">"Invalid snapshot timestamp {}: before last snapshot timestamp {}"</span>,
+<a href=#379 id=379 data-nosnippet>379</a>                        snapshot.timestamp_ms(),
+<a href=#380 id=380 data-nosnippet>380</a>                        last.timestamp_ms
+<a href=#381 id=381 data-nosnippet>381</a>                    ),
+<a href=#382 id=382 data-nosnippet>382</a>                ));
+<a href=#383 id=383 data-nosnippet>383</a>            }
+<a href=#384 id=384 data-nosnippet>384</a>        }
+<a href=#385 id=385 data-nosnippet>385</a>
+<a href=#386 id=386 data-nosnippet>386</a>        <span class="kw">let </span>max_last_updated = <span class="self">self
+<a href=#387 id=387 data-nosnippet>387</a>            </span>.last_updated_ms
+<a href=#388 id=388 data-nosnippet>388</a>            .unwrap_or_default()
+<a href=#389 id=389 data-nosnippet>389</a>            .max(<span class="self">self</span>.metadata.last_updated_ms);
+<a href=#390 id=390 data-nosnippet>390</a>        <span class="kw">if </span>snapshot.timestamp_ms() - max_last_updated &lt; -ONE_MINUTE_MS {
+<a href=#391 id=391 data-nosnippet>391</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#392 id=392 data-nosnippet>392</a>                ErrorKind::DataInvalid,
+<a href=#393 id=393 data-nosnippet>393</a>                <span class="macro">format!</span>(
+<a href=#394 id=394 data-nosnippet>394</a>                    <span class="string">"Invalid snapshot timestamp {}: before last updated timestamp {}"</span>,
+<a href=#395 id=395 data-nosnippet>395</a>                    snapshot.timestamp_ms(),
+<a href=#396 id=396 data-nosnippet>396</a>                    max_last_updated
+<a href=#397 id=397 data-nosnippet>397</a>                ),
+<a href=#398 id=398 data-nosnippet>398</a>            ));
+<a href=#399 id=399 data-nosnippet>399</a>        }
+<a href=#400 id=400 data-nosnippet>400</a>
+<a href=#401 id=401 data-nosnippet>401</a>        <span class="kw">let </span><span class="kw-2">mut </span>added_rows = <span class="prelude-val">None</span>;
+<a href=#402 id=402 data-nosnippet>402</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version &gt;= MIN_FORMAT_VERSION_ROW_LINEAGE {
+<a href=#403 id=403 data-nosnippet>403</a>            <span class="kw">if let </span><span class="prelude-val">Some</span>((first_row_id, added_rows_count)) = snapshot.row_range() {
+<a href=#404 id=404 data-nosnippet>404</a>                <span class="kw">if </span>first_row_id &lt; <span class="self">self</span>.metadata.next_row_id {
+<a href=#405 id=405 data-nosnippet>405</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#406 id=406 data-nosnippet>406</a>                        ErrorKind::DataInvalid,
+<a href=#407 id=407 data-nosnippet>407</a>                        <span class="macro">format!</span>(
+<a href=#408 id=408 data-nosnippet>408</a>                            <span class="string">"Cannot add a snapshot, first-row-id is behind table next-row-id: {first_row_id} &lt; {}"</span>,
+<a href=#409 id=409 data-nosnippet>409</a>                            <span class="self">self</span>.metadata.next_row_id
+<a href=#410 id=410 data-nosnippet>410</a>                        ),
+<a href=#411 id=411 data-nosnippet>411</a>                    ));
+<a href=#412 id=412 data-nosnippet>412</a>                }
+<a href=#413 id=413 data-nosnippet>413</a>
+<a href=#414 id=414 data-nosnippet>414</a>                added_rows = <span class="prelude-val">Some</span>(added_rows_count);
+<a href=#415 id=415 data-nosnippet>415</a>            } <span class="kw">else </span>{
+<a href=#416 id=416 data-nosnippet>416</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#417 id=417 data-nosnippet>417</a>                    ErrorKind::DataInvalid,
+<a href=#418 id=418 data-nosnippet>418</a>                    <span class="macro">format!</span>(
+<a href=#419 id=419 data-nosnippet>419</a>                        <span class="string">"Cannot add a snapshot: first-row-id is null. first-row-id must be set for format version &gt;= {MIN_FORMAT_VERSION_ROW_LINEAGE}"</span>,
+<a href=#420 id=420 data-nosnippet>420</a>                    ),
+<a href=#421 id=421 data-nosnippet>421</a>                ));
+<a href=#422 id=422 data-nosnippet>422</a>            }
+<a href=#423 id=423 data-nosnippet>423</a>        }
+<a href=#424 id=424 data-nosnippet>424</a>
+<a href=#425 id=425 data-nosnippet>425</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(added_rows) = added_rows {
+<a href=#426 id=426 data-nosnippet>426</a>            <span class="self">self</span>.metadata.next_row_id = <span class="self">self
+<a href=#427 id=427 data-nosnippet>427</a>                </span>.metadata
+<a href=#428 id=428 data-nosnippet>428</a>                .next_row_id
+<a href=#429 id=429 data-nosnippet>429</a>                .checked_add(added_rows)
+<a href=#430 id=430 data-nosnippet>430</a>                .ok_or_else(|| {
+<a href=#431 id=431 data-nosnippet>431</a>                    Error::new(
+<a href=#432 id=432 data-nosnippet>432</a>                        ErrorKind::DataInvalid,
+<a href=#433 id=433 data-nosnippet>433</a>                        <span class="string">"Cannot add snapshot: next-row-id overflowed when adding added-rows"</span>,
+<a href=#434 id=434 data-nosnippet>434</a>                    )
+<a href=#435 id=435 data-nosnippet>435</a>                })<span class="question-mark">?</span>;
+<a href=#436 id=436 data-nosnippet>436</a>        }
+<a href=#437 id=437 data-nosnippet>437</a>
+<a href=#438 id=438 data-nosnippet>438</a>        <span class="comment">// Mutation happens in next line - must be infallible from here
+<a href=#439 id=439 data-nosnippet>439</a>        </span><span class="self">self</span>.changes.push(TableUpdate::AddSnapshot {
+<a href=#440 id=440 data-nosnippet>440</a>            snapshot: snapshot.clone(),
+<a href=#441 id=441 data-nosnippet>441</a>        });
+<a href=#442 id=442 data-nosnippet>442</a>
+<a href=#443 id=443 data-nosnippet>443</a>        <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(snapshot.timestamp_ms());
+<a href=#444 id=444 data-nosnippet>444</a>        <span class="self">self</span>.metadata.last_sequence_number = snapshot.sequence_number();
+<a href=#445 id=445 data-nosnippet>445</a>        <span class="self">self</span>.metadata
+<a href=#446 id=446 data-nosnippet>446</a>            .snapshots
+<a href=#447 id=447 data-nosnippet>447</a>            .insert(snapshot.snapshot_id(), snapshot.into());
+<a href=#448 id=448 data-nosnippet>448</a>
+<a href=#449 id=449 data-nosnippet>449</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#450 id=450 data-nosnippet>450</a>    }
+<a href=#451 id=451 data-nosnippet>451</a>
+<a href=#452 id=452 data-nosnippet>452</a>    <span class="doccomment">/// Append a snapshot to the specified branch.
+<a href=#453 id=453 data-nosnippet>453</a>    /// Retention settings from the `branch` are re-used.
+<a href=#454 id=454 data-nosnippet>454</a>    ///
+<a href=#455 id=455 data-nosnippet>455</a>    /// # Errors
+<a href=#456 id=456 data-nosnippet>456</a>    /// - Any of the preconditions of `self.add_snapshot` are not met.
+<a href=#457 id=457 data-nosnippet>457</a>    </span><span class="kw">pub fn </span>set_branch_snapshot(<span class="self">self</span>, snapshot: Snapshot, branch: <span class="kw-2">&amp;</span>str) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#458 id=458 data-nosnippet>458</a>        <span class="kw">let </span>reference = <span class="self">self</span>.metadata.refs.get(branch).cloned();
+<a href=#459 id=459 data-nosnippet>459</a>
+<a href=#460 id=460 data-nosnippet>460</a>        <span class="kw">let </span>reference = <span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">mut </span>reference) = reference {
+<a href=#461 id=461 data-nosnippet>461</a>            <span class="kw">if </span>!reference.is_branch() {
+<a href=#462 id=462 data-nosnippet>462</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#463 id=463 data-nosnippet>463</a>                    ErrorKind::DataInvalid,
+<a href=#464 id=464 data-nosnippet>464</a>                    <span class="macro">format!</span>(<span class="string">"Cannot append snapshot to non-branch reference '{branch}'"</span>,),
+<a href=#465 id=465 data-nosnippet>465</a>                ));
+<a href=#466 id=466 data-nosnippet>466</a>            }
+<a href=#467 id=467 data-nosnippet>467</a>
+<a href=#468 id=468 data-nosnippet>468</a>            reference.snapshot_id = snapshot.snapshot_id();
+<a href=#469 id=469 data-nosnippet>469</a>            reference
+<a href=#470 id=470 data-nosnippet>470</a>        } <span class="kw">else </span>{
+<a href=#471 id=471 data-nosnippet>471</a>            SnapshotReference {
+<a href=#472 id=472 data-nosnippet>472</a>                snapshot_id: snapshot.snapshot_id(),
+<a href=#473 id=473 data-nosnippet>473</a>                retention: SnapshotRetention::Branch {
+<a href=#474 id=474 data-nosnippet>474</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
+<a href=#475 id=475 data-nosnippet>475</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#476 id=476 data-nosnippet>476</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#477 id=477 data-nosnippet>477</a>                },
+<a href=#478 id=478 data-nosnippet>478</a>            }
+<a href=#479 id=479 data-nosnippet>479</a>        };
+<a href=#480 id=480 data-nosnippet>480</a>
+<a href=#481 id=481 data-nosnippet>481</a>        <span class="self">self</span>.add_snapshot(snapshot)<span class="question-mark">?</span>.set_ref(branch, reference)
+<a href=#482 id=482 data-nosnippet>482</a>    }
+<a href=#483 id=483 data-nosnippet>483</a>
+<a href=#484 id=484 data-nosnippet>484</a>    <span class="doccomment">/// Remove snapshots by its ids from the table metadata.
+<a href=#485 id=485 data-nosnippet>485</a>    /// Does nothing if a snapshot id is not present.
+<a href=#486 id=486 data-nosnippet>486</a>    /// Keeps as changes only the snapshots that were actually removed.
+<a href=#487 id=487 data-nosnippet>487</a>    </span><span class="kw">pub fn </span>remove_snapshots(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_ids: <span class="kw-2">&amp;</span>[i64]) -&gt; <span class="self">Self </span>{
+<a href=#488 id=488 data-nosnippet>488</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_snapshots = Vec::with_capacity(snapshot_ids.len());
+<a href=#489 id=489 data-nosnippet>489</a>
+<a href=#490 id=490 data-nosnippet>490</a>        <span class="self">self</span>.metadata.snapshots.retain(|k, <span class="kw">_</span>| {
+<a href=#491 id=491 data-nosnippet>491</a>            <span class="kw">if </span>snapshot_ids.contains(k) {
+<a href=#492 id=492 data-nosnippet>492</a>                removed_snapshots.push(<span class="kw-2">*</span>k);
+<a href=#493 id=493 data-nosnippet>493</a>                <span class="bool-val">false
+<a href=#494 id=494 data-nosnippet>494</a>            </span>} <span class="kw">else </span>{
+<a href=#495 id=495 data-nosnippet>495</a>                <span class="bool-val">true
+<a href=#496 id=496 data-nosnippet>496</a>            </span>}
+<a href=#497 id=497 data-nosnippet>497</a>        });
+<a href=#498 id=498 data-nosnippet>498</a>
+<a href=#499 id=499 data-nosnippet>499</a>        <span class="kw">if </span>!removed_snapshots.is_empty() {
+<a href=#500 id=500 data-nosnippet>500</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveSnapshots {
+<a href=#501 id=501 data-nosnippet>501</a>                snapshot_ids: removed_snapshots,
+<a href=#502 id=502 data-nosnippet>502</a>            });
+<a href=#503 id=503 data-nosnippet>503</a>        }
+<a href=#504 id=504 data-nosnippet>504</a>
+<a href=#505 id=505 data-nosnippet>505</a>        <span class="comment">// Remove refs that are no longer valid
+<a href=#506 id=506 data-nosnippet>506</a>        </span><span class="self">self</span>.metadata
+<a href=#507 id=507 data-nosnippet>507</a>            .refs
+<a href=#508 id=508 data-nosnippet>508</a>            .retain(|<span class="kw">_</span>, v| <span class="self">self</span>.metadata.snapshots.contains_key(<span class="kw-2">&amp;</span>v.snapshot_id));
+<a href=#509 id=509 data-nosnippet>509</a>
+<a href=#510 id=510 data-nosnippet>510</a>        <span class="self">self
+<a href=#511 id=511 data-nosnippet>511</a>    </span>}
+<a href=#512 id=512 data-nosnippet>512</a>
+<a href=#513 id=513 data-nosnippet>513</a>    <span class="doccomment">/// Set a reference to a snapshot.
+<a href=#514 id=514 data-nosnippet>514</a>    ///
+<a href=#515 id=515 data-nosnippet>515</a>    /// # Errors
+<a href=#516 id=516 data-nosnippet>516</a>    /// - The snapshot id is unknown.
+<a href=#517 id=517 data-nosnippet>517</a>    </span><span class="kw">pub fn </span>set_ref(<span class="kw-2">mut </span><span class="self">self</span>, ref_name: <span class="kw-2">&amp;</span>str, reference: SnapshotReference) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#518 id=518 data-nosnippet>518</a>        <span class="kw">if </span><span class="self">self
+<a href=#519 id=519 data-nosnippet>519</a>            </span>.metadata
+<a href=#520 id=520 data-nosnippet>520</a>            .refs
+<a href=#521 id=521 data-nosnippet>521</a>            .get(ref_name)
+<a href=#522 id=522 data-nosnippet>522</a>            .is_some_and(|snap_ref| snap_ref.eq(<span class="kw-2">&amp;</span>reference))
+<a href=#523 id=523 data-nosnippet>523</a>        {
+<a href=#524 id=524 data-nosnippet>524</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#525 id=525 data-nosnippet>525</a>        }
+<a href=#526 id=526 data-nosnippet>526</a>
+<a href=#527 id=527 data-nosnippet>527</a>        <span class="kw">let </span><span class="prelude-val">Some</span>(snapshot) = <span class="self">self</span>.metadata.snapshots.get(<span class="kw-2">&amp;</span>reference.snapshot_id) <span class="kw">else </span>{
+<a href=#528 id=528 data-nosnippet>528</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#529 id=529 data-nosnippet>529</a>                ErrorKind::DataInvalid,
+<a href=#530 id=530 data-nosnippet>530</a>                <span class="macro">format!</span>(
+<a href=#531 id=531 data-nosnippet>531</a>                    <span class="string">"Cannot set '{ref_name}' to unknown snapshot: '{}'"</span>,
+<a href=#532 id=532 data-nosnippet>532</a>                    reference.snapshot_id
+<a href=#533 id=533 data-nosnippet>533</a>                ),
+<a href=#534 id=534 data-nosnippet>534</a>            ));
+<a href=#535 id=535 data-nosnippet>535</a>        };
+<a href=#536 id=536 data-nosnippet>536</a>
+<a href=#537 id=537 data-nosnippet>537</a>        <span class="comment">// Update last_updated_ms to the exact timestamp of the snapshot if it was added in this commit
+<a href=#538 id=538 data-nosnippet>538</a>        </span><span class="kw">let </span>is_added_snapshot = <span class="self">self</span>.changes.iter().any(|update| {
+<a href=#539 id=539 data-nosnippet>539</a>            <span class="macro">matches!</span>(update, TableUpdate::AddSnapshot { snapshot: snap } <span class="kw">if </span>snap.snapshot_id() == snapshot.snapshot_id())
+<a href=#540 id=540 data-nosnippet>540</a>        });
+<a href=#541 id=541 data-nosnippet>541</a>        <span class="kw">if </span>is_added_snapshot {
+<a href=#542 id=542 data-nosnippet>542</a>            <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(snapshot.timestamp_ms());
+<a href=#543 id=543 data-nosnippet>543</a>        }
+<a href=#544 id=544 data-nosnippet>544</a>
+<a href=#545 id=545 data-nosnippet>545</a>        <span class="comment">// Current snapshot id is set only for the main branch
+<a href=#546 id=546 data-nosnippet>546</a>        </span><span class="kw">if </span>ref_name == MAIN_BRANCH {
+<a href=#547 id=547 data-nosnippet>547</a>            <span class="self">self</span>.metadata.current_snapshot_id = <span class="prelude-val">Some</span>(snapshot.snapshot_id());
+<a href=#548 id=548 data-nosnippet>548</a>            <span class="kw">let </span>timestamp_ms = <span class="kw">if let </span><span class="prelude-val">Some</span>(last_updated_ms) = <span class="self">self</span>.last_updated_ms {
+<a href=#549 id=549 data-nosnippet>549</a>                last_updated_ms
+<a href=#550 id=550 data-nosnippet>550</a>            } <span class="kw">else </span>{
+<a href=#551 id=551 data-nosnippet>551</a>                <span class="kw">let </span>last_updated_ms = chrono::Utc::now().timestamp_millis();
+<a href=#552 id=552 data-nosnippet>552</a>                <span class="self">self</span>.last_updated_ms = <span class="prelude-val">Some</span>(last_updated_ms);
+<a href=#553 id=553 data-nosnippet>553</a>                last_updated_ms
+<a href=#554 id=554 data-nosnippet>554</a>            };
+<a href=#555 id=555 data-nosnippet>555</a>
+<a href=#556 id=556 data-nosnippet>556</a>            <span class="self">self</span>.metadata.snapshot_log.push(SnapshotLog {
+<a href=#557 id=557 data-nosnippet>557</a>                snapshot_id: snapshot.snapshot_id(),
+<a href=#558 id=558 data-nosnippet>558</a>                timestamp_ms,
+<a href=#559 id=559 data-nosnippet>559</a>            });
+<a href=#560 id=560 data-nosnippet>560</a>        }
+<a href=#561 id=561 data-nosnippet>561</a>
+<a href=#562 id=562 data-nosnippet>562</a>        <span class="self">self</span>.changes.push(TableUpdate::SetSnapshotRef {
+<a href=#563 id=563 data-nosnippet>563</a>            ref_name: ref_name.to_string(),
+<a href=#564 id=564 data-nosnippet>564</a>            reference: reference.clone(),
+<a href=#565 id=565 data-nosnippet>565</a>        });
+<a href=#566 id=566 data-nosnippet>566</a>        <span class="self">self</span>.metadata.refs.insert(ref_name.to_string(), reference);
+<a href=#567 id=567 data-nosnippet>567</a>
+<a href=#568 id=568 data-nosnippet>568</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#569 id=569 data-nosnippet>569</a>    }
+<a href=#570 id=570 data-nosnippet>570</a>
+<a href=#571 id=571 data-nosnippet>571</a>    <span class="doccomment">/// Remove a reference
+<a href=#572 id=572 data-nosnippet>572</a>    ///
+<a href=#573 id=573 data-nosnippet>573</a>    /// If `ref_name='main'` the current snapshot id is set to -1.
+<a href=#574 id=574 data-nosnippet>574</a>    </span><span class="kw">pub fn </span>remove_ref(<span class="kw-2">mut </span><span class="self">self</span>, ref_name: <span class="kw-2">&amp;</span>str) -&gt; <span class="self">Self </span>{
+<a href=#575 id=575 data-nosnippet>575</a>        <span class="kw">if </span>ref_name == MAIN_BRANCH {
+<a href=#576 id=576 data-nosnippet>576</a>            <span class="self">self</span>.metadata.current_snapshot_id = <span class="prelude-val">None</span>;
+<a href=#577 id=577 data-nosnippet>577</a>        }
+<a href=#578 id=578 data-nosnippet>578</a>
+<a href=#579 id=579 data-nosnippet>579</a>        <span class="kw">if </span><span class="self">self</span>.metadata.refs.remove(ref_name).is_some() || ref_name == MAIN_BRANCH {
+<a href=#580 id=580 data-nosnippet>580</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveSnapshotRef {
+<a href=#581 id=581 data-nosnippet>581</a>                ref_name: ref_name.to_string(),
+<a href=#582 id=582 data-nosnippet>582</a>            });
+<a href=#583 id=583 data-nosnippet>583</a>        }
+<a href=#584 id=584 data-nosnippet>584</a>
+<a href=#585 id=585 data-nosnippet>585</a>        <span class="self">self
+<a href=#586 id=586 data-nosnippet>586</a>    </span>}
+<a href=#587 id=587 data-nosnippet>587</a>
+<a href=#588 id=588 data-nosnippet>588</a>    <span class="doccomment">/// Set statistics for a snapshot
+<a href=#589 id=589 data-nosnippet>589</a>    </span><span class="kw">pub fn </span>set_statistics(<span class="kw-2">mut </span><span class="self">self</span>, statistics: StatisticsFile) -&gt; <span class="self">Self </span>{
+<a href=#590 id=590 data-nosnippet>590</a>        <span class="self">self</span>.metadata
+<a href=#591 id=591 data-nosnippet>591</a>            .statistics
+<a href=#592 id=592 data-nosnippet>592</a>            .insert(statistics.snapshot_id, statistics.clone());
+<a href=#593 id=593 data-nosnippet>593</a>        <span class="self">self</span>.changes.push(TableUpdate::SetStatistics {
+<a href=#594 id=594 data-nosnippet>594</a>            statistics: statistics.clone(),
+<a href=#595 id=595 data-nosnippet>595</a>        });
+<a href=#596 id=596 data-nosnippet>596</a>        <span class="self">self
+<a href=#597 id=597 data-nosnippet>597</a>    </span>}
+<a href=#598 id=598 data-nosnippet>598</a>
+<a href=#599 id=599 data-nosnippet>599</a>    <span class="doccomment">/// Remove statistics for a snapshot
+<a href=#600 id=600 data-nosnippet>600</a>    </span><span class="kw">pub fn </span>remove_statistics(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_id: i64) -&gt; <span class="self">Self </span>{
+<a href=#601 id=601 data-nosnippet>601</a>        <span class="kw">let </span>previous = <span class="self">self</span>.metadata.statistics.remove(<span class="kw-2">&amp;</span>snapshot_id);
+<a href=#602 id=602 data-nosnippet>602</a>        <span class="kw">if </span>previous.is_some() {
+<a href=#603 id=603 data-nosnippet>603</a>            <span class="self">self</span>.changes
+<a href=#604 id=604 data-nosnippet>604</a>                .push(TableUpdate::RemoveStatistics { snapshot_id });
+<a href=#605 id=605 data-nosnippet>605</a>        }
+<a href=#606 id=606 data-nosnippet>606</a>        <span class="self">self
+<a href=#607 id=607 data-nosnippet>607</a>    </span>}
+<a href=#608 id=608 data-nosnippet>608</a>
+<a href=#609 id=609 data-nosnippet>609</a>    <span class="doccomment">/// Set partition statistics
+<a href=#610 id=610 data-nosnippet>610</a>    </span><span class="kw">pub fn </span>set_partition_statistics(
+<a href=#611 id=611 data-nosnippet>611</a>        <span class="kw-2">mut </span><span class="self">self</span>,
+<a href=#612 id=612 data-nosnippet>612</a>        partition_statistics_file: PartitionStatisticsFile,
+<a href=#613 id=613 data-nosnippet>613</a>    ) -&gt; <span class="self">Self </span>{
+<a href=#614 id=614 data-nosnippet>614</a>        <span class="self">self</span>.metadata.partition_statistics.insert(
+<a href=#615 id=615 data-nosnippet>615</a>            partition_statistics_file.snapshot_id,
+<a href=#616 id=616 data-nosnippet>616</a>            partition_statistics_file.clone(),
+<a href=#617 id=617 data-nosnippet>617</a>        );
+<a href=#618 id=618 data-nosnippet>618</a>        <span class="self">self</span>.changes.push(TableUpdate::SetPartitionStatistics {
+<a href=#619 id=619 data-nosnippet>619</a>            partition_statistics: partition_statistics_file,
+<a href=#620 id=620 data-nosnippet>620</a>        });
+<a href=#621 id=621 data-nosnippet>621</a>        <span class="self">self
+<a href=#622 id=622 data-nosnippet>622</a>    </span>}
+<a href=#623 id=623 data-nosnippet>623</a>
+<a href=#624 id=624 data-nosnippet>624</a>    <span class="doccomment">/// Remove partition statistics
+<a href=#625 id=625 data-nosnippet>625</a>    </span><span class="kw">pub fn </span>remove_partition_statistics(<span class="kw-2">mut </span><span class="self">self</span>, snapshot_id: i64) -&gt; <span class="self">Self </span>{
+<a href=#626 id=626 data-nosnippet>626</a>        <span class="kw">let </span>previous = <span class="self">self</span>.metadata.partition_statistics.remove(<span class="kw-2">&amp;</span>snapshot_id);
+<a href=#627 id=627 data-nosnippet>627</a>        <span class="kw">if </span>previous.is_some() {
+<a href=#628 id=628 data-nosnippet>628</a>            <span class="self">self</span>.changes
+<a href=#629 id=629 data-nosnippet>629</a>                .push(TableUpdate::RemovePartitionStatistics { snapshot_id });
+<a href=#630 id=630 data-nosnippet>630</a>        }
+<a href=#631 id=631 data-nosnippet>631</a>        <span class="self">self
+<a href=#632 id=632 data-nosnippet>632</a>    </span>}
+<a href=#633 id=633 data-nosnippet>633</a>
+<a href=#634 id=634 data-nosnippet>634</a>    <span class="doccomment">/// Add a schema to the table metadata.
 <a href=#635 id=635 data-nosnippet>635</a>    ///
-<a href=#636 id=636 data-nosnippet>636</a>    /// Important: Use this method with caution. The builder does not check
-<a href=#637 id=637 data-nosnippet>637</a>    /// if the added schema is compatible with the current schema.
-<a href=#638 id=638 data-nosnippet>638</a>    </span><span class="kw">pub fn </span>add_schema(<span class="kw-2">mut </span><span class="self">self</span>, schema: Schema) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#639 id=639 data-nosnippet>639</a>        <span class="comment">// Validate that new schema fields don't conflict with existing partition field names
-<a href=#640 id=640 data-nosnippet>640</a>        </span><span class="self">self</span>.validate_schema_field_names(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
-<a href=#641 id=641 data-nosnippet>641</a>
-<a href=#642 id=642 data-nosnippet>642</a>        <span class="kw">let </span>new_schema_id = <span class="self">self</span>.reuse_or_create_new_schema_id(<span class="kw-2">&amp;</span>schema);
-<a href=#643 id=643 data-nosnippet>643</a>        <span class="kw">let </span>schema_found = <span class="self">self</span>.metadata.schemas.contains_key(<span class="kw-2">&amp;</span>new_schema_id);
-<a href=#644 id=644 data-nosnippet>644</a>
-<a href=#645 id=645 data-nosnippet>645</a>        <span class="kw">if </span>schema_found {
-<a href=#646 id=646 data-nosnippet>646</a>            <span class="kw">if </span><span class="self">self</span>.last_added_schema_id != <span class="prelude-val">Some</span>(new_schema_id) {
-<a href=#647 id=647 data-nosnippet>647</a>                <span class="self">self</span>.changes.push(TableUpdate::AddSchema {
-<a href=#648 id=648 data-nosnippet>648</a>                    schema: schema.clone(),
-<a href=#649 id=649 data-nosnippet>649</a>                });
-<a href=#650 id=650 data-nosnippet>650</a>                <span class="self">self</span>.last_added_schema_id = <span class="prelude-val">Some</span>(new_schema_id);
-<a href=#651 id=651 data-nosnippet>651</a>            }
-<a href=#652 id=652 data-nosnippet>652</a>
-<a href=#653 id=653 data-nosnippet>653</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#654 id=654 data-nosnippet>654</a>        }
-<a href=#655 id=655 data-nosnippet>655</a>
-<a href=#656 id=656 data-nosnippet>656</a>        <span class="comment">// New schemas might contain only old columns. In this case last_column_id should not be
-<a href=#657 id=657 data-nosnippet>657</a>        // reduced.
-<a href=#658 id=658 data-nosnippet>658</a>        </span><span class="self">self</span>.metadata.last_column_id =
-<a href=#659 id=659 data-nosnippet>659</a>            std::cmp::max(<span class="self">self</span>.metadata.last_column_id, schema.highest_field_id());
-<a href=#660 id=660 data-nosnippet>660</a>
-<a href=#661 id=661 data-nosnippet>661</a>        <span class="comment">// Set schema-id
-<a href=#662 id=662 data-nosnippet>662</a>        </span><span class="kw">let </span>schema = <span class="kw">match </span>new_schema_id == schema.schema_id() {
-<a href=#663 id=663 data-nosnippet>663</a>            <span class="bool-val">true </span>=&gt; schema,
-<a href=#664 id=664 data-nosnippet>664</a>            <span class="bool-val">false </span>=&gt; schema.with_schema_id(new_schema_id),
-<a href=#665 id=665 data-nosnippet>665</a>        };
-<a href=#666 id=666 data-nosnippet>666</a>
-<a href=#667 id=667 data-nosnippet>667</a>        <span class="self">self</span>.metadata
-<a href=#668 id=668 data-nosnippet>668</a>            .schemas
-<a href=#669 id=669 data-nosnippet>669</a>            .insert(new_schema_id, schema.clone().into());
-<a href=#670 id=670 data-nosnippet>670</a>
-<a href=#671 id=671 data-nosnippet>671</a>        <span class="self">self</span>.changes.push(TableUpdate::AddSchema { schema });
+<a href=#636 id=636 data-nosnippet>636</a>    /// The provided `schema.schema_id` may not be used.
+<a href=#637 id=637 data-nosnippet>637</a>    ///
+<a href=#638 id=638 data-nosnippet>638</a>    /// Important: Use this method with caution. The builder does not check
+<a href=#639 id=639 data-nosnippet>639</a>    /// if the added schema is compatible with the current schema.
+<a href=#640 id=640 data-nosnippet>640</a>    </span><span class="kw">pub fn </span>add_schema(<span class="kw-2">mut </span><span class="self">self</span>, schema: Schema) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#641 id=641 data-nosnippet>641</a>        <span class="comment">// Validate that new schema fields don't conflict with existing partition field names
+<a href=#642 id=642 data-nosnippet>642</a>        </span><span class="self">self</span>.validate_schema_field_names(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
+<a href=#643 id=643 data-nosnippet>643</a>
+<a href=#644 id=644 data-nosnippet>644</a>        <span class="kw">let </span>new_schema_id = <span class="self">self</span>.reuse_or_create_new_schema_id(<span class="kw-2">&amp;</span>schema);
+<a href=#645 id=645 data-nosnippet>645</a>        <span class="kw">let </span>schema_found = <span class="self">self</span>.metadata.schemas.contains_key(<span class="kw-2">&amp;</span>new_schema_id);
+<a href=#646 id=646 data-nosnippet>646</a>
+<a href=#647 id=647 data-nosnippet>647</a>        <span class="kw">if </span>schema_found {
+<a href=#648 id=648 data-nosnippet>648</a>            <span class="kw">if </span><span class="self">self</span>.last_added_schema_id != <span class="prelude-val">Some</span>(new_schema_id) {
+<a href=#649 id=649 data-nosnippet>649</a>                <span class="self">self</span>.changes.push(TableUpdate::AddSchema {
+<a href=#650 id=650 data-nosnippet>650</a>                    schema: schema.clone(),
+<a href=#651 id=651 data-nosnippet>651</a>                });
+<a href=#652 id=652 data-nosnippet>652</a>                <span class="self">self</span>.last_added_schema_id = <span class="prelude-val">Some</span>(new_schema_id);
+<a href=#653 id=653 data-nosnippet>653</a>            }
+<a href=#654 id=654 data-nosnippet>654</a>
+<a href=#655 id=655 data-nosnippet>655</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#656 id=656 data-nosnippet>656</a>        }
+<a href=#657 id=657 data-nosnippet>657</a>
+<a href=#658 id=658 data-nosnippet>658</a>        <span class="comment">// New schemas might contain only old columns. In this case last_column_id should not be
+<a href=#659 id=659 data-nosnippet>659</a>        // reduced.
+<a href=#660 id=660 data-nosnippet>660</a>        </span><span class="self">self</span>.metadata.last_column_id =
+<a href=#661 id=661 data-nosnippet>661</a>            std::cmp::max(<span class="self">self</span>.metadata.last_column_id, schema.highest_field_id());
+<a href=#662 id=662 data-nosnippet>662</a>
+<a href=#663 id=663 data-nosnippet>663</a>        <span class="comment">// Set schema-id
+<a href=#664 id=664 data-nosnippet>664</a>        </span><span class="kw">let </span>schema = <span class="kw">match </span>new_schema_id == schema.schema_id() {
+<a href=#665 id=665 data-nosnippet>665</a>            <span class="bool-val">true </span>=&gt; schema,
+<a href=#666 id=666 data-nosnippet>666</a>            <span class="bool-val">false </span>=&gt; schema.with_schema_id(new_schema_id),
+<a href=#667 id=667 data-nosnippet>667</a>        };
+<a href=#668 id=668 data-nosnippet>668</a>
+<a href=#669 id=669 data-nosnippet>669</a>        <span class="self">self</span>.metadata
+<a href=#670 id=670 data-nosnippet>670</a>            .schemas
+<a href=#671 id=671 data-nosnippet>671</a>            .insert(new_schema_id, schema.clone().into());
 <a href=#672 id=672 data-nosnippet>672</a>
-<a href=#673 id=673 data-nosnippet>673</a>        <span class="self">self</span>.last_added_schema_id = <span class="prelude-val">Some</span>(new_schema_id);
+<a href=#673 id=673 data-nosnippet>673</a>        <span class="self">self</span>.changes.push(TableUpdate::AddSchema { schema });
 <a href=#674 id=674 data-nosnippet>674</a>
-<a href=#675 id=675 data-nosnippet>675</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#676 id=676 data-nosnippet>676</a>    }
-<a href=#677 id=677 data-nosnippet>677</a>
-<a href=#678 id=678 data-nosnippet>678</a>    <span class="doccomment">/// Set the current schema id.
-<a href=#679 id=679 data-nosnippet>679</a>    ///
-<a href=#680 id=680 data-nosnippet>680</a>    /// If `schema_id` is -1, the last added schema is set as the current schema.
+<a href=#675 id=675 data-nosnippet>675</a>        <span class="self">self</span>.last_added_schema_id = <span class="prelude-val">Some</span>(new_schema_id);
+<a href=#676 id=676 data-nosnippet>676</a>
+<a href=#677 id=677 data-nosnippet>677</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#678 id=678 data-nosnippet>678</a>    }
+<a href=#679 id=679 data-nosnippet>679</a>
+<a href=#680 id=680 data-nosnippet>680</a>    <span class="doccomment">/// Set the current schema id.
 <a href=#681 id=681 data-nosnippet>681</a>    ///
-<a href=#682 id=682 data-nosnippet>682</a>    /// Errors:
-<a href=#683 id=683 data-nosnippet>683</a>    /// - provided `schema_id` is -1 but no schema has been added via `add_schema`.
-<a href=#684 id=684 data-nosnippet>684</a>    /// - No schema with the provided `schema_id` exists.
-<a href=#685 id=685 data-nosnippet>685</a>    </span><span class="kw">pub fn </span>set_current_schema(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>schema_id: i32) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#686 id=686 data-nosnippet>686</a>        <span class="kw">if </span>schema_id == <span class="self">Self</span>::LAST_ADDED {
-<a href=#687 id=687 data-nosnippet>687</a>            schema_id = <span class="self">self</span>.last_added_schema_id.ok_or_else(|| {
-<a href=#688 id=688 data-nosnippet>688</a>                Error::new(
-<a href=#689 id=689 data-nosnippet>689</a>                    ErrorKind::DataInvalid,
-<a href=#690 id=690 data-nosnippet>690</a>                    <span class="string">"Cannot set current schema to last added schema: no schema has been added."</span>,
-<a href=#691 id=691 data-nosnippet>691</a>                )
-<a href=#692 id=692 data-nosnippet>692</a>            })<span class="question-mark">?</span>;
-<a href=#693 id=693 data-nosnippet>693</a>        };
-<a href=#694 id=694 data-nosnippet>694</a>        <span class="kw">let </span>schema_id = schema_id; <span class="comment">// Make immutable
-<a href=#695 id=695 data-nosnippet>695</a>
-<a href=#696 id=696 data-nosnippet>696</a>        </span><span class="kw">if </span>schema_id == <span class="self">self</span>.metadata.current_schema_id {
-<a href=#697 id=697 data-nosnippet>697</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#698 id=698 data-nosnippet>698</a>        }
-<a href=#699 id=699 data-nosnippet>699</a>
-<a href=#700 id=700 data-nosnippet>700</a>        <span class="kw">let </span>_schema = <span class="self">self</span>.metadata.schemas.get(<span class="kw-2">&amp;</span>schema_id).ok_or_else(|| {
-<a href=#701 id=701 data-nosnippet>701</a>            Error::new(
-<a href=#702 id=702 data-nosnippet>702</a>                ErrorKind::DataInvalid,
-<a href=#703 id=703 data-nosnippet>703</a>                <span class="macro">format!</span>(<span class="string">"Cannot set current schema to unknown schema with id: '{schema_id}'"</span>),
-<a href=#704 id=704 data-nosnippet>704</a>            )
-<a href=#705 id=705 data-nosnippet>705</a>        })<span class="question-mark">?</span>;
-<a href=#706 id=706 data-nosnippet>706</a>
-<a href=#707 id=707 data-nosnippet>707</a>        <span class="comment">// Old partition specs and sort-orders should be preserved even if they are not compatible with the new schema,
-<a href=#708 id=708 data-nosnippet>708</a>        // so that older metadata can still be interpreted.
-<a href=#709 id=709 data-nosnippet>709</a>        // Default partition spec and sort order are checked in the build() method
-<a href=#710 id=710 data-nosnippet>710</a>        // which allows other default partition specs and sort orders to be set before the build.
-<a href=#711 id=711 data-nosnippet>711</a>
-<a href=#712 id=712 data-nosnippet>712</a>        </span><span class="self">self</span>.metadata.current_schema_id = schema_id;
+<a href=#682 id=682 data-nosnippet>682</a>    /// If `schema_id` is -1, the last added schema is set as the current schema.
+<a href=#683 id=683 data-nosnippet>683</a>    ///
+<a href=#684 id=684 data-nosnippet>684</a>    /// Errors:
+<a href=#685 id=685 data-nosnippet>685</a>    /// - provided `schema_id` is -1 but no schema has been added via `add_schema`.
+<a href=#686 id=686 data-nosnippet>686</a>    /// - No schema with the provided `schema_id` exists.
+<a href=#687 id=687 data-nosnippet>687</a>    </span><span class="kw">pub fn </span>set_current_schema(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>schema_id: i32) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#688 id=688 data-nosnippet>688</a>        <span class="kw">if </span>schema_id == <span class="self">Self</span>::LAST_ADDED {
+<a href=#689 id=689 data-nosnippet>689</a>            schema_id = <span class="self">self</span>.last_added_schema_id.ok_or_else(|| {
+<a href=#690 id=690 data-nosnippet>690</a>                Error::new(
+<a href=#691 id=691 data-nosnippet>691</a>                    ErrorKind::DataInvalid,
+<a href=#692 id=692 data-nosnippet>692</a>                    <span class="string">"Cannot set current schema to last added schema: no schema has been added."</span>,
+<a href=#693 id=693 data-nosnippet>693</a>                )
+<a href=#694 id=694 data-nosnippet>694</a>            })<span class="question-mark">?</span>;
+<a href=#695 id=695 data-nosnippet>695</a>        };
+<a href=#696 id=696 data-nosnippet>696</a>        <span class="kw">let </span>schema_id = schema_id; <span class="comment">// Make immutable
+<a href=#697 id=697 data-nosnippet>697</a>
+<a href=#698 id=698 data-nosnippet>698</a>        </span><span class="kw">if </span>schema_id == <span class="self">self</span>.metadata.current_schema_id {
+<a href=#699 id=699 data-nosnippet>699</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#700 id=700 data-nosnippet>700</a>        }
+<a href=#701 id=701 data-nosnippet>701</a>
+<a href=#702 id=702 data-nosnippet>702</a>        <span class="kw">let </span>_schema = <span class="self">self</span>.metadata.schemas.get(<span class="kw-2">&amp;</span>schema_id).ok_or_else(|| {
+<a href=#703 id=703 data-nosnippet>703</a>            Error::new(
+<a href=#704 id=704 data-nosnippet>704</a>                ErrorKind::DataInvalid,
+<a href=#705 id=705 data-nosnippet>705</a>                <span class="macro">format!</span>(<span class="string">"Cannot set current schema to unknown schema with id: '{schema_id}'"</span>),
+<a href=#706 id=706 data-nosnippet>706</a>            )
+<a href=#707 id=707 data-nosnippet>707</a>        })<span class="question-mark">?</span>;
+<a href=#708 id=708 data-nosnippet>708</a>
+<a href=#709 id=709 data-nosnippet>709</a>        <span class="comment">// Old partition specs and sort-orders should be preserved even if they are not compatible with the new schema,
+<a href=#710 id=710 data-nosnippet>710</a>        // so that older metadata can still be interpreted.
+<a href=#711 id=711 data-nosnippet>711</a>        // Default partition spec and sort order are checked in the build() method
+<a href=#712 id=712 data-nosnippet>712</a>        // which allows other default partition specs and sort orders to be set before the build.
 <a href=#713 id=713 data-nosnippet>713</a>
-<a href=#714 id=714 data-nosnippet>714</a>        <span class="kw">if </span><span class="self">self</span>.last_added_schema_id == <span class="prelude-val">Some</span>(schema_id) {
-<a href=#715 id=715 data-nosnippet>715</a>            <span class="self">self</span>.changes.push(TableUpdate::SetCurrentSchema {
-<a href=#716 id=716 data-nosnippet>716</a>                schema_id: <span class="self">Self</span>::LAST_ADDED,
-<a href=#717 id=717 data-nosnippet>717</a>            });
-<a href=#718 id=718 data-nosnippet>718</a>        } <span class="kw">else </span>{
-<a href=#719 id=719 data-nosnippet>719</a>            <span class="self">self</span>.changes
-<a href=#720 id=720 data-nosnippet>720</a>                .push(TableUpdate::SetCurrentSchema { schema_id });
-<a href=#721 id=721 data-nosnippet>721</a>        }
-<a href=#722 id=722 data-nosnippet>722</a>
-<a href=#723 id=723 data-nosnippet>723</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#724 id=724 data-nosnippet>724</a>    }
-<a href=#725 id=725 data-nosnippet>725</a>
-<a href=#726 id=726 data-nosnippet>726</a>    <span class="doccomment">/// Add a schema and set it as the current schema.
-<a href=#727 id=727 data-nosnippet>727</a>    </span><span class="kw">pub fn </span>add_current_schema(<span class="self">self</span>, schema: Schema) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#728 id=728 data-nosnippet>728</a>        <span class="self">self</span>.add_schema(schema)<span class="question-mark">?
-<a href=#729 id=729 data-nosnippet>729</a>            </span>.set_current_schema(<span class="self">Self</span>::LAST_ADDED)
-<a href=#730 id=730 data-nosnippet>730</a>    }
-<a href=#731 id=731 data-nosnippet>731</a>
-<a href=#732 id=732 data-nosnippet>732</a>    <span class="doccomment">/// Validate schema field names against partition field names across all historical schemas.
-<a href=#733 id=733 data-nosnippet>733</a>    ///
-<a href=#734 id=734 data-nosnippet>734</a>    /// Due to Iceberg's multi-version property, this check ignores existing schema fields
-<a href=#735 id=735 data-nosnippet>735</a>    /// that match partition names (schema evolution allows re-adding previously removed fields).
-<a href=#736 id=736 data-nosnippet>736</a>    /// Only NEW field names that conflict with partition names are rejected.
-<a href=#737 id=737 data-nosnippet>737</a>    ///
-<a href=#738 id=738 data-nosnippet>738</a>    /// # Errors
-<a href=#739 id=739 data-nosnippet>739</a>    /// - Schema field name conflicts with partition field name but doesn't exist in any historical schema.
-<a href=#740 id=740 data-nosnippet>740</a>    </span><span class="kw">fn </span>validate_schema_field_names(<span class="kw-2">&amp;</span><span class="self">self</span>, schema: <span class="kw-2">&amp;</span>Schema) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
-<a href=#741 id=741 data-nosnippet>741</a>        <span class="kw">if </span><span class="self">self</span>.metadata.schemas.is_empty() {
-<a href=#742 id=742 data-nosnippet>742</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
-<a href=#743 id=743 data-nosnippet>743</a>        }
-<a href=#744 id=744 data-nosnippet>744</a>
-<a href=#745 id=745 data-nosnippet>745</a>        <span class="kw">for </span>field_name <span class="kw">in </span>schema.field_id_to_name_map().values() {
-<a href=#746 id=746 data-nosnippet>746</a>            <span class="kw">let </span>has_partition_conflict = <span class="self">self</span>.metadata.partition_name_exists(field_name);
-<a href=#747 id=747 data-nosnippet>747</a>            <span class="kw">let </span>is_new_field = !<span class="self">self</span>.metadata.name_exists_in_any_schema(field_name);
-<a href=#748 id=748 data-nosnippet>748</a>
-<a href=#749 id=749 data-nosnippet>749</a>            <span class="kw">if </span>has_partition_conflict &amp;&amp; is_new_field {
-<a href=#750 id=750 data-nosnippet>750</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#751 id=751 data-nosnippet>751</a>                    ErrorKind::DataInvalid,
-<a href=#752 id=752 data-nosnippet>752</a>                    <span class="macro">format!</span>(
-<a href=#753 id=753 data-nosnippet>753</a>                        <span class="string">"Cannot add schema field '{field_name}' because it conflicts with existing partition field name. \
-<a href=#754 id=754 data-nosnippet>754</a>                         Schema evolution cannot introduce field names that match existing partition field names."
-<a href=#755 id=755 data-nosnippet>755</a>                    </span>),
-<a href=#756 id=756 data-nosnippet>756</a>                ));
-<a href=#757 id=757 data-nosnippet>757</a>            }
-<a href=#758 id=758 data-nosnippet>758</a>        }
-<a href=#759 id=759 data-nosnippet>759</a>
-<a href=#760 id=760 data-nosnippet>760</a>        <span class="prelude-val">Ok</span>(())
-<a href=#761 id=761 data-nosnippet>761</a>    }
-<a href=#762 id=762 data-nosnippet>762</a>
-<a href=#763 id=763 data-nosnippet>763</a>    <span class="doccomment">/// Validate partition field names against schema field names across all historical schemas.
-<a href=#764 id=764 data-nosnippet>764</a>    ///
-<a href=#765 id=765 data-nosnippet>765</a>    /// Due to Iceberg's multi-version property, partition fields can share names with schema fields
-<a href=#766 id=766 data-nosnippet>766</a>    /// if they meet specific requirements (identity transform + matching source field ID).
-<a href=#767 id=767 data-nosnippet>767</a>    /// This validation enforces those rules across all historical schema versions.
-<a href=#768 id=768 data-nosnippet>768</a>    ///
-<a href=#769 id=769 data-nosnippet>769</a>    /// # Errors
-<a href=#770 id=770 data-nosnippet>770</a>    /// - Partition field name conflicts with schema field name but doesn't use identity transform.
-<a href=#771 id=771 data-nosnippet>771</a>    /// - Partition field uses identity transform but references wrong source field ID.
-<a href=#772 id=772 data-nosnippet>772</a>    </span><span class="kw">fn </span>validate_partition_field_names(<span class="kw-2">&amp;</span><span class="self">self</span>, unbound_spec: <span class="kw-2">&amp;</span>UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
-<a href=#773 id=773 data-nosnippet>773</a>        <span class="kw">if </span><span class="self">self</span>.metadata.schemas.is_empty() {
-<a href=#774 id=774 data-nosnippet>774</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
-<a href=#775 id=775 data-nosnippet>775</a>        }
-<a href=#776 id=776 data-nosnippet>776</a>
-<a href=#777 id=777 data-nosnippet>777</a>        <span class="kw">let </span>current_schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>;
-<a href=#778 id=778 data-nosnippet>778</a>        <span class="kw">for </span>partition_field <span class="kw">in </span>unbound_spec.fields() {
-<a href=#779 id=779 data-nosnippet>779</a>            <span class="kw">let </span>exists_in_any_schema = <span class="self">self
-<a href=#780 id=780 data-nosnippet>780</a>                </span>.metadata
-<a href=#781 id=781 data-nosnippet>781</a>                .name_exists_in_any_schema(<span class="kw-2">&amp;</span>partition_field.name);
-<a href=#782 id=782 data-nosnippet>782</a>
-<a href=#783 id=783 data-nosnippet>783</a>            <span class="comment">// Skip if partition field name doesn't conflict with any schema field
-<a href=#784 id=784 data-nosnippet>784</a>            </span><span class="kw">if </span>!exists_in_any_schema {
-<a href=#785 id=785 data-nosnippet>785</a>                <span class="kw">continue</span>;
-<a href=#786 id=786 data-nosnippet>786</a>            }
-<a href=#787 id=787 data-nosnippet>787</a>
-<a href=#788 id=788 data-nosnippet>788</a>            <span class="comment">// If name exists in schemas, validate against current schema rules
-<a href=#789 id=789 data-nosnippet>789</a>            </span><span class="kw">if let </span><span class="prelude-val">Some</span>(schema_field) = current_schema.field_by_name(<span class="kw-2">&amp;</span>partition_field.name) {
-<a href=#790 id=790 data-nosnippet>790</a>                <span class="kw">let </span>is_identity_transform =
-<a href=#791 id=791 data-nosnippet>791</a>                    partition_field.transform == <span class="kw">crate</span>::spec::Transform::Identity;
-<a href=#792 id=792 data-nosnippet>792</a>                <span class="kw">let </span>has_matching_source_id = schema_field.id == partition_field.source_id;
-<a href=#793 id=793 data-nosnippet>793</a>
-<a href=#794 id=794 data-nosnippet>794</a>                <span class="kw">if </span>!is_identity_transform {
-<a href=#795 id=795 data-nosnippet>795</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#796 id=796 data-nosnippet>796</a>                        ErrorKind::DataInvalid,
-<a href=#797 id=797 data-nosnippet>797</a>                        <span class="macro">format!</span>(
-<a href=#798 id=798 data-nosnippet>798</a>                            <span class="string">"Cannot create partition with name '{}' that conflicts with schema field and is not an identity transform."</span>,
-<a href=#799 id=799 data-nosnippet>799</a>                            partition_field.name
-<a href=#800 id=800 data-nosnippet>800</a>                        ),
-<a href=#801 id=801 data-nosnippet>801</a>                    ));
-<a href=#802 id=802 data-nosnippet>802</a>                }
-<a href=#803 id=803 data-nosnippet>803</a>
-<a href=#804 id=804 data-nosnippet>804</a>                <span class="kw">if </span>!has_matching_source_id {
-<a href=#805 id=805 data-nosnippet>805</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#806 id=806 data-nosnippet>806</a>                        ErrorKind::DataInvalid,
-<a href=#807 id=807 data-nosnippet>807</a>                        <span class="macro">format!</span>(
-<a href=#808 id=808 data-nosnippet>808</a>                            <span class="string">"Cannot create identity partition sourced from different field in schema. \
-<a href=#809 id=809 data-nosnippet>809</a>                             Field name '{}' has id `{}` in schema but partition source id is `{}`"</span>,
-<a href=#810 id=810 data-nosnippet>810</a>                            partition_field.name, schema_field.id, partition_field.source_id
-<a href=#811 id=811 data-nosnippet>811</a>                        ),
-<a href=#812 id=812 data-nosnippet>812</a>                    ));
-<a href=#813 id=813 data-nosnippet>813</a>                }
-<a href=#814 id=814 data-nosnippet>814</a>            }
-<a href=#815 id=815 data-nosnippet>815</a>        }
-<a href=#816 id=816 data-nosnippet>816</a>
-<a href=#817 id=817 data-nosnippet>817</a>        <span class="prelude-val">Ok</span>(())
-<a href=#818 id=818 data-nosnippet>818</a>    }
-<a href=#819 id=819 data-nosnippet>819</a>
-<a href=#820 id=820 data-nosnippet>820</a>    <span class="doccomment">/// Add a partition spec to the table metadata.
-<a href=#821 id=821 data-nosnippet>821</a>    ///
-<a href=#822 id=822 data-nosnippet>822</a>    /// The spec is bound eagerly to the current schema.
-<a href=#823 id=823 data-nosnippet>823</a>    /// If a schema is added in the same set of changes, the schema should be added first.
-<a href=#824 id=824 data-nosnippet>824</a>    ///
-<a href=#825 id=825 data-nosnippet>825</a>    /// Even if `unbound_spec.spec_id` is provided as `Some`, it may not be used.
+<a href=#714 id=714 data-nosnippet>714</a>        </span><span class="self">self</span>.metadata.current_schema_id = schema_id;
+<a href=#715 id=715 data-nosnippet>715</a>
+<a href=#716 id=716 data-nosnippet>716</a>        <span class="kw">if </span><span class="self">self</span>.last_added_schema_id == <span class="prelude-val">Some</span>(schema_id) {
+<a href=#717 id=717 data-nosnippet>717</a>            <span class="self">self</span>.changes.push(TableUpdate::SetCurrentSchema {
+<a href=#718 id=718 data-nosnippet>718</a>                schema_id: <span class="self">Self</span>::LAST_ADDED,
+<a href=#719 id=719 data-nosnippet>719</a>            });
+<a href=#720 id=720 data-nosnippet>720</a>        } <span class="kw">else </span>{
+<a href=#721 id=721 data-nosnippet>721</a>            <span class="self">self</span>.changes
+<a href=#722 id=722 data-nosnippet>722</a>                .push(TableUpdate::SetCurrentSchema { schema_id });
+<a href=#723 id=723 data-nosnippet>723</a>        }
+<a href=#724 id=724 data-nosnippet>724</a>
+<a href=#725 id=725 data-nosnippet>725</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#726 id=726 data-nosnippet>726</a>    }
+<a href=#727 id=727 data-nosnippet>727</a>
+<a href=#728 id=728 data-nosnippet>728</a>    <span class="doccomment">/// Add a schema and set it as the current schema.
+<a href=#729 id=729 data-nosnippet>729</a>    </span><span class="kw">pub fn </span>add_current_schema(<span class="self">self</span>, schema: Schema) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#730 id=730 data-nosnippet>730</a>        <span class="self">self</span>.add_schema(schema)<span class="question-mark">?
+<a href=#731 id=731 data-nosnippet>731</a>            </span>.set_current_schema(<span class="self">Self</span>::LAST_ADDED)
+<a href=#732 id=732 data-nosnippet>732</a>    }
+<a href=#733 id=733 data-nosnippet>733</a>
+<a href=#734 id=734 data-nosnippet>734</a>    <span class="doccomment">/// Validate schema field names against partition field names across all historical schemas.
+<a href=#735 id=735 data-nosnippet>735</a>    ///
+<a href=#736 id=736 data-nosnippet>736</a>    /// Due to Iceberg's multi-version property, this check ignores existing schema fields
+<a href=#737 id=737 data-nosnippet>737</a>    /// that match partition names (schema evolution allows re-adding previously removed fields).
+<a href=#738 id=738 data-nosnippet>738</a>    /// Only NEW field names that conflict with partition names are rejected.
+<a href=#739 id=739 data-nosnippet>739</a>    ///
+<a href=#740 id=740 data-nosnippet>740</a>    /// # Errors
+<a href=#741 id=741 data-nosnippet>741</a>    /// - Schema field name conflicts with partition field name but doesn't exist in any historical schema.
+<a href=#742 id=742 data-nosnippet>742</a>    </span><span class="kw">fn </span>validate_schema_field_names(<span class="kw-2">&amp;</span><span class="self">self</span>, schema: <span class="kw-2">&amp;</span>Schema) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
+<a href=#743 id=743 data-nosnippet>743</a>        <span class="kw">if </span><span class="self">self</span>.metadata.schemas.is_empty() {
+<a href=#744 id=744 data-nosnippet>744</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
+<a href=#745 id=745 data-nosnippet>745</a>        }
+<a href=#746 id=746 data-nosnippet>746</a>
+<a href=#747 id=747 data-nosnippet>747</a>        <span class="kw">for </span>field_name <span class="kw">in </span>schema.field_id_to_name_map().values() {
+<a href=#748 id=748 data-nosnippet>748</a>            <span class="kw">let </span>has_partition_conflict = <span class="self">self</span>.metadata.partition_name_exists(field_name);
+<a href=#749 id=749 data-nosnippet>749</a>            <span class="kw">let </span>is_new_field = !<span class="self">self</span>.metadata.name_exists_in_any_schema(field_name);
+<a href=#750 id=750 data-nosnippet>750</a>
+<a href=#751 id=751 data-nosnippet>751</a>            <span class="kw">if </span>has_partition_conflict &amp;&amp; is_new_field {
+<a href=#752 id=752 data-nosnippet>752</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#753 id=753 data-nosnippet>753</a>                    ErrorKind::DataInvalid,
+<a href=#754 id=754 data-nosnippet>754</a>                    <span class="macro">format!</span>(
+<a href=#755 id=755 data-nosnippet>755</a>                        <span class="string">"Cannot add schema field '{field_name}' because it conflicts with existing partition field name. \
+<a href=#756 id=756 data-nosnippet>756</a>                         Schema evolution cannot introduce field names that match existing partition field names."
+<a href=#757 id=757 data-nosnippet>757</a>                    </span>),
+<a href=#758 id=758 data-nosnippet>758</a>                ));
+<a href=#759 id=759 data-nosnippet>759</a>            }
+<a href=#760 id=760 data-nosnippet>760</a>        }
+<a href=#761 id=761 data-nosnippet>761</a>
+<a href=#762 id=762 data-nosnippet>762</a>        <span class="prelude-val">Ok</span>(())
+<a href=#763 id=763 data-nosnippet>763</a>    }
+<a href=#764 id=764 data-nosnippet>764</a>
+<a href=#765 id=765 data-nosnippet>765</a>    <span class="doccomment">/// Validate partition field names against schema field names across all historical schemas.
+<a href=#766 id=766 data-nosnippet>766</a>    ///
+<a href=#767 id=767 data-nosnippet>767</a>    /// Due to Iceberg's multi-version property, partition fields can share names with schema fields
+<a href=#768 id=768 data-nosnippet>768</a>    /// if they meet specific requirements (identity transform + matching source field ID).
+<a href=#769 id=769 data-nosnippet>769</a>    /// This validation enforces those rules across all historical schema versions.
+<a href=#770 id=770 data-nosnippet>770</a>    ///
+<a href=#771 id=771 data-nosnippet>771</a>    /// # Errors
+<a href=#772 id=772 data-nosnippet>772</a>    /// - Partition field name conflicts with schema field name but doesn't use identity transform.
+<a href=#773 id=773 data-nosnippet>773</a>    /// - Partition field uses identity transform but references wrong source field ID.
+<a href=#774 id=774 data-nosnippet>774</a>    </span><span class="kw">fn </span>validate_partition_field_names(<span class="kw-2">&amp;</span><span class="self">self</span>, unbound_spec: <span class="kw-2">&amp;</span>UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
+<a href=#775 id=775 data-nosnippet>775</a>        <span class="kw">if </span><span class="self">self</span>.metadata.schemas.is_empty() {
+<a href=#776 id=776 data-nosnippet>776</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
+<a href=#777 id=777 data-nosnippet>777</a>        }
+<a href=#778 id=778 data-nosnippet>778</a>
+<a href=#779 id=779 data-nosnippet>779</a>        <span class="kw">let </span>current_schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>;
+<a href=#780 id=780 data-nosnippet>780</a>        <span class="kw">for </span>partition_field <span class="kw">in </span>unbound_spec.fields() {
+<a href=#781 id=781 data-nosnippet>781</a>            <span class="kw">let </span>exists_in_any_schema = <span class="self">self
+<a href=#782 id=782 data-nosnippet>782</a>                </span>.metadata
+<a href=#783 id=783 data-nosnippet>783</a>                .name_exists_in_any_schema(<span class="kw-2">&amp;</span>partition_field.name);
+<a href=#784 id=784 data-nosnippet>784</a>
+<a href=#785 id=785 data-nosnippet>785</a>            <span class="comment">// Skip if partition field name doesn't conflict with any schema field
+<a href=#786 id=786 data-nosnippet>786</a>            </span><span class="kw">if </span>!exists_in_any_schema {
+<a href=#787 id=787 data-nosnippet>787</a>                <span class="kw">continue</span>;
+<a href=#788 id=788 data-nosnippet>788</a>            }
+<a href=#789 id=789 data-nosnippet>789</a>
+<a href=#790 id=790 data-nosnippet>790</a>            <span class="comment">// If name exists in schemas, validate against current schema rules
+<a href=#791 id=791 data-nosnippet>791</a>            </span><span class="kw">if let </span><span class="prelude-val">Some</span>(schema_field) = current_schema.field_by_name(<span class="kw-2">&amp;</span>partition_field.name) {
+<a href=#792 id=792 data-nosnippet>792</a>                <span class="kw">let </span>is_identity_transform =
+<a href=#793 id=793 data-nosnippet>793</a>                    partition_field.transform == <span class="kw">crate</span>::spec::Transform::Identity;
+<a href=#794 id=794 data-nosnippet>794</a>                <span class="kw">let </span>has_matching_source_id = schema_field.id == partition_field.source_id;
+<a href=#795 id=795 data-nosnippet>795</a>
+<a href=#796 id=796 data-nosnippet>796</a>                <span class="kw">if </span>!is_identity_transform {
+<a href=#797 id=797 data-nosnippet>797</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#798 id=798 data-nosnippet>798</a>                        ErrorKind::DataInvalid,
+<a href=#799 id=799 data-nosnippet>799</a>                        <span class="macro">format!</span>(
+<a href=#800 id=800 data-nosnippet>800</a>                            <span class="string">"Cannot create partition with name '{}' that conflicts with schema field and is not an identity transform."</span>,
+<a href=#801 id=801 data-nosnippet>801</a>                            partition_field.name
+<a href=#802 id=802 data-nosnippet>802</a>                        ),
+<a href=#803 id=803 data-nosnippet>803</a>                    ));
+<a href=#804 id=804 data-nosnippet>804</a>                }
+<a href=#805 id=805 data-nosnippet>805</a>
+<a href=#806 id=806 data-nosnippet>806</a>                <span class="kw">if </span>!has_matching_source_id {
+<a href=#807 id=807 data-nosnippet>807</a>                    <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#808 id=808 data-nosnippet>808</a>                        ErrorKind::DataInvalid,
+<a href=#809 id=809 data-nosnippet>809</a>                        <span class="macro">format!</span>(
+<a href=#810 id=810 data-nosnippet>810</a>                            <span class="string">"Cannot create identity partition sourced from different field in schema. \
+<a href=#811 id=811 data-nosnippet>811</a>                             Field name '{}' has id `{}` in schema but partition source id is `{}`"</span>,
+<a href=#812 id=812 data-nosnippet>812</a>                            partition_field.name, schema_field.id, partition_field.source_id
+<a href=#813 id=813 data-nosnippet>813</a>                        ),
+<a href=#814 id=814 data-nosnippet>814</a>                    ));
+<a href=#815 id=815 data-nosnippet>815</a>                }
+<a href=#816 id=816 data-nosnippet>816</a>            }
+<a href=#817 id=817 data-nosnippet>817</a>        }
+<a href=#818 id=818 data-nosnippet>818</a>
+<a href=#819 id=819 data-nosnippet>819</a>        <span class="prelude-val">Ok</span>(())
+<a href=#820 id=820 data-nosnippet>820</a>    }
+<a href=#821 id=821 data-nosnippet>821</a>
+<a href=#822 id=822 data-nosnippet>822</a>    <span class="doccomment">/// Add a partition spec to the table metadata.
+<a href=#823 id=823 data-nosnippet>823</a>    ///
+<a href=#824 id=824 data-nosnippet>824</a>    /// The spec is bound eagerly to the current schema.
+<a href=#825 id=825 data-nosnippet>825</a>    /// If a schema is added in the same set of changes, the schema should be added first.
 <a href=#826 id=826 data-nosnippet>826</a>    ///
-<a href=#827 id=827 data-nosnippet>827</a>    /// # Errors
-<a href=#828 id=828 data-nosnippet>828</a>    /// - The partition spec cannot be bound to the current schema.
-<a href=#829 id=829 data-nosnippet>829</a>    /// - The partition spec has non-sequential field ids and the table format version is 1.
-<a href=#830 id=830 data-nosnippet>830</a>    </span><span class="kw">pub fn </span>add_partition_spec(<span class="kw-2">mut </span><span class="self">self</span>, unbound_spec: UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#831 id=831 data-nosnippet>831</a>        <span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone();
-<a href=#832 id=832 data-nosnippet>832</a>
-<a href=#833 id=833 data-nosnippet>833</a>        <span class="comment">// Check if partition field names conflict with schema field names across all schemas
-<a href=#834 id=834 data-nosnippet>834</a>        </span><span class="self">self</span>.validate_partition_field_names(<span class="kw-2">&amp;</span>unbound_spec)<span class="question-mark">?</span>;
-<a href=#835 id=835 data-nosnippet>835</a>
-<a href=#836 id=836 data-nosnippet>836</a>        <span class="kw">let </span>spec = PartitionSpecBuilder::new_from_unbound(unbound_spec.clone(), schema)<span class="question-mark">?
-<a href=#837 id=837 data-nosnippet>837</a>            </span>.with_last_assigned_field_id(<span class="self">self</span>.metadata.last_partition_id)
-<a href=#838 id=838 data-nosnippet>838</a>            .build()<span class="question-mark">?</span>;
-<a href=#839 id=839 data-nosnippet>839</a>
-<a href=#840 id=840 data-nosnippet>840</a>        <span class="kw">let </span>new_spec_id = <span class="self">self</span>.reuse_or_create_new_spec_id(<span class="kw-2">&amp;</span>spec);
-<a href=#841 id=841 data-nosnippet>841</a>        <span class="kw">let </span>spec_found = <span class="self">self</span>.metadata.partition_specs.contains_key(<span class="kw-2">&amp;</span>new_spec_id);
-<a href=#842 id=842 data-nosnippet>842</a>        <span class="kw">let </span>spec = spec.with_spec_id(new_spec_id);
-<a href=#843 id=843 data-nosnippet>843</a>        <span class="kw">let </span>unbound_spec = unbound_spec.with_spec_id(new_spec_id);
-<a href=#844 id=844 data-nosnippet>844</a>
-<a href=#845 id=845 data-nosnippet>845</a>        <span class="kw">if </span>spec_found {
-<a href=#846 id=846 data-nosnippet>846</a>            <span class="kw">if </span><span class="self">self</span>.last_added_spec_id != <span class="prelude-val">Some</span>(new_spec_id) {
-<a href=#847 id=847 data-nosnippet>847</a>                <span class="self">self</span>.changes
-<a href=#848 id=848 data-nosnippet>848</a>                    .push(TableUpdate::AddSpec { spec: unbound_spec });
-<a href=#849 id=849 data-nosnippet>849</a>                <span class="self">self</span>.last_added_spec_id = <span class="prelude-val">Some</span>(new_spec_id);
-<a href=#850 id=850 data-nosnippet>850</a>            }
-<a href=#851 id=851 data-nosnippet>851</a>
-<a href=#852 id=852 data-nosnippet>852</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#853 id=853 data-nosnippet>853</a>        }
-<a href=#854 id=854 data-nosnippet>854</a>
-<a href=#855 id=855 data-nosnippet>855</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version &lt;= FormatVersion::V1 &amp;&amp; !spec.has_sequential_ids() {
-<a href=#856 id=856 data-nosnippet>856</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#857 id=857 data-nosnippet>857</a>                ErrorKind::DataInvalid,
-<a href=#858 id=858 data-nosnippet>858</a>                <span class="string">"Cannot add partition spec with non-sequential field ids to format version 1 table"</span>,
-<a href=#859 id=859 data-nosnippet>859</a>            ));
-<a href=#860 id=860 data-nosnippet>860</a>        }
-<a href=#861 id=861 data-nosnippet>861</a>
-<a href=#862 id=862 data-nosnippet>862</a>        <span class="kw">let </span>highest_field_id = spec
-<a href=#863 id=863 data-nosnippet>863</a>            .highest_field_id()
-<a href=#864 id=864 data-nosnippet>864</a>            .unwrap_or(UNPARTITIONED_LAST_ASSIGNED_ID);
-<a href=#865 id=865 data-nosnippet>865</a>        <span class="self">self</span>.metadata
-<a href=#866 id=866 data-nosnippet>866</a>            .partition_specs
-<a href=#867 id=867 data-nosnippet>867</a>            .insert(new_spec_id, Arc::new(spec));
-<a href=#868 id=868 data-nosnippet>868</a>        <span class="self">self</span>.changes
-<a href=#869 id=869 data-nosnippet>869</a>            .push(TableUpdate::AddSpec { spec: unbound_spec });
-<a href=#870 id=870 data-nosnippet>870</a>
-<a href=#871 id=871 data-nosnippet>871</a>        <span class="self">self</span>.last_added_spec_id = <span class="prelude-val">Some</span>(new_spec_id);
-<a href=#872 id=872 data-nosnippet>872</a>        <span class="self">self</span>.metadata.last_partition_id =
-<a href=#873 id=873 data-nosnippet>873</a>            std::cmp::max(<span class="self">self</span>.metadata.last_partition_id, highest_field_id);
-<a href=#874 id=874 data-nosnippet>874</a>
-<a href=#875 id=875 data-nosnippet>875</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#876 id=876 data-nosnippet>876</a>    }
-<a href=#877 id=877 data-nosnippet>877</a>
-<a href=#878 id=878 data-nosnippet>878</a>    <span class="doccomment">/// Set the default partition spec.
-<a href=#879 id=879 data-nosnippet>879</a>    ///
-<a href=#880 id=880 data-nosnippet>880</a>    /// # Errors
-<a href=#881 id=881 data-nosnippet>881</a>    /// - spec_id is -1 but no spec has been added via `add_partition_spec`.
-<a href=#882 id=882 data-nosnippet>882</a>    /// - No partition spec with the provided `spec_id` exists.
-<a href=#883 id=883 data-nosnippet>883</a>    </span><span class="kw">pub fn </span>set_default_partition_spec(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>spec_id: i32) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#884 id=884 data-nosnippet>884</a>        <span class="kw">if </span>spec_id == <span class="self">Self</span>::LAST_ADDED {
-<a href=#885 id=885 data-nosnippet>885</a>            spec_id = <span class="self">self</span>.last_added_spec_id.ok_or_else(|| {
-<a href=#886 id=886 data-nosnippet>886</a>                Error::new(
-<a href=#887 id=887 data-nosnippet>887</a>                    ErrorKind::DataInvalid,
-<a href=#888 id=888 data-nosnippet>888</a>                    <span class="string">"Cannot set default partition spec to last added spec: no spec has been added."</span>,
-<a href=#889 id=889 data-nosnippet>889</a>                )
-<a href=#890 id=890 data-nosnippet>890</a>            })<span class="question-mark">?</span>;
-<a href=#891 id=891 data-nosnippet>891</a>        }
-<a href=#892 id=892 data-nosnippet>892</a>
-<a href=#893 id=893 data-nosnippet>893</a>        <span class="kw">if </span><span class="self">self</span>.metadata.default_spec.spec_id() == spec_id {
-<a href=#894 id=894 data-nosnippet>894</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#895 id=895 data-nosnippet>895</a>        }
-<a href=#896 id=896 data-nosnippet>896</a>
-<a href=#897 id=897 data-nosnippet>897</a>        <span class="kw">if </span>!<span class="self">self</span>.metadata.partition_specs.contains_key(<span class="kw-2">&amp;</span>spec_id) {
-<a href=#898 id=898 data-nosnippet>898</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#899 id=899 data-nosnippet>899</a>                ErrorKind::DataInvalid,
-<a href=#900 id=900 data-nosnippet>900</a>                <span class="macro">format!</span>(<span class="string">"Cannot set default partition spec to unknown spec with id: '{spec_id}'"</span>,),
-<a href=#901 id=901 data-nosnippet>901</a>            ));
-<a href=#902 id=902 data-nosnippet>902</a>        }
-<a href=#903 id=903 data-nosnippet>903</a>
-<a href=#904 id=904 data-nosnippet>904</a>        <span class="kw">let </span>schemaless_spec = <span class="self">self
-<a href=#905 id=905 data-nosnippet>905</a>            </span>.metadata
-<a href=#906 id=906 data-nosnippet>906</a>            .partition_specs
-<a href=#907 id=907 data-nosnippet>907</a>            .get(<span class="kw-2">&amp;</span>spec_id)
-<a href=#908 id=908 data-nosnippet>908</a>            .ok_or_else(|| {
-<a href=#909 id=909 data-nosnippet>909</a>                Error::new(
-<a href=#910 id=910 data-nosnippet>910</a>                    ErrorKind::DataInvalid,
-<a href=#911 id=911 data-nosnippet>911</a>                    <span class="macro">format!</span>(
-<a href=#912 id=912 data-nosnippet>912</a>                        <span class="string">"Cannot set default partition spec to unknown spec with id: '{spec_id}'"</span>,
-<a href=#913 id=913 data-nosnippet>913</a>                    ),
-<a href=#914 id=914 data-nosnippet>914</a>                )
-<a href=#915 id=915 data-nosnippet>915</a>            })<span class="question-mark">?
-<a href=#916 id=916 data-nosnippet>916</a>            </span>.clone();
-<a href=#917 id=917 data-nosnippet>917</a>        <span class="kw">let </span>spec = Arc::unwrap_or_clone(schemaless_spec);
-<a href=#918 id=918 data-nosnippet>918</a>        <span class="kw">let </span>spec_type = spec.partition_type(<span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>)<span class="question-mark">?</span>;
-<a href=#919 id=919 data-nosnippet>919</a>        <span class="self">self</span>.metadata.default_spec = Arc::new(spec);
-<a href=#920 id=920 data-nosnippet>920</a>        <span class="self">self</span>.metadata.default_partition_type = spec_type;
-<a href=#921 id=921 data-nosnippet>921</a>
-<a href=#922 id=922 data-nosnippet>922</a>        <span class="kw">if </span><span class="self">self</span>.last_added_spec_id == <span class="prelude-val">Some</span>(spec_id) {
-<a href=#923 id=923 data-nosnippet>923</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSpec {
-<a href=#924 id=924 data-nosnippet>924</a>                spec_id: <span class="self">Self</span>::LAST_ADDED,
-<a href=#925 id=925 data-nosnippet>925</a>            });
-<a href=#926 id=926 data-nosnippet>926</a>        } <span class="kw">else </span>{
-<a href=#927 id=927 data-nosnippet>927</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSpec { spec_id });
-<a href=#928 id=928 data-nosnippet>928</a>        }
-<a href=#929 id=929 data-nosnippet>929</a>
-<a href=#930 id=930 data-nosnippet>930</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#931 id=931 data-nosnippet>931</a>    }
-<a href=#932 id=932 data-nosnippet>932</a>
-<a href=#933 id=933 data-nosnippet>933</a>    <span class="doccomment">/// Add a partition spec and set it as the default
-<a href=#934 id=934 data-nosnippet>934</a>    </span><span class="kw">pub fn </span>add_default_partition_spec(<span class="self">self</span>, unbound_spec: UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#935 id=935 data-nosnippet>935</a>        <span class="self">self</span>.add_partition_spec(unbound_spec)<span class="question-mark">?
-<a href=#936 id=936 data-nosnippet>936</a>            </span>.set_default_partition_spec(<span class="self">Self</span>::LAST_ADDED)
-<a href=#937 id=937 data-nosnippet>937</a>    }
-<a href=#938 id=938 data-nosnippet>938</a>
-<a href=#939 id=939 data-nosnippet>939</a>    <span class="doccomment">/// Remove partition specs by their ids from the table metadata.
-<a href=#940 id=940 data-nosnippet>940</a>    /// Does nothing if a spec id is not present. Active partition specs
-<a href=#941 id=941 data-nosnippet>941</a>    /// should not be removed.
-<a href=#942 id=942 data-nosnippet>942</a>    ///
-<a href=#943 id=943 data-nosnippet>943</a>    /// # Errors
-<a href=#944 id=944 data-nosnippet>944</a>    /// - Cannot remove the default partition spec.
-<a href=#945 id=945 data-nosnippet>945</a>    </span><span class="kw">pub fn </span>remove_partition_specs(<span class="kw-2">mut </span><span class="self">self</span>, spec_ids: <span class="kw-2">&amp;</span>[i32]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#946 id=946 data-nosnippet>946</a>        <span class="kw">if </span>spec_ids.contains(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.default_spec.spec_id()) {
-<a href=#947 id=947 data-nosnippet>947</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#948 id=948 data-nosnippet>948</a>                ErrorKind::DataInvalid,
-<a href=#949 id=949 data-nosnippet>949</a>                <span class="string">"Cannot remove default partition spec"</span>,
-<a href=#950 id=950 data-nosnippet>950</a>            ));
-<a href=#951 id=951 data-nosnippet>951</a>        }
-<a href=#952 id=952 data-nosnippet>952</a>
-<a href=#953 id=953 data-nosnippet>953</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_specs = Vec::with_capacity(spec_ids.len());
-<a href=#954 id=954 data-nosnippet>954</a>        spec_ids.iter().for_each(|id| {
-<a href=#955 id=955 data-nosnippet>955</a>            <span class="kw">if </span><span class="self">self</span>.metadata.partition_specs.remove(id).is_some() {
-<a href=#956 id=956 data-nosnippet>956</a>                removed_specs.push(<span class="kw-2">*</span>id);
-<a href=#957 id=957 data-nosnippet>957</a>            }
-<a href=#958 id=958 data-nosnippet>958</a>        });
-<a href=#959 id=959 data-nosnippet>959</a>
-<a href=#960 id=960 data-nosnippet>960</a>        <span class="kw">if </span>!removed_specs.is_empty() {
-<a href=#961 id=961 data-nosnippet>961</a>            <span class="self">self</span>.changes.push(TableUpdate::RemovePartitionSpecs {
-<a href=#962 id=962 data-nosnippet>962</a>                spec_ids: removed_specs,
-<a href=#963 id=963 data-nosnippet>963</a>            });
-<a href=#964 id=964 data-nosnippet>964</a>        }
-<a href=#965 id=965 data-nosnippet>965</a>
-<a href=#966 id=966 data-nosnippet>966</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#967 id=967 data-nosnippet>967</a>    }
-<a href=#968 id=968 data-nosnippet>968</a>
-<a href=#969 id=969 data-nosnippet>969</a>    <span class="doccomment">/// Add a sort order to the table metadata.
-<a href=#970 id=970 data-nosnippet>970</a>    ///
-<a href=#971 id=971 data-nosnippet>971</a>    /// The spec is bound eagerly to the current schema and must be valid for it.
-<a href=#972 id=972 data-nosnippet>972</a>    /// If a schema is added in the same set of changes, the schema should be added first.
-<a href=#973 id=973 data-nosnippet>973</a>    ///
-<a href=#974 id=974 data-nosnippet>974</a>    /// Even if `sort_order.order_id` is provided, it may not be used.
+<a href=#827 id=827 data-nosnippet>827</a>    /// Even if `unbound_spec.spec_id` is provided as `Some`, it may not be used.
+<a href=#828 id=828 data-nosnippet>828</a>    ///
+<a href=#829 id=829 data-nosnippet>829</a>    /// # Errors
+<a href=#830 id=830 data-nosnippet>830</a>    /// - The partition spec cannot be bound to the current schema.
+<a href=#831 id=831 data-nosnippet>831</a>    /// - The partition spec has non-sequential field ids and the table format version is 1.
+<a href=#832 id=832 data-nosnippet>832</a>    </span><span class="kw">pub fn </span>add_partition_spec(<span class="kw-2">mut </span><span class="self">self</span>, unbound_spec: UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#833 id=833 data-nosnippet>833</a>        <span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone();
+<a href=#834 id=834 data-nosnippet>834</a>
+<a href=#835 id=835 data-nosnippet>835</a>        <span class="comment">// Check if partition field names conflict with schema field names across all schemas
+<a href=#836 id=836 data-nosnippet>836</a>        </span><span class="self">self</span>.validate_partition_field_names(<span class="kw-2">&amp;</span>unbound_spec)<span class="question-mark">?</span>;
+<a href=#837 id=837 data-nosnippet>837</a>
+<a href=#838 id=838 data-nosnippet>838</a>        <span class="kw">let </span>spec = PartitionSpecBuilder::new_from_unbound(unbound_spec.clone(), schema)<span class="question-mark">?
+<a href=#839 id=839 data-nosnippet>839</a>            </span>.with_last_assigned_field_id(<span class="self">self</span>.metadata.last_partition_id)
+<a href=#840 id=840 data-nosnippet>840</a>            .build()<span class="question-mark">?</span>;
+<a href=#841 id=841 data-nosnippet>841</a>
+<a href=#842 id=842 data-nosnippet>842</a>        <span class="kw">let </span>new_spec_id = <span class="self">self</span>.reuse_or_create_new_spec_id(<span class="kw-2">&amp;</span>spec);
+<a href=#843 id=843 data-nosnippet>843</a>        <span class="kw">let </span>spec_found = <span class="self">self</span>.metadata.partition_specs.contains_key(<span class="kw-2">&amp;</span>new_spec_id);
+<a href=#844 id=844 data-nosnippet>844</a>        <span class="kw">let </span>spec = spec.with_spec_id(new_spec_id);
+<a href=#845 id=845 data-nosnippet>845</a>        <span class="kw">let </span>unbound_spec = unbound_spec.with_spec_id(new_spec_id);
+<a href=#846 id=846 data-nosnippet>846</a>
+<a href=#847 id=847 data-nosnippet>847</a>        <span class="kw">if </span>spec_found {
+<a href=#848 id=848 data-nosnippet>848</a>            <span class="kw">if </span><span class="self">self</span>.last_added_spec_id != <span class="prelude-val">Some</span>(new_spec_id) {
+<a href=#849 id=849 data-nosnippet>849</a>                <span class="self">self</span>.changes
+<a href=#850 id=850 data-nosnippet>850</a>                    .push(TableUpdate::AddSpec { spec: unbound_spec });
+<a href=#851 id=851 data-nosnippet>851</a>                <span class="self">self</span>.last_added_spec_id = <span class="prelude-val">Some</span>(new_spec_id);
+<a href=#852 id=852 data-nosnippet>852</a>            }
+<a href=#853 id=853 data-nosnippet>853</a>
+<a href=#854 id=854 data-nosnippet>854</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#855 id=855 data-nosnippet>855</a>        }
+<a href=#856 id=856 data-nosnippet>856</a>
+<a href=#857 id=857 data-nosnippet>857</a>        <span class="kw">if </span><span class="self">self</span>.metadata.format_version &lt;= FormatVersion::V1 &amp;&amp; !spec.has_sequential_ids() {
+<a href=#858 id=858 data-nosnippet>858</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#859 id=859 data-nosnippet>859</a>                ErrorKind::DataInvalid,
+<a href=#860 id=860 data-nosnippet>860</a>                <span class="string">"Cannot add partition spec with non-sequential field ids to format version 1 table"</span>,
+<a href=#861 id=861 data-nosnippet>861</a>            ));
+<a href=#862 id=862 data-nosnippet>862</a>        }
+<a href=#863 id=863 data-nosnippet>863</a>
+<a href=#864 id=864 data-nosnippet>864</a>        <span class="kw">let </span>highest_field_id = spec
+<a href=#865 id=865 data-nosnippet>865</a>            .highest_field_id()
+<a href=#866 id=866 data-nosnippet>866</a>            .unwrap_or(UNPARTITIONED_LAST_ASSIGNED_ID);
+<a href=#867 id=867 data-nosnippet>867</a>        <span class="self">self</span>.metadata
+<a href=#868 id=868 data-nosnippet>868</a>            .partition_specs
+<a href=#869 id=869 data-nosnippet>869</a>            .insert(new_spec_id, Arc::new(spec));
+<a href=#870 id=870 data-nosnippet>870</a>        <span class="self">self</span>.changes
+<a href=#871 id=871 data-nosnippet>871</a>            .push(TableUpdate::AddSpec { spec: unbound_spec });
+<a href=#872 id=872 data-nosnippet>872</a>
+<a href=#873 id=873 data-nosnippet>873</a>        <span class="self">self</span>.last_added_spec_id = <span class="prelude-val">Some</span>(new_spec_id);
+<a href=#874 id=874 data-nosnippet>874</a>        <span class="self">self</span>.metadata.last_partition_id =
+<a href=#875 id=875 data-nosnippet>875</a>            std::cmp::max(<span class="self">self</span>.metadata.last_partition_id, highest_field_id);
+<a href=#876 id=876 data-nosnippet>876</a>
+<a href=#877 id=877 data-nosnippet>877</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#878 id=878 data-nosnippet>878</a>    }
+<a href=#879 id=879 data-nosnippet>879</a>
+<a href=#880 id=880 data-nosnippet>880</a>    <span class="doccomment">/// Set the default partition spec.
+<a href=#881 id=881 data-nosnippet>881</a>    ///
+<a href=#882 id=882 data-nosnippet>882</a>    /// # Errors
+<a href=#883 id=883 data-nosnippet>883</a>    /// - spec_id is -1 but no spec has been added via `add_partition_spec`.
+<a href=#884 id=884 data-nosnippet>884</a>    /// - No partition spec with the provided `spec_id` exists.
+<a href=#885 id=885 data-nosnippet>885</a>    </span><span class="kw">pub fn </span>set_default_partition_spec(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>spec_id: i32) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#886 id=886 data-nosnippet>886</a>        <span class="kw">if </span>spec_id == <span class="self">Self</span>::LAST_ADDED {
+<a href=#887 id=887 data-nosnippet>887</a>            spec_id = <span class="self">self</span>.last_added_spec_id.ok_or_else(|| {
+<a href=#888 id=888 data-nosnippet>888</a>                Error::new(
+<a href=#889 id=889 data-nosnippet>889</a>                    ErrorKind::DataInvalid,
+<a href=#890 id=890 data-nosnippet>890</a>                    <span class="string">"Cannot set default partition spec to last added spec: no spec has been added."</span>,
+<a href=#891 id=891 data-nosnippet>891</a>                )
+<a href=#892 id=892 data-nosnippet>892</a>            })<span class="question-mark">?</span>;
+<a href=#893 id=893 data-nosnippet>893</a>        }
+<a href=#894 id=894 data-nosnippet>894</a>
+<a href=#895 id=895 data-nosnippet>895</a>        <span class="kw">if </span><span class="self">self</span>.metadata.default_spec.spec_id() == spec_id {
+<a href=#896 id=896 data-nosnippet>896</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#897 id=897 data-nosnippet>897</a>        }
+<a href=#898 id=898 data-nosnippet>898</a>
+<a href=#899 id=899 data-nosnippet>899</a>        <span class="kw">if </span>!<span class="self">self</span>.metadata.partition_specs.contains_key(<span class="kw-2">&amp;</span>spec_id) {
+<a href=#900 id=900 data-nosnippet>900</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#901 id=901 data-nosnippet>901</a>                ErrorKind::DataInvalid,
+<a href=#902 id=902 data-nosnippet>902</a>                <span class="macro">format!</span>(<span class="string">"Cannot set default partition spec to unknown spec with id: '{spec_id}'"</span>,),
+<a href=#903 id=903 data-nosnippet>903</a>            ));
+<a href=#904 id=904 data-nosnippet>904</a>        }
+<a href=#905 id=905 data-nosnippet>905</a>
+<a href=#906 id=906 data-nosnippet>906</a>        <span class="kw">let </span>schemaless_spec = <span class="self">self
+<a href=#907 id=907 data-nosnippet>907</a>            </span>.metadata
+<a href=#908 id=908 data-nosnippet>908</a>            .partition_specs
+<a href=#909 id=909 data-nosnippet>909</a>            .get(<span class="kw-2">&amp;</span>spec_id)
+<a href=#910 id=910 data-nosnippet>910</a>            .ok_or_else(|| {
+<a href=#911 id=911 data-nosnippet>911</a>                Error::new(
+<a href=#912 id=912 data-nosnippet>912</a>                    ErrorKind::DataInvalid,
+<a href=#913 id=913 data-nosnippet>913</a>                    <span class="macro">format!</span>(
+<a href=#914 id=914 data-nosnippet>914</a>                        <span class="string">"Cannot set default partition spec to unknown spec with id: '{spec_id}'"</span>,
+<a href=#915 id=915 data-nosnippet>915</a>                    ),
+<a href=#916 id=916 data-nosnippet>916</a>                )
+<a href=#917 id=917 data-nosnippet>917</a>            })<span class="question-mark">?
+<a href=#918 id=918 data-nosnippet>918</a>            </span>.clone();
+<a href=#919 id=919 data-nosnippet>919</a>        <span class="kw">let </span>spec = Arc::unwrap_or_clone(schemaless_spec);
+<a href=#920 id=920 data-nosnippet>920</a>        <span class="kw">let </span>spec_type = spec.partition_type(<span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>)<span class="question-mark">?</span>;
+<a href=#921 id=921 data-nosnippet>921</a>        <span class="self">self</span>.metadata.default_spec = Arc::new(spec);
+<a href=#922 id=922 data-nosnippet>922</a>        <span class="self">self</span>.metadata.default_partition_type = spec_type;
+<a href=#923 id=923 data-nosnippet>923</a>
+<a href=#924 id=924 data-nosnippet>924</a>        <span class="kw">if </span><span class="self">self</span>.last_added_spec_id == <span class="prelude-val">Some</span>(spec_id) {
+<a href=#925 id=925 data-nosnippet>925</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSpec {
+<a href=#926 id=926 data-nosnippet>926</a>                spec_id: <span class="self">Self</span>::LAST_ADDED,
+<a href=#927 id=927 data-nosnippet>927</a>            });
+<a href=#928 id=928 data-nosnippet>928</a>        } <span class="kw">else </span>{
+<a href=#929 id=929 data-nosnippet>929</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSpec { spec_id });
+<a href=#930 id=930 data-nosnippet>930</a>        }
+<a href=#931 id=931 data-nosnippet>931</a>
+<a href=#932 id=932 data-nosnippet>932</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#933 id=933 data-nosnippet>933</a>    }
+<a href=#934 id=934 data-nosnippet>934</a>
+<a href=#935 id=935 data-nosnippet>935</a>    <span class="doccomment">/// Add a partition spec and set it as the default
+<a href=#936 id=936 data-nosnippet>936</a>    </span><span class="kw">pub fn </span>add_default_partition_spec(<span class="self">self</span>, unbound_spec: UnboundPartitionSpec) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#937 id=937 data-nosnippet>937</a>        <span class="self">self</span>.add_partition_spec(unbound_spec)<span class="question-mark">?
+<a href=#938 id=938 data-nosnippet>938</a>            </span>.set_default_partition_spec(<span class="self">Self</span>::LAST_ADDED)
+<a href=#939 id=939 data-nosnippet>939</a>    }
+<a href=#940 id=940 data-nosnippet>940</a>
+<a href=#941 id=941 data-nosnippet>941</a>    <span class="doccomment">/// Remove partition specs by their ids from the table metadata.
+<a href=#942 id=942 data-nosnippet>942</a>    /// Does nothing if a spec id is not present. Active partition specs
+<a href=#943 id=943 data-nosnippet>943</a>    /// should not be removed.
+<a href=#944 id=944 data-nosnippet>944</a>    ///
+<a href=#945 id=945 data-nosnippet>945</a>    /// # Errors
+<a href=#946 id=946 data-nosnippet>946</a>    /// - Cannot remove the default partition spec.
+<a href=#947 id=947 data-nosnippet>947</a>    </span><span class="kw">pub fn </span>remove_partition_specs(<span class="kw-2">mut </span><span class="self">self</span>, spec_ids: <span class="kw-2">&amp;</span>[i32]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#948 id=948 data-nosnippet>948</a>        <span class="kw">if </span>spec_ids.contains(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.default_spec.spec_id()) {
+<a href=#949 id=949 data-nosnippet>949</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#950 id=950 data-nosnippet>950</a>                ErrorKind::DataInvalid,
+<a href=#951 id=951 data-nosnippet>951</a>                <span class="string">"Cannot remove default partition spec"</span>,
+<a href=#952 id=952 data-nosnippet>952</a>            ));
+<a href=#953 id=953 data-nosnippet>953</a>        }
+<a href=#954 id=954 data-nosnippet>954</a>
+<a href=#955 id=955 data-nosnippet>955</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_specs = Vec::with_capacity(spec_ids.len());
+<a href=#956 id=956 data-nosnippet>956</a>        spec_ids.iter().for_each(|id| {
+<a href=#957 id=957 data-nosnippet>957</a>            <span class="kw">if </span><span class="self">self</span>.metadata.partition_specs.remove(id).is_some() {
+<a href=#958 id=958 data-nosnippet>958</a>                removed_specs.push(<span class="kw-2">*</span>id);
+<a href=#959 id=959 data-nosnippet>959</a>            }
+<a href=#960 id=960 data-nosnippet>960</a>        });
+<a href=#961 id=961 data-nosnippet>961</a>
+<a href=#962 id=962 data-nosnippet>962</a>        <span class="kw">if </span>!removed_specs.is_empty() {
+<a href=#963 id=963 data-nosnippet>963</a>            <span class="self">self</span>.changes.push(TableUpdate::RemovePartitionSpecs {
+<a href=#964 id=964 data-nosnippet>964</a>                spec_ids: removed_specs,
+<a href=#965 id=965 data-nosnippet>965</a>            });
+<a href=#966 id=966 data-nosnippet>966</a>        }
+<a href=#967 id=967 data-nosnippet>967</a>
+<a href=#968 id=968 data-nosnippet>968</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#969 id=969 data-nosnippet>969</a>    }
+<a href=#970 id=970 data-nosnippet>970</a>
+<a href=#971 id=971 data-nosnippet>971</a>    <span class="doccomment">/// Add a sort order to the table metadata.
+<a href=#972 id=972 data-nosnippet>972</a>    ///
+<a href=#973 id=973 data-nosnippet>973</a>    /// The spec is bound eagerly to the current schema and must be valid for it.
+<a href=#974 id=974 data-nosnippet>974</a>    /// If a schema is added in the same set of changes, the schema should be added first.
 <a href=#975 id=975 data-nosnippet>975</a>    ///
-<a href=#976 id=976 data-nosnippet>976</a>    /// # Errors
-<a href=#977 id=977 data-nosnippet>977</a>    /// - Sort order id to add already exists.
-<a href=#978 id=978 data-nosnippet>978</a>    /// - Sort order is incompatible with the current schema.
-<a href=#979 id=979 data-nosnippet>979</a>    </span><span class="kw">pub fn </span>add_sort_order(<span class="kw-2">mut </span><span class="self">self</span>, sort_order: SortOrder) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#980 id=980 data-nosnippet>980</a>        <span class="kw">let </span>new_order_id = <span class="self">self</span>.reuse_or_create_new_sort_id(<span class="kw-2">&amp;</span>sort_order);
-<a href=#981 id=981 data-nosnippet>981</a>        <span class="kw">let </span>sort_order_found = <span class="self">self</span>.metadata.sort_orders.contains_key(<span class="kw-2">&amp;</span>new_order_id);
-<a href=#982 id=982 data-nosnippet>982</a>
-<a href=#983 id=983 data-nosnippet>983</a>        <span class="kw">if </span>sort_order_found {
-<a href=#984 id=984 data-nosnippet>984</a>            <span class="kw">if </span><span class="self">self</span>.last_added_order_id != <span class="prelude-val">Some</span>(new_order_id) {
-<a href=#985 id=985 data-nosnippet>985</a>                <span class="self">self</span>.changes.push(TableUpdate::AddSortOrder {
-<a href=#986 id=986 data-nosnippet>986</a>                    sort_order: sort_order.clone().with_order_id(new_order_id),
-<a href=#987 id=987 data-nosnippet>987</a>                });
-<a href=#988 id=988 data-nosnippet>988</a>                <span class="self">self</span>.last_added_order_id = <span class="prelude-val">Some</span>(new_order_id);
-<a href=#989 id=989 data-nosnippet>989</a>            }
-<a href=#990 id=990 data-nosnippet>990</a>
-<a href=#991 id=991 data-nosnippet>991</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#992 id=992 data-nosnippet>992</a>        }
-<a href=#993 id=993 data-nosnippet>993</a>
-<a href=#994 id=994 data-nosnippet>994</a>        <span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone().as_ref().clone();
-<a href=#995 id=995 data-nosnippet>995</a>        <span class="kw">let </span>sort_order = SortOrder::builder()
-<a href=#996 id=996 data-nosnippet>996</a>            .with_order_id(new_order_id)
-<a href=#997 id=997 data-nosnippet>997</a>            .with_fields(sort_order.fields)
-<a href=#998 id=998 data-nosnippet>998</a>            .build(<span class="kw-2">&amp;</span>schema)
-<a href=#999 id=999 data-nosnippet>999</a>            .map_err(|e| {
-<a href=#1000 id=1000 data-nosnippet>1000</a>                Error::new(
-<a href=#1001 id=1001 data-nosnippet>1001</a>                    ErrorKind::DataInvalid,
-<a href=#1002 id=1002 data-nosnippet>1002</a>                    <span class="macro">format!</span>(<span class="string">"Sort order to add is incompatible with current schema: {e}"</span>),
-<a href=#1003 id=1003 data-nosnippet>1003</a>                )
-<a href=#1004 id=1004 data-nosnippet>1004</a>                .with_source(e)
-<a href=#1005 id=1005 data-nosnippet>1005</a>            })<span class="question-mark">?</span>;
-<a href=#1006 id=1006 data-nosnippet>1006</a>
-<a href=#1007 id=1007 data-nosnippet>1007</a>        <span class="self">self</span>.last_added_order_id = <span class="prelude-val">Some</span>(new_order_id);
-<a href=#1008 id=1008 data-nosnippet>1008</a>        <span class="self">self</span>.metadata
-<a href=#1009 id=1009 data-nosnippet>1009</a>            .sort_orders
-<a href=#1010 id=1010 data-nosnippet>1010</a>            .insert(new_order_id, sort_order.clone().into());
-<a href=#1011 id=1011 data-nosnippet>1011</a>        <span class="self">self</span>.changes.push(TableUpdate::AddSortOrder { sort_order });
-<a href=#1012 id=1012 data-nosnippet>1012</a>
-<a href=#1013 id=1013 data-nosnippet>1013</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#1014 id=1014 data-nosnippet>1014</a>    }
-<a href=#1015 id=1015 data-nosnippet>1015</a>
-<a href=#1016 id=1016 data-nosnippet>1016</a>    <span class="doccomment">/// Set the default sort order. If `sort_order_id` is -1, the last added sort order is set as default.
-<a href=#1017 id=1017 data-nosnippet>1017</a>    ///
-<a href=#1018 id=1018 data-nosnippet>1018</a>    /// # Errors
-<a href=#1019 id=1019 data-nosnippet>1019</a>    /// - sort_order_id is -1 but no sort order has been added via `add_sort_order`.
-<a href=#1020 id=1020 data-nosnippet>1020</a>    /// - No sort order with the provided `sort_order_id` exists.
-<a href=#1021 id=1021 data-nosnippet>1021</a>    </span><span class="kw">pub fn </span>set_default_sort_order(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>sort_order_id: i64) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#1022 id=1022 data-nosnippet>1022</a>        <span class="kw">if </span>sort_order_id == <span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64 {
-<a href=#1023 id=1023 data-nosnippet>1023</a>            sort_order_id = <span class="self">self</span>.last_added_order_id.ok_or_else(|| {
-<a href=#1024 id=1024 data-nosnippet>1024</a>                Error::new(
-<a href=#1025 id=1025 data-nosnippet>1025</a>                    ErrorKind::DataInvalid,
-<a href=#1026 id=1026 data-nosnippet>1026</a>                    <span class="string">"Cannot set default sort order to last added order: no order has been added."</span>,
-<a href=#1027 id=1027 data-nosnippet>1027</a>                )
-<a href=#1028 id=1028 data-nosnippet>1028</a>            })<span class="question-mark">?</span>;
-<a href=#1029 id=1029 data-nosnippet>1029</a>        }
-<a href=#1030 id=1030 data-nosnippet>1030</a>
-<a href=#1031 id=1031 data-nosnippet>1031</a>        <span class="kw">if </span><span class="self">self</span>.metadata.default_sort_order_id == sort_order_id {
-<a href=#1032 id=1032 data-nosnippet>1032</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#1033 id=1033 data-nosnippet>1033</a>        }
-<a href=#1034 id=1034 data-nosnippet>1034</a>
-<a href=#1035 id=1035 data-nosnippet>1035</a>        <span class="kw">if </span>!<span class="self">self</span>.metadata.sort_orders.contains_key(<span class="kw-2">&amp;</span>sort_order_id) {
-<a href=#1036 id=1036 data-nosnippet>1036</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#1037 id=1037 data-nosnippet>1037</a>                ErrorKind::DataInvalid,
-<a href=#1038 id=1038 data-nosnippet>1038</a>                <span class="macro">format!</span>(
-<a href=#1039 id=1039 data-nosnippet>1039</a>                    <span class="string">"Cannot set default sort order to unknown order with id: '{sort_order_id}'"
-<a href=#1040 id=1040 data-nosnippet>1040</a>                </span>),
-<a href=#1041 id=1041 data-nosnippet>1041</a>            ));
-<a href=#1042 id=1042 data-nosnippet>1042</a>        }
-<a href=#1043 id=1043 data-nosnippet>1043</a>
-<a href=#1044 id=1044 data-nosnippet>1044</a>        <span class="self">self</span>.metadata.default_sort_order_id = sort_order_id;
+<a href=#976 id=976 data-nosnippet>976</a>    /// Even if `sort_order.order_id` is provided, it may not be used.
+<a href=#977 id=977 data-nosnippet>977</a>    ///
+<a href=#978 id=978 data-nosnippet>978</a>    /// # Errors
+<a href=#979 id=979 data-nosnippet>979</a>    /// - Sort order id to add already exists.
+<a href=#980 id=980 data-nosnippet>980</a>    /// - Sort order is incompatible with the current schema.
+<a href=#981 id=981 data-nosnippet>981</a>    </span><span class="kw">pub fn </span>add_sort_order(<span class="kw-2">mut </span><span class="self">self</span>, sort_order: SortOrder) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#982 id=982 data-nosnippet>982</a>        <span class="kw">let </span>new_order_id = <span class="self">self</span>.reuse_or_create_new_sort_id(<span class="kw-2">&amp;</span>sort_order);
+<a href=#983 id=983 data-nosnippet>983</a>        <span class="kw">let </span>sort_order_found = <span class="self">self</span>.metadata.sort_orders.contains_key(<span class="kw-2">&amp;</span>new_order_id);
+<a href=#984 id=984 data-nosnippet>984</a>
+<a href=#985 id=985 data-nosnippet>985</a>        <span class="kw">if </span>sort_order_found {
+<a href=#986 id=986 data-nosnippet>986</a>            <span class="kw">if </span><span class="self">self</span>.last_added_order_id != <span class="prelude-val">Some</span>(new_order_id) {
+<a href=#987 id=987 data-nosnippet>987</a>                <span class="self">self</span>.changes.push(TableUpdate::AddSortOrder {
+<a href=#988 id=988 data-nosnippet>988</a>                    sort_order: sort_order.clone().with_order_id(new_order_id),
+<a href=#989 id=989 data-nosnippet>989</a>                });
+<a href=#990 id=990 data-nosnippet>990</a>                <span class="self">self</span>.last_added_order_id = <span class="prelude-val">Some</span>(new_order_id);
+<a href=#991 id=991 data-nosnippet>991</a>            }
+<a href=#992 id=992 data-nosnippet>992</a>
+<a href=#993 id=993 data-nosnippet>993</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#994 id=994 data-nosnippet>994</a>        }
+<a href=#995 id=995 data-nosnippet>995</a>
+<a href=#996 id=996 data-nosnippet>996</a>        <span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone().as_ref().clone();
+<a href=#997 id=997 data-nosnippet>997</a>        <span class="kw">let </span>sort_order = SortOrder::builder()
+<a href=#998 id=998 data-nosnippet>998</a>            .with_order_id(new_order_id)
+<a href=#999 id=999 data-nosnippet>999</a>            .with_fields(sort_order.fields)
+<a href=#1000 id=1000 data-nosnippet>1000</a>            .build(<span class="kw-2">&amp;</span>schema)
+<a href=#1001 id=1001 data-nosnippet>1001</a>            .map_err(|e| {
+<a href=#1002 id=1002 data-nosnippet>1002</a>                Error::new(
+<a href=#1003 id=1003 data-nosnippet>1003</a>                    ErrorKind::DataInvalid,
+<a href=#1004 id=1004 data-nosnippet>1004</a>                    <span class="macro">format!</span>(<span class="string">"Sort order to add is incompatible with current schema: {e}"</span>),
+<a href=#1005 id=1005 data-nosnippet>1005</a>                )
+<a href=#1006 id=1006 data-nosnippet>1006</a>                .with_source(e)
+<a href=#1007 id=1007 data-nosnippet>1007</a>            })<span class="question-mark">?</span>;
+<a href=#1008 id=1008 data-nosnippet>1008</a>
+<a href=#1009 id=1009 data-nosnippet>1009</a>        <span class="self">self</span>.last_added_order_id = <span class="prelude-val">Some</span>(new_order_id);
+<a href=#1010 id=1010 data-nosnippet>1010</a>        <span class="self">self</span>.metadata
+<a href=#1011 id=1011 data-nosnippet>1011</a>            .sort_orders
+<a href=#1012 id=1012 data-nosnippet>1012</a>            .insert(new_order_id, sort_order.clone().into());
+<a href=#1013 id=1013 data-nosnippet>1013</a>        <span class="self">self</span>.changes.push(TableUpdate::AddSortOrder { sort_order });
+<a href=#1014 id=1014 data-nosnippet>1014</a>
+<a href=#1015 id=1015 data-nosnippet>1015</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#1016 id=1016 data-nosnippet>1016</a>    }
+<a href=#1017 id=1017 data-nosnippet>1017</a>
+<a href=#1018 id=1018 data-nosnippet>1018</a>    <span class="doccomment">/// Set the default sort order. If `sort_order_id` is -1, the last added sort order is set as default.
+<a href=#1019 id=1019 data-nosnippet>1019</a>    ///
+<a href=#1020 id=1020 data-nosnippet>1020</a>    /// # Errors
+<a href=#1021 id=1021 data-nosnippet>1021</a>    /// - sort_order_id is -1 but no sort order has been added via `add_sort_order`.
+<a href=#1022 id=1022 data-nosnippet>1022</a>    /// - No sort order with the provided `sort_order_id` exists.
+<a href=#1023 id=1023 data-nosnippet>1023</a>    </span><span class="kw">pub fn </span>set_default_sort_order(<span class="kw-2">mut </span><span class="self">self</span>, <span class="kw-2">mut </span>sort_order_id: i64) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#1024 id=1024 data-nosnippet>1024</a>        <span class="kw">if </span>sort_order_id == <span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64 {
+<a href=#1025 id=1025 data-nosnippet>1025</a>            sort_order_id = <span class="self">self</span>.last_added_order_id.ok_or_else(|| {
+<a href=#1026 id=1026 data-nosnippet>1026</a>                Error::new(
+<a href=#1027 id=1027 data-nosnippet>1027</a>                    ErrorKind::DataInvalid,
+<a href=#1028 id=1028 data-nosnippet>1028</a>                    <span class="string">"Cannot set default sort order to last added order: no order has been added."</span>,
+<a href=#1029 id=1029 data-nosnippet>1029</a>                )
+<a href=#1030 id=1030 data-nosnippet>1030</a>            })<span class="question-mark">?</span>;
+<a href=#1031 id=1031 data-nosnippet>1031</a>        }
+<a href=#1032 id=1032 data-nosnippet>1032</a>
+<a href=#1033 id=1033 data-nosnippet>1033</a>        <span class="kw">if </span><span class="self">self</span>.metadata.default_sort_order_id == sort_order_id {
+<a href=#1034 id=1034 data-nosnippet>1034</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#1035 id=1035 data-nosnippet>1035</a>        }
+<a href=#1036 id=1036 data-nosnippet>1036</a>
+<a href=#1037 id=1037 data-nosnippet>1037</a>        <span class="kw">if </span>!<span class="self">self</span>.metadata.sort_orders.contains_key(<span class="kw-2">&amp;</span>sort_order_id) {
+<a href=#1038 id=1038 data-nosnippet>1038</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#1039 id=1039 data-nosnippet>1039</a>                ErrorKind::DataInvalid,
+<a href=#1040 id=1040 data-nosnippet>1040</a>                <span class="macro">format!</span>(
+<a href=#1041 id=1041 data-nosnippet>1041</a>                    <span class="string">"Cannot set default sort order to unknown order with id: '{sort_order_id}'"
+<a href=#1042 id=1042 data-nosnippet>1042</a>                </span>),
+<a href=#1043 id=1043 data-nosnippet>1043</a>            ));
+<a href=#1044 id=1044 data-nosnippet>1044</a>        }
 <a href=#1045 id=1045 data-nosnippet>1045</a>
-<a href=#1046 id=1046 data-nosnippet>1046</a>        <span class="kw">if </span><span class="self">self</span>.last_added_order_id == <span class="prelude-val">Some</span>(sort_order_id) {
-<a href=#1047 id=1047 data-nosnippet>1047</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSortOrder {
-<a href=#1048 id=1048 data-nosnippet>1048</a>                sort_order_id: <span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64,
-<a href=#1049 id=1049 data-nosnippet>1049</a>            });
-<a href=#1050 id=1050 data-nosnippet>1050</a>        } <span class="kw">else </span>{
-<a href=#1051 id=1051 data-nosnippet>1051</a>            <span class="self">self</span>.changes
-<a href=#1052 id=1052 data-nosnippet>1052</a>                .push(TableUpdate::SetDefaultSortOrder { sort_order_id });
-<a href=#1053 id=1053 data-nosnippet>1053</a>        }
-<a href=#1054 id=1054 data-nosnippet>1054</a>
-<a href=#1055 id=1055 data-nosnippet>1055</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#1056 id=1056 data-nosnippet>1056</a>    }
-<a href=#1057 id=1057 data-nosnippet>1057</a>
-<a href=#1058 id=1058 data-nosnippet>1058</a>    <span class="doccomment">/// Add a sort order and set it as the default
-<a href=#1059 id=1059 data-nosnippet>1059</a>    </span><span class="kw">fn </span>add_default_sort_order(<span class="self">self</span>, sort_order: SortOrder) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#1060 id=1060 data-nosnippet>1060</a>        <span class="self">self</span>.add_sort_order(sort_order)<span class="question-mark">?
-<a href=#1061 id=1061 data-nosnippet>1061</a>            </span>.set_default_sort_order(<span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64)
-<a href=#1062 id=1062 data-nosnippet>1062</a>    }
-<a href=#1063 id=1063 data-nosnippet>1063</a>
-<a href=#1064 id=1064 data-nosnippet>1064</a>    <span class="doccomment">/// Add an encryption key to the table metadata.
-<a href=#1065 id=1065 data-nosnippet>1065</a>    </span><span class="kw">pub fn </span>add_encryption_key(<span class="kw-2">mut </span><span class="self">self</span>, key: EncryptedKey) -&gt; <span class="self">Self </span>{
-<a href=#1066 id=1066 data-nosnippet>1066</a>        <span class="kw">let </span>key_id = key.key_id().to_string();
-<a href=#1067 id=1067 data-nosnippet>1067</a>        <span class="kw">if </span><span class="self">self</span>.metadata.encryption_keys.contains_key(<span class="kw-2">&amp;</span>key_id) {
-<a href=#1068 id=1068 data-nosnippet>1068</a>            <span class="comment">// already exists
-<a href=#1069 id=1069 data-nosnippet>1069</a>            </span><span class="kw">return </span><span class="self">self</span>;
-<a href=#1070 id=1070 data-nosnippet>1070</a>        }
-<a href=#1071 id=1071 data-nosnippet>1071</a>
-<a href=#1072 id=1072 data-nosnippet>1072</a>        <span class="self">self</span>.metadata.encryption_keys.insert(key_id, key.clone());
-<a href=#1073 id=1073 data-nosnippet>1073</a>        <span class="self">self</span>.changes.push(TableUpdate::AddEncryptionKey {
-<a href=#1074 id=1074 data-nosnippet>1074</a>            encryption_key: key,
-<a href=#1075 id=1075 data-nosnippet>1075</a>        });
-<a href=#1076 id=1076 data-nosnippet>1076</a>        <span class="self">self
-<a href=#1077 id=1077 data-nosnippet>1077</a>    </span>}
-<a href=#1078 id=1078 data-nosnippet>1078</a>
-<a href=#1079 id=1079 data-nosnippet>1079</a>    <span class="doccomment">/// Remove an encryption key from the table metadata.
-<a href=#1080 id=1080 data-nosnippet>1080</a>    </span><span class="kw">pub fn </span>remove_encryption_key(<span class="kw-2">mut </span><span class="self">self</span>, key_id: <span class="kw-2">&amp;</span>str) -&gt; <span class="self">Self </span>{
-<a href=#1081 id=1081 data-nosnippet>1081</a>        <span class="kw">if </span><span class="self">self</span>.metadata.encryption_keys.remove(key_id).is_some() {
-<a href=#1082 id=1082 data-nosnippet>1082</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveEncryptionKey {
-<a href=#1083 id=1083 data-nosnippet>1083</a>                key_id: key_id.to_string(),
-<a href=#1084 id=1084 data-nosnippet>1084</a>            });
-<a href=#1085 id=1085 data-nosnippet>1085</a>        }
-<a href=#1086 id=1086 data-nosnippet>1086</a>        <span class="self">self
-<a href=#1087 id=1087 data-nosnippet>1087</a>    </span>}
-<a href=#1088 id=1088 data-nosnippet>1088</a>
-<a href=#1089 id=1089 data-nosnippet>1089</a>    <span class="doccomment">/// Build the table metadata.
-<a href=#1090 id=1090 data-nosnippet>1090</a>    </span><span class="kw">pub fn </span>build(<span class="kw-2">mut </span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;TableMetadataBuildResult&gt; {
-<a href=#1091 id=1091 data-nosnippet>1091</a>        <span class="self">self</span>.metadata.last_updated_ms = <span class="self">self
-<a href=#1092 id=1092 data-nosnippet>1092</a>            </span>.last_updated_ms
-<a href=#1093 id=1093 data-nosnippet>1093</a>            .unwrap_or_else(|| chrono::Utc::now().timestamp_millis());
-<a href=#1094 id=1094 data-nosnippet>1094</a>
-<a href=#1095 id=1095 data-nosnippet>1095</a>        <span class="comment">// Check compatibility of the current schema to the default partition spec and sort order.
-<a href=#1096 id=1096 data-nosnippet>1096</a>        // We use the `get_xxx` methods from the builder to avoid using the panicking
-<a href=#1097 id=1097 data-nosnippet>1097</a>        // `TableMetadata.default_partition_spec` etc. methods.
-<a href=#1098 id=1098 data-nosnippet>1098</a>        </span><span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone();
-<a href=#1099 id=1099 data-nosnippet>1099</a>        <span class="kw">let </span>sort_order = Arc::unwrap_or_clone(<span class="self">self</span>.get_default_sort_order()<span class="question-mark">?</span>);
-<a href=#1100 id=1100 data-nosnippet>1100</a>
-<a href=#1101 id=1101 data-nosnippet>1101</a>        <span class="self">self</span>.metadata.default_spec = Arc::new(
-<a href=#1102 id=1102 data-nosnippet>1102</a>            Arc::unwrap_or_clone(<span class="self">self</span>.metadata.default_spec)
-<a href=#1103 id=1103 data-nosnippet>1103</a>                .into_unbound()
-<a href=#1104 id=1104 data-nosnippet>1104</a>                .bind(schema.clone())<span class="question-mark">?</span>,
-<a href=#1105 id=1105 data-nosnippet>1105</a>        );
-<a href=#1106 id=1106 data-nosnippet>1106</a>        <span class="self">self</span>.metadata.default_partition_type =
-<a href=#1107 id=1107 data-nosnippet>1107</a>            <span class="self">self</span>.metadata.default_spec.partition_type(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
-<a href=#1108 id=1108 data-nosnippet>1108</a>        SortOrder::builder()
-<a href=#1109 id=1109 data-nosnippet>1109</a>            .with_fields(sort_order.fields)
-<a href=#1110 id=1110 data-nosnippet>1110</a>            .build(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
-<a href=#1111 id=1111 data-nosnippet>1111</a>
-<a href=#1112 id=1112 data-nosnippet>1112</a>        <span class="self">self</span>.update_snapshot_log()<span class="question-mark">?</span>;
-<a href=#1113 id=1113 data-nosnippet>1113</a>        <span class="self">self</span>.metadata.try_normalize()<span class="question-mark">?</span>;
-<a href=#1114 id=1114 data-nosnippet>1114</a>
-<a href=#1115 id=1115 data-nosnippet>1115</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(hist_entry) = <span class="self">self</span>.previous_history_entry.take() {
-<a href=#1116 id=1116 data-nosnippet>1116</a>            <span class="self">self</span>.metadata.metadata_log.push(hist_entry);
-<a href=#1117 id=1117 data-nosnippet>1117</a>        }
-<a href=#1118 id=1118 data-nosnippet>1118</a>        <span class="kw">let </span>expired_metadata_logs = <span class="self">self</span>.expire_metadata_log();
-<a href=#1119 id=1119 data-nosnippet>1119</a>
-<a href=#1120 id=1120 data-nosnippet>1120</a>        <span class="prelude-val">Ok</span>(TableMetadataBuildResult {
-<a href=#1121 id=1121 data-nosnippet>1121</a>            metadata: <span class="self">self</span>.metadata,
-<a href=#1122 id=1122 data-nosnippet>1122</a>            changes: <span class="self">self</span>.changes,
-<a href=#1123 id=1123 data-nosnippet>1123</a>            expired_metadata_logs,
-<a href=#1124 id=1124 data-nosnippet>1124</a>        })
-<a href=#1125 id=1125 data-nosnippet>1125</a>    }
-<a href=#1126 id=1126 data-nosnippet>1126</a>
-<a href=#1127 id=1127 data-nosnippet>1127</a>    <span class="kw">fn </span>expire_metadata_log(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; Vec&lt;MetadataLog&gt; {
-<a href=#1128 id=1128 data-nosnippet>1128</a>        <span class="kw">let </span>max_size = <span class="self">self
-<a href=#1129 id=1129 data-nosnippet>1129</a>            </span>.metadata
-<a href=#1130 id=1130 data-nosnippet>1130</a>            .properties
-<a href=#1131 id=1131 data-nosnippet>1131</a>            .get(TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX)
-<a href=#1132 id=1132 data-nosnippet>1132</a>            .and_then(|v| v.parse::&lt;usize&gt;().ok())
-<a href=#1133 id=1133 data-nosnippet>1133</a>            .unwrap_or(TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX_DEFAULT)
-<a href=#1134 id=1134 data-nosnippet>1134</a>            .max(<span class="number">1</span>);
-<a href=#1135 id=1135 data-nosnippet>1135</a>
-<a href=#1136 id=1136 data-nosnippet>1136</a>        <span class="kw">if </span><span class="self">self</span>.metadata.metadata_log.len() &gt; max_size {
-<a href=#1137 id=1137 data-nosnippet>1137</a>            <span class="self">self</span>.metadata
-<a href=#1138 id=1138 data-nosnippet>1138</a>                .metadata_log
-<a href=#1139 id=1139 data-nosnippet>1139</a>                .drain(<span class="number">0</span>..<span class="self">self</span>.metadata.metadata_log.len() - max_size)
-<a href=#1140 id=1140 data-nosnippet>1140</a>                .collect()
-<a href=#1141 id=1141 data-nosnippet>1141</a>        } <span class="kw">else </span>{
-<a href=#1142 id=1142 data-nosnippet>1142</a>            Vec::new()
-<a href=#1143 id=1143 data-nosnippet>1143</a>        }
-<a href=#1144 id=1144 data-nosnippet>1144</a>    }
-<a href=#1145 id=1145 data-nosnippet>1145</a>
-<a href=#1146 id=1146 data-nosnippet>1146</a>    <span class="kw">fn </span>update_snapshot_log(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
-<a href=#1147 id=1147 data-nosnippet>1147</a>        <span class="kw">let </span>intermediate_snapshots = <span class="self">self</span>.get_intermediate_snapshots();
-<a href=#1148 id=1148 data-nosnippet>1148</a>        <span class="kw">let </span>has_removed_snapshots = <span class="self">self
-<a href=#1149 id=1149 data-nosnippet>1149</a>            </span>.changes
-<a href=#1150 id=1150 data-nosnippet>1150</a>            .iter()
-<a href=#1151 id=1151 data-nosnippet>1151</a>            .any(|update| <span class="macro">matches!</span>(update, TableUpdate::RemoveSnapshots { .. }));
-<a href=#1152 id=1152 data-nosnippet>1152</a>
-<a href=#1153 id=1153 data-nosnippet>1153</a>        <span class="kw">if </span>intermediate_snapshots.is_empty() &amp;&amp; !has_removed_snapshots {
-<a href=#1154 id=1154 data-nosnippet>1154</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
-<a href=#1155 id=1155 data-nosnippet>1155</a>        }
-<a href=#1156 id=1156 data-nosnippet>1156</a>
-<a href=#1157 id=1157 data-nosnippet>1157</a>        <span class="kw">let </span><span class="kw-2">mut </span>new_snapshot_log = Vec::new();
-<a href=#1158 id=1158 data-nosnippet>1158</a>        <span class="kw">for </span>log_entry <span class="kw">in </span><span class="kw-2">&amp;</span><span class="self">self</span>.metadata.snapshot_log {
-<a href=#1159 id=1159 data-nosnippet>1159</a>            <span class="kw">let </span>snapshot_id = log_entry.snapshot_id;
-<a href=#1160 id=1160 data-nosnippet>1160</a>            <span class="kw">if </span><span class="self">self</span>.metadata.snapshots.contains_key(<span class="kw-2">&amp;</span>snapshot_id) {
-<a href=#1161 id=1161 data-nosnippet>1161</a>                <span class="kw">if </span>!intermediate_snapshots.contains(<span class="kw-2">&amp;</span>snapshot_id) {
-<a href=#1162 id=1162 data-nosnippet>1162</a>                    new_snapshot_log.push(log_entry.clone());
-<a href=#1163 id=1163 data-nosnippet>1163</a>                }
-<a href=#1164 id=1164 data-nosnippet>1164</a>            } <span class="kw">else if </span>has_removed_snapshots {
-<a href=#1165 id=1165 data-nosnippet>1165</a>                <span class="comment">// any invalid entry causes the history before it to be removed. otherwise, there could be
-<a href=#1166 id=1166 data-nosnippet>1166</a>                // history gaps that cause time-travel queries to produce incorrect results. for example,
-<a href=#1167 id=1167 data-nosnippet>1167</a>                // if history is [(t1, s1), (t2, s2), (t3, s3)] and s2 is removed, the history cannot be
-<a href=#1168 id=1168 data-nosnippet>1168</a>                // [(t1, s1), (t3, s3)] because it appears that s3 was current during the time between t2
-<a href=#1169 id=1169 data-nosnippet>1169</a>                // and t3 when in fact s2 was the current snapshot.
-<a href=#1170 id=1170 data-nosnippet>1170</a>                </span>new_snapshot_log.clear();
-<a href=#1171 id=1171 data-nosnippet>1171</a>            }
-<a href=#1172 id=1172 data-nosnippet>1172</a>        }
-<a href=#1173 id=1173 data-nosnippet>1173</a>
-<a href=#1174 id=1174 data-nosnippet>1174</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(current_snapshot_id) = <span class="self">self</span>.metadata.current_snapshot_id {
-<a href=#1175 id=1175 data-nosnippet>1175</a>            <span class="kw">let </span>last_id = new_snapshot_log.last().map(|entry| entry.snapshot_id);
-<a href=#1176 id=1176 data-nosnippet>1176</a>            <span class="kw">if </span>last_id != <span class="prelude-val">Some</span>(current_snapshot_id) {
-<a href=#1177 id=1177 data-nosnippet>1177</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#1178 id=1178 data-nosnippet>1178</a>                    ErrorKind::DataInvalid,
-<a href=#1179 id=1179 data-nosnippet>1179</a>                    <span class="string">"Cannot set invalid snapshot log: latest entry is not the current snapshot"</span>,
-<a href=#1180 id=1180 data-nosnippet>1180</a>                ));
-<a href=#1181 id=1181 data-nosnippet>1181</a>            }
-<a href=#1182 id=1182 data-nosnippet>1182</a>        };
-<a href=#1183 id=1183 data-nosnippet>1183</a>
-<a href=#1184 id=1184 data-nosnippet>1184</a>        <span class="self">self</span>.metadata.snapshot_log = new_snapshot_log;
-<a href=#1185 id=1185 data-nosnippet>1185</a>        <span class="prelude-val">Ok</span>(())
-<a href=#1186 id=1186 data-nosnippet>1186</a>    }
-<a href=#1187 id=1187 data-nosnippet>1187</a>
-<a href=#1188 id=1188 data-nosnippet>1188</a>    <span class="doccomment">/// Finds intermediate snapshots that have not been committed as the current snapshot.
-<a href=#1189 id=1189 data-nosnippet>1189</a>    ///
-<a href=#1190 id=1190 data-nosnippet>1190</a>    /// Transactions can create snapshots that are never the current snapshot because several
-<a href=#1191 id=1191 data-nosnippet>1191</a>    /// changes are combined by the transaction into one table metadata update. when each
-<a href=#1192 id=1192 data-nosnippet>1192</a>    /// intermediate snapshot is added to table metadata, it is added to the snapshot log, assuming
-<a href=#1193 id=1193 data-nosnippet>1193</a>    /// that it will be the current snapshot. when there are multiple snapshot updates, the log must
-<a href=#1194 id=1194 data-nosnippet>1194</a>    /// be corrected by suppressing the intermediate snapshot entries.
-<a href=#1195 id=1195 data-nosnippet>1195</a>    ///     
-<a href=#1196 id=1196 data-nosnippet>1196</a>    /// A snapshot is an intermediate snapshot if it was added but is not the current snapshot.
-<a href=#1197 id=1197 data-nosnippet>1197</a>    </span><span class="kw">fn </span>get_intermediate_snapshots(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; HashSet&lt;i64&gt; {
-<a href=#1198 id=1198 data-nosnippet>1198</a>        <span class="kw">let </span>added_snapshot_ids = <span class="self">self
-<a href=#1199 id=1199 data-nosnippet>1199</a>            </span>.changes
-<a href=#1200 id=1200 data-nosnippet>1200</a>            .iter()
-<a href=#1201 id=1201 data-nosnippet>1201</a>            .filter_map(|update| <span class="kw">match </span>update {
-<a href=#1202 id=1202 data-nosnippet>1202</a>                TableUpdate::AddSnapshot { snapshot } =&gt; <span class="prelude-val">Some</span>(snapshot.snapshot_id()),
-<a href=#1203 id=1203 data-nosnippet>1203</a>                <span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,
-<a href=#1204 id=1204 data-nosnippet>1204</a>            })
-<a href=#1205 id=1205 data-nosnippet>1205</a>            .collect::&lt;HashSet&lt;<span class="kw">_</span>&gt;&gt;();
-<a href=#1206 id=1206 data-nosnippet>1206</a>
-<a href=#1207 id=1207 data-nosnippet>1207</a>        <span class="self">self</span>.changes
-<a href=#1208 id=1208 data-nosnippet>1208</a>            .iter()
-<a href=#1209 id=1209 data-nosnippet>1209</a>            .filter_map(|update| <span class="kw">match </span>update {
-<a href=#1210 id=1210 data-nosnippet>1210</a>                TableUpdate::SetSnapshotRef {
-<a href=#1211 id=1211 data-nosnippet>1211</a>                    ref_name,
-<a href=#1212 id=1212 data-nosnippet>1212</a>                    reference,
-<a href=#1213 id=1213 data-nosnippet>1213</a>                } =&gt; {
-<a href=#1214 id=1214 data-nosnippet>1214</a>                    <span class="kw">if </span>added_snapshot_ids.contains(<span class="kw-2">&amp;</span>reference.snapshot_id)
-<a href=#1215 id=1215 data-nosnippet>1215</a>                        &amp;&amp; ref_name == MAIN_BRANCH
-<a href=#1216 id=1216 data-nosnippet>1216</a>                        &amp;&amp; reference.snapshot_id
-<a href=#1217 id=1217 data-nosnippet>1217</a>                            != <span class="self">self
-<a href=#1218 id=1218 data-nosnippet>1218</a>                                </span>.metadata
-<a href=#1219 id=1219 data-nosnippet>1219</a>                                .current_snapshot_id
-<a href=#1220 id=1220 data-nosnippet>1220</a>                                .unwrap_or(i64::from(<span class="self">Self</span>::LAST_ADDED))
-<a href=#1221 id=1221 data-nosnippet>1221</a>                    {
-<a href=#1222 id=1222 data-nosnippet>1222</a>                        <span class="prelude-val">Some</span>(reference.snapshot_id)
-<a href=#1223 id=1223 data-nosnippet>1223</a>                    } <span class="kw">else </span>{
-<a href=#1224 id=1224 data-nosnippet>1224</a>                        <span class="prelude-val">None
-<a href=#1225 id=1225 data-nosnippet>1225</a>                    </span>}
-<a href=#1226 id=1226 data-nosnippet>1226</a>                }
-<a href=#1227 id=1227 data-nosnippet>1227</a>                <span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,
-<a href=#1228 id=1228 data-nosnippet>1228</a>            })
-<a href=#1229 id=1229 data-nosnippet>1229</a>            .collect()
-<a href=#1230 id=1230 data-nosnippet>1230</a>    }
-<a href=#1231 id=1231 data-nosnippet>1231</a>
-<a href=#1232 id=1232 data-nosnippet>1232</a>    <span class="kw">fn </span>reassign_ids(
-<a href=#1233 id=1233 data-nosnippet>1233</a>        schema: Schema,
-<a href=#1234 id=1234 data-nosnippet>1234</a>        spec: UnboundPartitionSpec,
-<a href=#1235 id=1235 data-nosnippet>1235</a>        sort_order: SortOrder,
-<a href=#1236 id=1236 data-nosnippet>1236</a>    ) -&gt; <span class="prelude-ty">Result</span>&lt;(Schema, PartitionSpec, SortOrder)&gt; {
-<a href=#1237 id=1237 data-nosnippet>1237</a>        <span class="comment">// Re-assign field ids and schema ids for a new table.
-<a href=#1238 id=1238 data-nosnippet>1238</a>        </span><span class="kw">let </span>previous_id_to_name = schema.field_id_to_name_map().clone();
-<a href=#1239 id=1239 data-nosnippet>1239</a>        <span class="kw">let </span>fresh_schema = schema
-<a href=#1240 id=1240 data-nosnippet>1240</a>            .into_builder()
-<a href=#1241 id=1241 data-nosnippet>1241</a>            .with_schema_id(DEFAULT_SCHEMA_ID)
-<a href=#1242 id=1242 data-nosnippet>1242</a>            .with_reassigned_field_ids(FIRST_FIELD_ID)
-<a href=#1243 id=1243 data-nosnippet>1243</a>            .build()<span class="question-mark">?</span>;
-<a href=#1244 id=1244 data-nosnippet>1244</a>
-<a href=#1245 id=1245 data-nosnippet>1245</a>        <span class="comment">// Re-build partition spec with new ids
-<a href=#1246 id=1246 data-nosnippet>1246</a>        </span><span class="kw">let </span><span class="kw-2">mut </span>fresh_spec = PartitionSpecBuilder::new(fresh_schema.clone());
-<a href=#1247 id=1247 data-nosnippet>1247</a>        <span class="kw">for </span>field <span class="kw">in </span>spec.fields() {
-<a href=#1248 id=1248 data-nosnippet>1248</a>            <span class="kw">let </span>source_field_name = previous_id_to_name.get(<span class="kw-2">&amp;</span>field.source_id).ok_or_else(|| {
-<a href=#1249 id=1249 data-nosnippet>1249</a>                Error::new(
-<a href=#1250 id=1250 data-nosnippet>1250</a>                    ErrorKind::DataInvalid,
-<a href=#1251 id=1251 data-nosnippet>1251</a>                    <span class="macro">format!</span>(
-<a href=#1252 id=1252 data-nosnippet>1252</a>                        <span class="string">"Cannot find source column with id {} for partition column {} in schema."</span>,
-<a href=#1253 id=1253 data-nosnippet>1253</a>                        field.source_id, field.name
-<a href=#1254 id=1254 data-nosnippet>1254</a>                    ),
-<a href=#1255 id=1255 data-nosnippet>1255</a>                )
-<a href=#1256 id=1256 data-nosnippet>1256</a>            })<span class="question-mark">?</span>;
-<a href=#1257 id=1257 data-nosnippet>1257</a>            fresh_spec =
-<a href=#1258 id=1258 data-nosnippet>1258</a>                fresh_spec.add_partition_field(source_field_name, <span class="kw-2">&amp;</span>field.name, field.transform)<span class="question-mark">?</span>;
-<a href=#1259 id=1259 data-nosnippet>1259</a>        }
-<a href=#1260 id=1260 data-nosnippet>1260</a>        <span class="kw">let </span>fresh_spec = fresh_spec.build()<span class="question-mark">?</span>;
-<a href=#1261 id=1261 data-nosnippet>1261</a>
-<a href=#1262 id=1262 data-nosnippet>1262</a>        <span class="comment">// Re-build sort order with new ids
-<a href=#1263 id=1263 data-nosnippet>1263</a>        </span><span class="kw">let </span><span class="kw-2">mut </span>fresh_order = SortOrder::builder();
-<a href=#1264 id=1264 data-nosnippet>1264</a>        <span class="kw">for </span><span class="kw-2">mut </span>field <span class="kw">in </span>sort_order.fields {
-<a href=#1265 id=1265 data-nosnippet>1265</a>            <span class="kw">let </span>source_field_name = previous_id_to_name.get(<span class="kw-2">&amp;</span>field.source_id).ok_or_else(|| {
-<a href=#1266 id=1266 data-nosnippet>1266</a>                Error::new(
-<a href=#1267 id=1267 data-nosnippet>1267</a>                    ErrorKind::DataInvalid,
-<a href=#1268 id=1268 data-nosnippet>1268</a>                    <span class="macro">format!</span>(
-<a href=#1269 id=1269 data-nosnippet>1269</a>                        <span class="string">"Cannot find source column with id {} for sort column in schema."</span>,
-<a href=#1270 id=1270 data-nosnippet>1270</a>                        field.source_id
-<a href=#1271 id=1271 data-nosnippet>1271</a>                    ),
-<a href=#1272 id=1272 data-nosnippet>1272</a>                )
-<a href=#1273 id=1273 data-nosnippet>1273</a>            })<span class="question-mark">?</span>;
-<a href=#1274 id=1274 data-nosnippet>1274</a>            <span class="kw">let </span>new_field_id = fresh_schema
-<a href=#1275 id=1275 data-nosnippet>1275</a>                       .field_by_name(source_field_name)
-<a href=#1276 id=1276 data-nosnippet>1276</a>                       .ok_or_else(|| {
-<a href=#1277 id=1277 data-nosnippet>1277</a>                           Error::new(
-<a href=#1278 id=1278 data-nosnippet>1278</a>                               ErrorKind::Unexpected,
-<a href=#1279 id=1279 data-nosnippet>1279</a>                               <span class="macro">format!</span>(
-<a href=#1280 id=1280 data-nosnippet>1280</a>                                   <span class="string">"Cannot find source column with name {source_field_name} for sort column in re-assigned schema."
-<a href=#1281 id=1281 data-nosnippet>1281</a>                               </span>),
-<a href=#1282 id=1282 data-nosnippet>1282</a>                           )
-<a href=#1283 id=1283 data-nosnippet>1283</a>                       })<span class="question-mark">?</span>.id;
-<a href=#1284 id=1284 data-nosnippet>1284</a>            field.source_id = new_field_id;
-<a href=#1285 id=1285 data-nosnippet>1285</a>            fresh_order.with_sort_field(field);
-<a href=#1286 id=1286 data-nosnippet>1286</a>        }
-<a href=#1287 id=1287 data-nosnippet>1287</a>        <span class="kw">let </span>fresh_sort_order = fresh_order.build(<span class="kw-2">&amp;</span>fresh_schema)<span class="question-mark">?</span>;
-<a href=#1288 id=1288 data-nosnippet>1288</a>
-<a href=#1289 id=1289 data-nosnippet>1289</a>        <span class="prelude-val">Ok</span>((fresh_schema, fresh_spec, fresh_sort_order))
-<a href=#1290 id=1290 data-nosnippet>1290</a>    }
-<a href=#1291 id=1291 data-nosnippet>1291</a>
-<a href=#1292 id=1292 data-nosnippet>1292</a>    <span class="kw">fn </span>reuse_or_create_new_schema_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_schema: <span class="kw-2">&amp;</span>Schema) -&gt; i32 {
-<a href=#1293 id=1293 data-nosnippet>1293</a>        <span class="self">self</span>.metadata
-<a href=#1294 id=1294 data-nosnippet>1294</a>            .schemas
-<a href=#1295 id=1295 data-nosnippet>1295</a>            .iter()
-<a href=#1296 id=1296 data-nosnippet>1296</a>            .find_map(|(id, schema)| new_schema.is_same_schema(schema).then_some(<span class="kw-2">*</span>id))
-<a href=#1297 id=1297 data-nosnippet>1297</a>            .unwrap_or_else(|| <span class="self">self</span>.get_highest_schema_id() + <span class="number">1</span>)
-<a href=#1298 id=1298 data-nosnippet>1298</a>    }
-<a href=#1299 id=1299 data-nosnippet>1299</a>
-<a href=#1300 id=1300 data-nosnippet>1300</a>    <span class="kw">fn </span>get_highest_schema_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; i32 {
-<a href=#1301 id=1301 data-nosnippet>1301</a>        <span class="kw-2">*</span><span class="self">self
-<a href=#1302 id=1302 data-nosnippet>1302</a>            </span>.metadata
-<a href=#1303 id=1303 data-nosnippet>1303</a>            .schemas
-<a href=#1304 id=1304 data-nosnippet>1304</a>            .keys()
-<a href=#1305 id=1305 data-nosnippet>1305</a>            .max()
-<a href=#1306 id=1306 data-nosnippet>1306</a>            .unwrap_or(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id)
-<a href=#1307 id=1307 data-nosnippet>1307</a>    }
-<a href=#1308 id=1308 data-nosnippet>1308</a>
-<a href=#1309 id=1309 data-nosnippet>1309</a>    <span class="kw">fn </span>get_current_schema(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw-2">&amp;</span>SchemaRef&gt; {
-<a href=#1310 id=1310 data-nosnippet>1310</a>        <span class="self">self</span>.metadata
-<a href=#1311 id=1311 data-nosnippet>1311</a>            .schemas
-<a href=#1312 id=1312 data-nosnippet>1312</a>            .get(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id)
-<a href=#1313 id=1313 data-nosnippet>1313</a>            .ok_or_else(|| {
-<a href=#1314 id=1314 data-nosnippet>1314</a>                Error::new(
-<a href=#1315 id=1315 data-nosnippet>1315</a>                    ErrorKind::DataInvalid,
-<a href=#1316 id=1316 data-nosnippet>1316</a>                    <span class="macro">format!</span>(
-<a href=#1317 id=1317 data-nosnippet>1317</a>                        <span class="string">"Current schema with id '{}' not found in table metadata."</span>,
-<a href=#1318 id=1318 data-nosnippet>1318</a>                        <span class="self">self</span>.metadata.current_schema_id
-<a href=#1319 id=1319 data-nosnippet>1319</a>                    ),
-<a href=#1320 id=1320 data-nosnippet>1320</a>                )
-<a href=#1321 id=1321 data-nosnippet>1321</a>            })
-<a href=#1322 id=1322 data-nosnippet>1322</a>    }
-<a href=#1323 id=1323 data-nosnippet>1323</a>
-<a href=#1324 id=1324 data-nosnippet>1324</a>    <span class="kw">fn </span>get_default_sort_order(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;SortOrderRef&gt; {
-<a href=#1325 id=1325 data-nosnippet>1325</a>        <span class="self">self</span>.metadata
-<a href=#1326 id=1326 data-nosnippet>1326</a>            .sort_orders
-<a href=#1327 id=1327 data-nosnippet>1327</a>            .get(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.default_sort_order_id)
-<a href=#1328 id=1328 data-nosnippet>1328</a>            .cloned()
-<a href=#1329 id=1329 data-nosnippet>1329</a>            .ok_or_else(|| {
-<a href=#1330 id=1330 data-nosnippet>1330</a>                Error::new(
-<a href=#1331 id=1331 data-nosnippet>1331</a>                    ErrorKind::DataInvalid,
-<a href=#1332 id=1332 data-nosnippet>1332</a>                    <span class="macro">format!</span>(
-<a href=#1333 id=1333 data-nosnippet>1333</a>                        <span class="string">"Default sort order with id '{}' not found in table metadata."</span>,
-<a href=#1334 id=1334 data-nosnippet>1334</a>                        <span class="self">self</span>.metadata.default_sort_order_id
-<a href=#1335 id=1335 data-nosnippet>1335</a>                    ),
-<a href=#1336 id=1336 data-nosnippet>1336</a>                )
-<a href=#1337 id=1337 data-nosnippet>1337</a>            })
-<a href=#1338 id=1338 data-nosnippet>1338</a>    }
-<a href=#1339 id=1339 data-nosnippet>1339</a>
-<a href=#1340 id=1340 data-nosnippet>1340</a>    <span class="doccomment">/// If a compatible spec already exists, use the same ID. Otherwise, use 1 more than the highest ID.
-<a href=#1341 id=1341 data-nosnippet>1341</a>    </span><span class="kw">fn </span>reuse_or_create_new_spec_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_spec: <span class="kw-2">&amp;</span>PartitionSpec) -&gt; i32 {
-<a href=#1342 id=1342 data-nosnippet>1342</a>        <span class="self">self</span>.metadata
-<a href=#1343 id=1343 data-nosnippet>1343</a>            .partition_specs
-<a href=#1344 id=1344 data-nosnippet>1344</a>            .iter()
-<a href=#1345 id=1345 data-nosnippet>1345</a>            .find_map(|(id, old_spec)| new_spec.is_compatible_with(old_spec).then_some(<span class="kw-2">*</span>id))
-<a href=#1346 id=1346 data-nosnippet>1346</a>            .unwrap_or_else(|| {
-<a href=#1347 id=1347 data-nosnippet>1347</a>                <span class="self">self</span>.get_highest_spec_id()
-<a href=#1348 id=1348 data-nosnippet>1348</a>                    .map(|id| id + <span class="number">1</span>)
-<a href=#1349 id=1349 data-nosnippet>1349</a>                    .unwrap_or(DEFAULT_PARTITION_SPEC_ID)
-<a href=#1350 id=1350 data-nosnippet>1350</a>            })
-<a href=#1351 id=1351 data-nosnippet>1351</a>    }
-<a href=#1352 id=1352 data-nosnippet>1352</a>
-<a href=#1353 id=1353 data-nosnippet>1353</a>    <span class="kw">fn </span>get_highest_spec_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Option</span>&lt;i32&gt; {
-<a href=#1354 id=1354 data-nosnippet>1354</a>        <span class="self">self</span>.metadata.partition_specs.keys().max().copied()
-<a href=#1355 id=1355 data-nosnippet>1355</a>    }
-<a href=#1356 id=1356 data-nosnippet>1356</a>
-<a href=#1357 id=1357 data-nosnippet>1357</a>    <span class="doccomment">/// If a compatible sort-order already exists, use the same ID. Otherwise, use 1 more than the highest ID.
-<a href=#1358 id=1358 data-nosnippet>1358</a>    </span><span class="kw">fn </span>reuse_or_create_new_sort_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_sort_order: <span class="kw-2">&amp;</span>SortOrder) -&gt; i64 {
-<a href=#1359 id=1359 data-nosnippet>1359</a>        <span class="kw">if </span>new_sort_order.is_unsorted() {
-<a href=#1360 id=1360 data-nosnippet>1360</a>            <span class="kw">return </span>SortOrder::unsorted_order().order_id;
-<a href=#1361 id=1361 data-nosnippet>1361</a>        }
-<a href=#1362 id=1362 data-nosnippet>1362</a>
-<a href=#1363 id=1363 data-nosnippet>1363</a>        <span class="self">self</span>.metadata
-<a href=#1364 id=1364 data-nosnippet>1364</a>            .sort_orders
-<a href=#1365 id=1365 data-nosnippet>1365</a>            .iter()
-<a href=#1366 id=1366 data-nosnippet>1366</a>            .find_map(|(id, sort_order)| {
-<a href=#1367 id=1367 data-nosnippet>1367</a>                sort_order.fields.eq(<span class="kw-2">&amp;</span>new_sort_order.fields).then_some(<span class="kw-2">*</span>id)
-<a href=#1368 id=1368 data-nosnippet>1368</a>            })
-<a href=#1369 id=1369 data-nosnippet>1369</a>            .unwrap_or_else(|| {
-<a href=#1370 id=1370 data-nosnippet>1370</a>                <span class="self">self</span>.highest_sort_order_id()
-<a href=#1371 id=1371 data-nosnippet>1371</a>                    .unwrap_or(SortOrder::unsorted_order().order_id)
-<a href=#1372 id=1372 data-nosnippet>1372</a>                    + <span class="number">1
-<a href=#1373 id=1373 data-nosnippet>1373</a>            </span>})
-<a href=#1374 id=1374 data-nosnippet>1374</a>    }
-<a href=#1375 id=1375 data-nosnippet>1375</a>
-<a href=#1376 id=1376 data-nosnippet>1376</a>    <span class="kw">fn </span>highest_sort_order_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Option</span>&lt;i64&gt; {
-<a href=#1377 id=1377 data-nosnippet>1377</a>        <span class="self">self</span>.metadata.sort_orders.keys().max().copied()
-<a href=#1378 id=1378 data-nosnippet>1378</a>    }
-<a href=#1379 id=1379 data-nosnippet>1379</a>
-<a href=#1380 id=1380 data-nosnippet>1380</a>    <span class="doccomment">/// Remove schemas by their ids from the table metadata.
-<a href=#1381 id=1381 data-nosnippet>1381</a>    /// Does nothing if a schema id is not present. Active schemas should not be removed.
-<a href=#1382 id=1382 data-nosnippet>1382</a>    </span><span class="kw">pub fn </span>remove_schemas(<span class="kw-2">mut </span><span class="self">self</span>, schema_id_to_remove: <span class="kw-2">&amp;</span>[i32]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
-<a href=#1383 id=1383 data-nosnippet>1383</a>        <span class="kw">if </span>schema_id_to_remove.contains(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id) {
-<a href=#1384 id=1384 data-nosnippet>1384</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
-<a href=#1385 id=1385 data-nosnippet>1385</a>                ErrorKind::DataInvalid,
-<a href=#1386 id=1386 data-nosnippet>1386</a>                <span class="string">"Cannot remove current schema"</span>,
-<a href=#1387 id=1387 data-nosnippet>1387</a>            ));
-<a href=#1388 id=1388 data-nosnippet>1388</a>        }
-<a href=#1389 id=1389 data-nosnippet>1389</a>
-<a href=#1390 id=1390 data-nosnippet>1390</a>        <span class="kw">if </span>schema_id_to_remove.is_empty() {
-<a href=#1391 id=1391 data-nosnippet>1391</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
-<a href=#1392 id=1392 data-nosnippet>1392</a>        }
-<a href=#1393 id=1393 data-nosnippet>1393</a>
-<a href=#1394 id=1394 data-nosnippet>1394</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_schemas = Vec::with_capacity(schema_id_to_remove.len());
-<a href=#1395 id=1395 data-nosnippet>1395</a>        <span class="self">self</span>.metadata.schemas.retain(|id, _schema| {
-<a href=#1396 id=1396 data-nosnippet>1396</a>            <span class="kw">if </span>schema_id_to_remove.contains(id) {
-<a href=#1397 id=1397 data-nosnippet>1397</a>                removed_schemas.push(<span class="kw-2">*</span>id);
-<a href=#1398 id=1398 data-nosnippet>1398</a>                <span class="bool-val">false
-<a href=#1399 id=1399 data-nosnippet>1399</a>            </span>} <span class="kw">else </span>{
-<a href=#1400 id=1400 data-nosnippet>1400</a>                <span class="bool-val">true
-<a href=#1401 id=1401 data-nosnippet>1401</a>            </span>}
-<a href=#1402 id=1402 data-nosnippet>1402</a>        });
-<a href=#1403 id=1403 data-nosnippet>1403</a>
-<a href=#1404 id=1404 data-nosnippet>1404</a>        <span class="self">self</span>.changes.push(TableUpdate::RemoveSchemas {
-<a href=#1405 id=1405 data-nosnippet>1405</a>            schema_ids: removed_schemas,
-<a href=#1406 id=1406 data-nosnippet>1406</a>        });
-<a href=#1407 id=1407 data-nosnippet>1407</a>
-<a href=#1408 id=1408 data-nosnippet>1408</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
-<a href=#1409 id=1409 data-nosnippet>1409</a>    }
-<a href=#1410 id=1410 data-nosnippet>1410</a>}
-<a href=#1411 id=1411 data-nosnippet>1411</a>
-<a href=#1412 id=1412 data-nosnippet>1412</a><span class="kw">impl </span>From&lt;TableMetadataBuildResult&gt; <span class="kw">for </span>TableMetadata {
-<a href=#1413 id=1413 data-nosnippet>1413</a>    <span class="kw">fn </span>from(result: TableMetadataBuildResult) -&gt; <span class="self">Self </span>{
-<a href=#1414 id=1414 data-nosnippet>1414</a>        result.metadata
-<a href=#1415 id=1415 data-nosnippet>1415</a>    }
-<a href=#1416 id=1416 data-nosnippet>1416</a>}
-<a href=#1417 id=1417 data-nosnippet>1417</a>
-<a href=#1418 id=1418 data-nosnippet>1418</a><span class="attr">#[cfg(test)]
-<a href=#1419 id=1419 data-nosnippet>1419</a></span><span class="kw">mod </span>tests {
-<a href=#1420 id=1420 data-nosnippet>1420</a>    <span class="kw">use </span>std::fs::File;
-<a href=#1421 id=1421 data-nosnippet>1421</a>    <span class="kw">use </span>std::io::BufReader;
-<a href=#1422 id=1422 data-nosnippet>1422</a>    <span class="kw">use </span>std::thread::sleep;
-<a href=#1423 id=1423 data-nosnippet>1423</a>
-<a href=#1424 id=1424 data-nosnippet>1424</a>    <span class="kw">use super</span>::<span class="kw-2">*</span>;
-<a href=#1425 id=1425 data-nosnippet>1425</a>    <span class="kw">use </span><span class="kw">crate</span>::TableIdent;
-<a href=#1426 id=1426 data-nosnippet>1426</a>    <span class="kw">use </span><span class="kw">crate</span>::io::FileIOBuilder;
-<a href=#1427 id=1427 data-nosnippet>1427</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::{
-<a href=#1428 id=1428 data-nosnippet>1428</a>        BlobMetadata, NestedField, NullOrder, Operation, PartitionSpec, PrimitiveType, Schema,
-<a href=#1429 id=1429 data-nosnippet>1429</a>        SnapshotRetention, SortDirection, SortField, StructType, Summary, TableProperties,
-<a href=#1430 id=1430 data-nosnippet>1430</a>        Transform, Type, UnboundPartitionField,
-<a href=#1431 id=1431 data-nosnippet>1431</a>    };
-<a href=#1432 id=1432 data-nosnippet>1432</a>    <span class="kw">use </span><span class="kw">crate</span>::table::Table;
-<a href=#1433 id=1433 data-nosnippet>1433</a>
-<a href=#1434 id=1434 data-nosnippet>1434</a>    <span class="kw">const </span>TEST_LOCATION: <span class="kw-2">&amp;</span>str = <span class="string">"s3://bucket/test/location"</span>;
-<a href=#1435 id=1435 data-nosnippet>1435</a>    <span class="kw">const </span>LAST_ASSIGNED_COLUMN_ID: i32 = <span class="number">3</span>;
-<a href=#1436 id=1436 data-nosnippet>1436</a>
-<a href=#1437 id=1437 data-nosnippet>1437</a>    <span class="kw">fn </span>schema() -&gt; Schema {
-<a href=#1438 id=1438 data-nosnippet>1438</a>        Schema::builder()
-<a href=#1439 id=1439 data-nosnippet>1439</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#1440 id=1440 data-nosnippet>1440</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1441 id=1441 data-nosnippet>1441</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1442 id=1442 data-nosnippet>1442</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1443 id=1443 data-nosnippet>1443</a>            ])
-<a href=#1444 id=1444 data-nosnippet>1444</a>            .build()
-<a href=#1445 id=1445 data-nosnippet>1445</a>            .unwrap()
-<a href=#1446 id=1446 data-nosnippet>1446</a>    }
-<a href=#1447 id=1447 data-nosnippet>1447</a>
-<a href=#1448 id=1448 data-nosnippet>1448</a>    <span class="kw">fn </span>sort_order() -&gt; SortOrder {
-<a href=#1449 id=1449 data-nosnippet>1449</a>        <span class="kw">let </span>schema = schema();
-<a href=#1450 id=1450 data-nosnippet>1450</a>        SortOrder::builder()
-<a href=#1451 id=1451 data-nosnippet>1451</a>            .with_order_id(<span class="number">1</span>)
-<a href=#1452 id=1452 data-nosnippet>1452</a>            .with_sort_field(SortField {
-<a href=#1453 id=1453 data-nosnippet>1453</a>                source_id: <span class="number">3</span>,
-<a href=#1454 id=1454 data-nosnippet>1454</a>                transform: Transform::Bucket(<span class="number">4</span>),
-<a href=#1455 id=1455 data-nosnippet>1455</a>                direction: SortDirection::Descending,
-<a href=#1456 id=1456 data-nosnippet>1456</a>                null_order: NullOrder::First,
-<a href=#1457 id=1457 data-nosnippet>1457</a>            })
-<a href=#1458 id=1458 data-nosnippet>1458</a>            .build(<span class="kw-2">&amp;</span>schema)
-<a href=#1459 id=1459 data-nosnippet>1459</a>            .unwrap()
-<a href=#1460 id=1460 data-nosnippet>1460</a>    }
-<a href=#1461 id=1461 data-nosnippet>1461</a>
-<a href=#1462 id=1462 data-nosnippet>1462</a>    <span class="kw">fn </span>partition_spec() -&gt; UnboundPartitionSpec {
-<a href=#1463 id=1463 data-nosnippet>1463</a>        UnboundPartitionSpec::builder()
-<a href=#1464 id=1464 data-nosnippet>1464</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#1465 id=1465 data-nosnippet>1465</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"y"</span>, Transform::Identity)
-<a href=#1466 id=1466 data-nosnippet>1466</a>            .unwrap()
-<a href=#1467 id=1467 data-nosnippet>1467</a>            .build()
-<a href=#1468 id=1468 data-nosnippet>1468</a>    }
-<a href=#1469 id=1469 data-nosnippet>1469</a>
-<a href=#1470 id=1470 data-nosnippet>1470</a>    <span class="kw">fn </span>builder_without_changes(format_version: FormatVersion) -&gt; TableMetadataBuilder {
-<a href=#1471 id=1471 data-nosnippet>1471</a>        TableMetadataBuilder::new(
-<a href=#1472 id=1472 data-nosnippet>1472</a>            schema(),
-<a href=#1473 id=1473 data-nosnippet>1473</a>            partition_spec(),
-<a href=#1474 id=1474 data-nosnippet>1474</a>            sort_order(),
-<a href=#1475 id=1475 data-nosnippet>1475</a>            TEST_LOCATION.to_string(),
-<a href=#1476 id=1476 data-nosnippet>1476</a>            format_version,
-<a href=#1477 id=1477 data-nosnippet>1477</a>            HashMap::new(),
-<a href=#1478 id=1478 data-nosnippet>1478</a>        )
-<a href=#1479 id=1479 data-nosnippet>1479</a>        .unwrap()
-<a href=#1480 id=1480 data-nosnippet>1480</a>        .build()
+<a href=#1046 id=1046 data-nosnippet>1046</a>        <span class="self">self</span>.metadata.default_sort_order_id = sort_order_id;
+<a href=#1047 id=1047 data-nosnippet>1047</a>
+<a href=#1048 id=1048 data-nosnippet>1048</a>        <span class="kw">if </span><span class="self">self</span>.last_added_order_id == <span class="prelude-val">Some</span>(sort_order_id) {
+<a href=#1049 id=1049 data-nosnippet>1049</a>            <span class="self">self</span>.changes.push(TableUpdate::SetDefaultSortOrder {
+<a href=#1050 id=1050 data-nosnippet>1050</a>                sort_order_id: <span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64,
+<a href=#1051 id=1051 data-nosnippet>1051</a>            });
+<a href=#1052 id=1052 data-nosnippet>1052</a>        } <span class="kw">else </span>{
+<a href=#1053 id=1053 data-nosnippet>1053</a>            <span class="self">self</span>.changes
+<a href=#1054 id=1054 data-nosnippet>1054</a>                .push(TableUpdate::SetDefaultSortOrder { sort_order_id });
+<a href=#1055 id=1055 data-nosnippet>1055</a>        }
+<a href=#1056 id=1056 data-nosnippet>1056</a>
+<a href=#1057 id=1057 data-nosnippet>1057</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#1058 id=1058 data-nosnippet>1058</a>    }
+<a href=#1059 id=1059 data-nosnippet>1059</a>
+<a href=#1060 id=1060 data-nosnippet>1060</a>    <span class="doccomment">/// Add a sort order and set it as the default
+<a href=#1061 id=1061 data-nosnippet>1061</a>    </span><span class="kw">fn </span>add_default_sort_order(<span class="self">self</span>, sort_order: SortOrder) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#1062 id=1062 data-nosnippet>1062</a>        <span class="self">self</span>.add_sort_order(sort_order)<span class="question-mark">?
+<a href=#1063 id=1063 data-nosnippet>1063</a>            </span>.set_default_sort_order(<span class="self">Self</span>::LAST_ADDED <span class="kw">as </span>i64)
+<a href=#1064 id=1064 data-nosnippet>1064</a>    }
+<a href=#1065 id=1065 data-nosnippet>1065</a>
+<a href=#1066 id=1066 data-nosnippet>1066</a>    <span class="doccomment">/// Add an encryption key to the table metadata.
+<a href=#1067 id=1067 data-nosnippet>1067</a>    </span><span class="kw">pub fn </span>add_encryption_key(<span class="kw-2">mut </span><span class="self">self</span>, key: EncryptedKey) -&gt; <span class="self">Self </span>{
+<a href=#1068 id=1068 data-nosnippet>1068</a>        <span class="kw">let </span>key_id = key.key_id().to_string();
+<a href=#1069 id=1069 data-nosnippet>1069</a>        <span class="kw">if </span><span class="self">self</span>.metadata.encryption_keys.contains_key(<span class="kw-2">&amp;</span>key_id) {
+<a href=#1070 id=1070 data-nosnippet>1070</a>            <span class="comment">// already exists
+<a href=#1071 id=1071 data-nosnippet>1071</a>            </span><span class="kw">return </span><span class="self">self</span>;
+<a href=#1072 id=1072 data-nosnippet>1072</a>        }
+<a href=#1073 id=1073 data-nosnippet>1073</a>
+<a href=#1074 id=1074 data-nosnippet>1074</a>        <span class="self">self</span>.metadata.encryption_keys.insert(key_id, key.clone());
+<a href=#1075 id=1075 data-nosnippet>1075</a>        <span class="self">self</span>.changes.push(TableUpdate::AddEncryptionKey {
+<a href=#1076 id=1076 data-nosnippet>1076</a>            encryption_key: key,
+<a href=#1077 id=1077 data-nosnippet>1077</a>        });
+<a href=#1078 id=1078 data-nosnippet>1078</a>        <span class="self">self
+<a href=#1079 id=1079 data-nosnippet>1079</a>    </span>}
+<a href=#1080 id=1080 data-nosnippet>1080</a>
+<a href=#1081 id=1081 data-nosnippet>1081</a>    <span class="doccomment">/// Remove an encryption key from the table metadata.
+<a href=#1082 id=1082 data-nosnippet>1082</a>    </span><span class="kw">pub fn </span>remove_encryption_key(<span class="kw-2">mut </span><span class="self">self</span>, key_id: <span class="kw-2">&amp;</span>str) -&gt; <span class="self">Self </span>{
+<a href=#1083 id=1083 data-nosnippet>1083</a>        <span class="kw">if </span><span class="self">self</span>.metadata.encryption_keys.remove(key_id).is_some() {
+<a href=#1084 id=1084 data-nosnippet>1084</a>            <span class="self">self</span>.changes.push(TableUpdate::RemoveEncryptionKey {
+<a href=#1085 id=1085 data-nosnippet>1085</a>                key_id: key_id.to_string(),
+<a href=#1086 id=1086 data-nosnippet>1086</a>            });
+<a href=#1087 id=1087 data-nosnippet>1087</a>        }
+<a href=#1088 id=1088 data-nosnippet>1088</a>        <span class="self">self
+<a href=#1089 id=1089 data-nosnippet>1089</a>    </span>}
+<a href=#1090 id=1090 data-nosnippet>1090</a>
+<a href=#1091 id=1091 data-nosnippet>1091</a>    <span class="doccomment">/// Build the table metadata.
+<a href=#1092 id=1092 data-nosnippet>1092</a>    </span><span class="kw">pub fn </span>build(<span class="kw-2">mut </span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;TableMetadataBuildResult&gt; {
+<a href=#1093 id=1093 data-nosnippet>1093</a>        <span class="self">self</span>.metadata.last_updated_ms = <span class="self">self
+<a href=#1094 id=1094 data-nosnippet>1094</a>            </span>.last_updated_ms
+<a href=#1095 id=1095 data-nosnippet>1095</a>            .unwrap_or_else(|| chrono::Utc::now().timestamp_millis());
+<a href=#1096 id=1096 data-nosnippet>1096</a>
+<a href=#1097 id=1097 data-nosnippet>1097</a>        <span class="comment">// Check compatibility of the current schema to the default partition spec and sort order.
+<a href=#1098 id=1098 data-nosnippet>1098</a>        // We use the `get_xxx` methods from the builder to avoid using the panicking
+<a href=#1099 id=1099 data-nosnippet>1099</a>        // `TableMetadata.default_partition_spec` etc. methods.
+<a href=#1100 id=1100 data-nosnippet>1100</a>        </span><span class="kw">let </span>schema = <span class="self">self</span>.get_current_schema()<span class="question-mark">?</span>.clone();
+<a href=#1101 id=1101 data-nosnippet>1101</a>        <span class="kw">let </span>sort_order = Arc::unwrap_or_clone(<span class="self">self</span>.get_default_sort_order()<span class="question-mark">?</span>);
+<a href=#1102 id=1102 data-nosnippet>1102</a>
+<a href=#1103 id=1103 data-nosnippet>1103</a>        <span class="self">self</span>.metadata.default_spec = Arc::new(
+<a href=#1104 id=1104 data-nosnippet>1104</a>            Arc::unwrap_or_clone(<span class="self">self</span>.metadata.default_spec)
+<a href=#1105 id=1105 data-nosnippet>1105</a>                .into_unbound()
+<a href=#1106 id=1106 data-nosnippet>1106</a>                .bind(schema.clone())<span class="question-mark">?</span>,
+<a href=#1107 id=1107 data-nosnippet>1107</a>        );
+<a href=#1108 id=1108 data-nosnippet>1108</a>        <span class="self">self</span>.metadata.default_partition_type =
+<a href=#1109 id=1109 data-nosnippet>1109</a>            <span class="self">self</span>.metadata.default_spec.partition_type(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
+<a href=#1110 id=1110 data-nosnippet>1110</a>        SortOrder::builder()
+<a href=#1111 id=1111 data-nosnippet>1111</a>            .with_fields(sort_order.fields)
+<a href=#1112 id=1112 data-nosnippet>1112</a>            .build(<span class="kw-2">&amp;</span>schema)<span class="question-mark">?</span>;
+<a href=#1113 id=1113 data-nosnippet>1113</a>
+<a href=#1114 id=1114 data-nosnippet>1114</a>        <span class="self">self</span>.update_snapshot_log()<span class="question-mark">?</span>;
+<a href=#1115 id=1115 data-nosnippet>1115</a>        <span class="self">self</span>.metadata.try_normalize()<span class="question-mark">?</span>;
+<a href=#1116 id=1116 data-nosnippet>1116</a>
+<a href=#1117 id=1117 data-nosnippet>1117</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(hist_entry) = <span class="self">self</span>.previous_history_entry.take() {
+<a href=#1118 id=1118 data-nosnippet>1118</a>            <span class="self">self</span>.metadata.metadata_log.push(hist_entry);
+<a href=#1119 id=1119 data-nosnippet>1119</a>        }
+<a href=#1120 id=1120 data-nosnippet>1120</a>        <span class="kw">let </span>expired_metadata_logs = <span class="self">self</span>.expire_metadata_log();
+<a href=#1121 id=1121 data-nosnippet>1121</a>
+<a href=#1122 id=1122 data-nosnippet>1122</a>        <span class="prelude-val">Ok</span>(TableMetadataBuildResult {
+<a href=#1123 id=1123 data-nosnippet>1123</a>            metadata: <span class="self">self</span>.metadata,
+<a href=#1124 id=1124 data-nosnippet>1124</a>            changes: <span class="self">self</span>.changes,
+<a href=#1125 id=1125 data-nosnippet>1125</a>            expired_metadata_logs,
+<a href=#1126 id=1126 data-nosnippet>1126</a>        })
+<a href=#1127 id=1127 data-nosnippet>1127</a>    }
+<a href=#1128 id=1128 data-nosnippet>1128</a>
+<a href=#1129 id=1129 data-nosnippet>1129</a>    <span class="kw">fn </span>expire_metadata_log(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; Vec&lt;MetadataLog&gt; {
+<a href=#1130 id=1130 data-nosnippet>1130</a>        <span class="kw">let </span>max_size = <span class="self">self
+<a href=#1131 id=1131 data-nosnippet>1131</a>            </span>.metadata
+<a href=#1132 id=1132 data-nosnippet>1132</a>            .properties
+<a href=#1133 id=1133 data-nosnippet>1133</a>            .get(TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX)
+<a href=#1134 id=1134 data-nosnippet>1134</a>            .and_then(|v| v.parse::&lt;usize&gt;().ok())
+<a href=#1135 id=1135 data-nosnippet>1135</a>            .unwrap_or(TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX_DEFAULT)
+<a href=#1136 id=1136 data-nosnippet>1136</a>            .max(<span class="number">1</span>);
+<a href=#1137 id=1137 data-nosnippet>1137</a>
+<a href=#1138 id=1138 data-nosnippet>1138</a>        <span class="kw">if </span><span class="self">self</span>.metadata.metadata_log.len() &gt; max_size {
+<a href=#1139 id=1139 data-nosnippet>1139</a>            <span class="self">self</span>.metadata
+<a href=#1140 id=1140 data-nosnippet>1140</a>                .metadata_log
+<a href=#1141 id=1141 data-nosnippet>1141</a>                .drain(<span class="number">0</span>..<span class="self">self</span>.metadata.metadata_log.len() - max_size)
+<a href=#1142 id=1142 data-nosnippet>1142</a>                .collect()
+<a href=#1143 id=1143 data-nosnippet>1143</a>        } <span class="kw">else </span>{
+<a href=#1144 id=1144 data-nosnippet>1144</a>            Vec::new()
+<a href=#1145 id=1145 data-nosnippet>1145</a>        }
+<a href=#1146 id=1146 data-nosnippet>1146</a>    }
+<a href=#1147 id=1147 data-nosnippet>1147</a>
+<a href=#1148 id=1148 data-nosnippet>1148</a>    <span class="kw">fn </span>update_snapshot_log(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;()&gt; {
+<a href=#1149 id=1149 data-nosnippet>1149</a>        <span class="kw">let </span>intermediate_snapshots = <span class="self">self</span>.get_intermediate_snapshots();
+<a href=#1150 id=1150 data-nosnippet>1150</a>        <span class="kw">let </span>has_removed_snapshots = <span class="self">self
+<a href=#1151 id=1151 data-nosnippet>1151</a>            </span>.changes
+<a href=#1152 id=1152 data-nosnippet>1152</a>            .iter()
+<a href=#1153 id=1153 data-nosnippet>1153</a>            .any(|update| <span class="macro">matches!</span>(update, TableUpdate::RemoveSnapshots { .. }));
+<a href=#1154 id=1154 data-nosnippet>1154</a>
+<a href=#1155 id=1155 data-nosnippet>1155</a>        <span class="kw">if </span>intermediate_snapshots.is_empty() &amp;&amp; !has_removed_snapshots {
+<a href=#1156 id=1156 data-nosnippet>1156</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(());
+<a href=#1157 id=1157 data-nosnippet>1157</a>        }
+<a href=#1158 id=1158 data-nosnippet>1158</a>
+<a href=#1159 id=1159 data-nosnippet>1159</a>        <span class="kw">let </span><span class="kw-2">mut </span>new_snapshot_log = Vec::new();
+<a href=#1160 id=1160 data-nosnippet>1160</a>        <span class="kw">for </span>log_entry <span class="kw">in </span><span class="kw-2">&amp;</span><span class="self">self</span>.metadata.snapshot_log {
+<a href=#1161 id=1161 data-nosnippet>1161</a>            <span class="kw">let </span>snapshot_id = log_entry.snapshot_id;
+<a href=#1162 id=1162 data-nosnippet>1162</a>            <span class="kw">if </span><span class="self">self</span>.metadata.snapshots.contains_key(<span class="kw-2">&amp;</span>snapshot_id) {
+<a href=#1163 id=1163 data-nosnippet>1163</a>                <span class="kw">if </span>!intermediate_snapshots.contains(<span class="kw-2">&amp;</span>snapshot_id) {
+<a href=#1164 id=1164 data-nosnippet>1164</a>                    new_snapshot_log.push(log_entry.clone());
+<a href=#1165 id=1165 data-nosnippet>1165</a>                }
+<a href=#1166 id=1166 data-nosnippet>1166</a>            } <span class="kw">else if </span>has_removed_snapshots {
+<a href=#1167 id=1167 data-nosnippet>1167</a>                <span class="comment">// any invalid entry causes the history before it to be removed. otherwise, there could be
+<a href=#1168 id=1168 data-nosnippet>1168</a>                // history gaps that cause time-travel queries to produce incorrect results. for example,
+<a href=#1169 id=1169 data-nosnippet>1169</a>                // if history is [(t1, s1), (t2, s2), (t3, s3)] and s2 is removed, the history cannot be
+<a href=#1170 id=1170 data-nosnippet>1170</a>                // [(t1, s1), (t3, s3)] because it appears that s3 was current during the time between t2
+<a href=#1171 id=1171 data-nosnippet>1171</a>                // and t3 when in fact s2 was the current snapshot.
+<a href=#1172 id=1172 data-nosnippet>1172</a>                </span>new_snapshot_log.clear();
+<a href=#1173 id=1173 data-nosnippet>1173</a>            }
+<a href=#1174 id=1174 data-nosnippet>1174</a>        }
+<a href=#1175 id=1175 data-nosnippet>1175</a>
+<a href=#1176 id=1176 data-nosnippet>1176</a>        <span class="kw">if let </span><span class="prelude-val">Some</span>(current_snapshot_id) = <span class="self">self</span>.metadata.current_snapshot_id {
+<a href=#1177 id=1177 data-nosnippet>1177</a>            <span class="kw">let </span>last_id = new_snapshot_log.last().map(|entry| entry.snapshot_id);
+<a href=#1178 id=1178 data-nosnippet>1178</a>            <span class="kw">if </span>last_id != <span class="prelude-val">Some</span>(current_snapshot_id) {
+<a href=#1179 id=1179 data-nosnippet>1179</a>                <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#1180 id=1180 data-nosnippet>1180</a>                    ErrorKind::DataInvalid,
+<a href=#1181 id=1181 data-nosnippet>1181</a>                    <span class="string">"Cannot set invalid snapshot log: latest entry is not the current snapshot"</span>,
+<a href=#1182 id=1182 data-nosnippet>1182</a>                ));
+<a href=#1183 id=1183 data-nosnippet>1183</a>            }
+<a href=#1184 id=1184 data-nosnippet>1184</a>        };
+<a href=#1185 id=1185 data-nosnippet>1185</a>
+<a href=#1186 id=1186 data-nosnippet>1186</a>        <span class="self">self</span>.metadata.snapshot_log = new_snapshot_log;
+<a href=#1187 id=1187 data-nosnippet>1187</a>        <span class="prelude-val">Ok</span>(())
+<a href=#1188 id=1188 data-nosnippet>1188</a>    }
+<a href=#1189 id=1189 data-nosnippet>1189</a>
+<a href=#1190 id=1190 data-nosnippet>1190</a>    <span class="doccomment">/// Finds intermediate snapshots that have not been committed as the current snapshot.
+<a href=#1191 id=1191 data-nosnippet>1191</a>    ///
+<a href=#1192 id=1192 data-nosnippet>1192</a>    /// Transactions can create snapshots that are never the current snapshot because several
+<a href=#1193 id=1193 data-nosnippet>1193</a>    /// changes are combined by the transaction into one table metadata update. when each
+<a href=#1194 id=1194 data-nosnippet>1194</a>    /// intermediate snapshot is added to table metadata, it is added to the snapshot log, assuming
+<a href=#1195 id=1195 data-nosnippet>1195</a>    /// that it will be the current snapshot. when there are multiple snapshot updates, the log must
+<a href=#1196 id=1196 data-nosnippet>1196</a>    /// be corrected by suppressing the intermediate snapshot entries.
+<a href=#1197 id=1197 data-nosnippet>1197</a>    ///     
+<a href=#1198 id=1198 data-nosnippet>1198</a>    /// A snapshot is an intermediate snapshot if it was added but is not the current snapshot.
+<a href=#1199 id=1199 data-nosnippet>1199</a>    </span><span class="kw">fn </span>get_intermediate_snapshots(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; HashSet&lt;i64&gt; {
+<a href=#1200 id=1200 data-nosnippet>1200</a>        <span class="kw">let </span>added_snapshot_ids = <span class="self">self
+<a href=#1201 id=1201 data-nosnippet>1201</a>            </span>.changes
+<a href=#1202 id=1202 data-nosnippet>1202</a>            .iter()
+<a href=#1203 id=1203 data-nosnippet>1203</a>            .filter_map(|update| <span class="kw">match </span>update {
+<a href=#1204 id=1204 data-nosnippet>1204</a>                TableUpdate::AddSnapshot { snapshot } =&gt; <span class="prelude-val">Some</span>(snapshot.snapshot_id()),
+<a href=#1205 id=1205 data-nosnippet>1205</a>                <span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,
+<a href=#1206 id=1206 data-nosnippet>1206</a>            })
+<a href=#1207 id=1207 data-nosnippet>1207</a>            .collect::&lt;HashSet&lt;<span class="kw">_</span>&gt;&gt;();
+<a href=#1208 id=1208 data-nosnippet>1208</a>
+<a href=#1209 id=1209 data-nosnippet>1209</a>        <span class="self">self</span>.changes
+<a href=#1210 id=1210 data-nosnippet>1210</a>            .iter()
+<a href=#1211 id=1211 data-nosnippet>1211</a>            .filter_map(|update| <span class="kw">match </span>update {
+<a href=#1212 id=1212 data-nosnippet>1212</a>                TableUpdate::SetSnapshotRef {
+<a href=#1213 id=1213 data-nosnippet>1213</a>                    ref_name,
+<a href=#1214 id=1214 data-nosnippet>1214</a>                    reference,
+<a href=#1215 id=1215 data-nosnippet>1215</a>                } =&gt; {
+<a href=#1216 id=1216 data-nosnippet>1216</a>                    <span class="kw">if </span>added_snapshot_ids.contains(<span class="kw-2">&amp;</span>reference.snapshot_id)
+<a href=#1217 id=1217 data-nosnippet>1217</a>                        &amp;&amp; ref_name == MAIN_BRANCH
+<a href=#1218 id=1218 data-nosnippet>1218</a>                        &amp;&amp; reference.snapshot_id
+<a href=#1219 id=1219 data-nosnippet>1219</a>                            != <span class="self">self
+<a href=#1220 id=1220 data-nosnippet>1220</a>                                </span>.metadata
+<a href=#1221 id=1221 data-nosnippet>1221</a>                                .current_snapshot_id
+<a href=#1222 id=1222 data-nosnippet>1222</a>                                .unwrap_or(i64::from(<span class="self">Self</span>::LAST_ADDED))
+<a href=#1223 id=1223 data-nosnippet>1223</a>                    {
+<a href=#1224 id=1224 data-nosnippet>1224</a>                        <span class="prelude-val">Some</span>(reference.snapshot_id)
+<a href=#1225 id=1225 data-nosnippet>1225</a>                    } <span class="kw">else </span>{
+<a href=#1226 id=1226 data-nosnippet>1226</a>                        <span class="prelude-val">None
+<a href=#1227 id=1227 data-nosnippet>1227</a>                    </span>}
+<a href=#1228 id=1228 data-nosnippet>1228</a>                }
+<a href=#1229 id=1229 data-nosnippet>1229</a>                <span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,
+<a href=#1230 id=1230 data-nosnippet>1230</a>            })
+<a href=#1231 id=1231 data-nosnippet>1231</a>            .collect()
+<a href=#1232 id=1232 data-nosnippet>1232</a>    }
+<a href=#1233 id=1233 data-nosnippet>1233</a>
+<a href=#1234 id=1234 data-nosnippet>1234</a>    <span class="kw">fn </span>reassign_ids(
+<a href=#1235 id=1235 data-nosnippet>1235</a>        schema: Schema,
+<a href=#1236 id=1236 data-nosnippet>1236</a>        spec: UnboundPartitionSpec,
+<a href=#1237 id=1237 data-nosnippet>1237</a>        sort_order: SortOrder,
+<a href=#1238 id=1238 data-nosnippet>1238</a>    ) -&gt; <span class="prelude-ty">Result</span>&lt;(Schema, PartitionSpec, SortOrder)&gt; {
+<a href=#1239 id=1239 data-nosnippet>1239</a>        <span class="comment">// Re-assign field ids and schema ids for a new table.
+<a href=#1240 id=1240 data-nosnippet>1240</a>        </span><span class="kw">let </span>previous_id_to_name = schema.field_id_to_name_map().clone();
+<a href=#1241 id=1241 data-nosnippet>1241</a>        <span class="kw">let </span>fresh_schema = schema
+<a href=#1242 id=1242 data-nosnippet>1242</a>            .into_builder()
+<a href=#1243 id=1243 data-nosnippet>1243</a>            .with_schema_id(DEFAULT_SCHEMA_ID)
+<a href=#1244 id=1244 data-nosnippet>1244</a>            .with_reassigned_field_ids(FIRST_FIELD_ID)
+<a href=#1245 id=1245 data-nosnippet>1245</a>            .build()<span class="question-mark">?</span>;
+<a href=#1246 id=1246 data-nosnippet>1246</a>
+<a href=#1247 id=1247 data-nosnippet>1247</a>        <span class="comment">// Re-build partition spec with new ids
+<a href=#1248 id=1248 data-nosnippet>1248</a>        </span><span class="kw">let </span><span class="kw-2">mut </span>fresh_spec = PartitionSpecBuilder::new(fresh_schema.clone());
+<a href=#1249 id=1249 data-nosnippet>1249</a>        <span class="kw">for </span>field <span class="kw">in </span>spec.fields() {
+<a href=#1250 id=1250 data-nosnippet>1250</a>            <span class="kw">let </span>source_field_name = previous_id_to_name.get(<span class="kw-2">&amp;</span>field.source_id).ok_or_else(|| {
+<a href=#1251 id=1251 data-nosnippet>1251</a>                Error::new(
+<a href=#1252 id=1252 data-nosnippet>1252</a>                    ErrorKind::DataInvalid,
+<a href=#1253 id=1253 data-nosnippet>1253</a>                    <span class="macro">format!</span>(
+<a href=#1254 id=1254 data-nosnippet>1254</a>                        <span class="string">"Cannot find source column with id {} for partition column {} in schema."</span>,
+<a href=#1255 id=1255 data-nosnippet>1255</a>                        field.source_id, field.name
+<a href=#1256 id=1256 data-nosnippet>1256</a>                    ),
+<a href=#1257 id=1257 data-nosnippet>1257</a>                )
+<a href=#1258 id=1258 data-nosnippet>1258</a>            })<span class="question-mark">?</span>;
+<a href=#1259 id=1259 data-nosnippet>1259</a>            fresh_spec =
+<a href=#1260 id=1260 data-nosnippet>1260</a>                fresh_spec.add_partition_field(source_field_name, <span class="kw-2">&amp;</span>field.name, field.transform)<span class="question-mark">?</span>;
+<a href=#1261 id=1261 data-nosnippet>1261</a>        }
+<a href=#1262 id=1262 data-nosnippet>1262</a>        <span class="kw">let </span>fresh_spec = fresh_spec.build()<span class="question-mark">?</span>;
+<a href=#1263 id=1263 data-nosnippet>1263</a>
+<a href=#1264 id=1264 data-nosnippet>1264</a>        <span class="comment">// Re-build sort order with new ids
+<a href=#1265 id=1265 data-nosnippet>1265</a>        </span><span class="kw">let </span><span class="kw-2">mut </span>fresh_order = SortOrder::builder();
+<a href=#1266 id=1266 data-nosnippet>1266</a>        <span class="kw">for </span><span class="kw-2">mut </span>field <span class="kw">in </span>sort_order.fields {
+<a href=#1267 id=1267 data-nosnippet>1267</a>            <span class="kw">let </span>source_field_name = previous_id_to_name.get(<span class="kw-2">&amp;</span>field.source_id).ok_or_else(|| {
+<a href=#1268 id=1268 data-nosnippet>1268</a>                Error::new(
+<a href=#1269 id=1269 data-nosnippet>1269</a>                    ErrorKind::DataInvalid,
+<a href=#1270 id=1270 data-nosnippet>1270</a>                    <span class="macro">format!</span>(
+<a href=#1271 id=1271 data-nosnippet>1271</a>                        <span class="string">"Cannot find source column with id {} for sort column in schema."</span>,
+<a href=#1272 id=1272 data-nosnippet>1272</a>                        field.source_id
+<a href=#1273 id=1273 data-nosnippet>1273</a>                    ),
+<a href=#1274 id=1274 data-nosnippet>1274</a>                )
+<a href=#1275 id=1275 data-nosnippet>1275</a>            })<span class="question-mark">?</span>;
+<a href=#1276 id=1276 data-nosnippet>1276</a>            <span class="kw">let </span>new_field_id = fresh_schema
+<a href=#1277 id=1277 data-nosnippet>1277</a>                       .field_by_name(source_field_name)
+<a href=#1278 id=1278 data-nosnippet>1278</a>                       .ok_or_else(|| {
+<a href=#1279 id=1279 data-nosnippet>1279</a>                           Error::new(
+<a href=#1280 id=1280 data-nosnippet>1280</a>                               ErrorKind::Unexpected,
+<a href=#1281 id=1281 data-nosnippet>1281</a>                               <span class="macro">format!</span>(
+<a href=#1282 id=1282 data-nosnippet>1282</a>                                   <span class="string">"Cannot find source column with name {source_field_name} for sort column in re-assigned schema."
+<a href=#1283 id=1283 data-nosnippet>1283</a>                               </span>),
+<a href=#1284 id=1284 data-nosnippet>1284</a>                           )
+<a href=#1285 id=1285 data-nosnippet>1285</a>                       })<span class="question-mark">?</span>.id;
+<a href=#1286 id=1286 data-nosnippet>1286</a>            field.source_id = new_field_id;
+<a href=#1287 id=1287 data-nosnippet>1287</a>            fresh_order.with_sort_field(field);
+<a href=#1288 id=1288 data-nosnippet>1288</a>        }
+<a href=#1289 id=1289 data-nosnippet>1289</a>        <span class="kw">let </span>fresh_sort_order = fresh_order.build(<span class="kw-2">&amp;</span>fresh_schema)<span class="question-mark">?</span>;
+<a href=#1290 id=1290 data-nosnippet>1290</a>
+<a href=#1291 id=1291 data-nosnippet>1291</a>        <span class="prelude-val">Ok</span>((fresh_schema, fresh_spec, fresh_sort_order))
+<a href=#1292 id=1292 data-nosnippet>1292</a>    }
+<a href=#1293 id=1293 data-nosnippet>1293</a>
+<a href=#1294 id=1294 data-nosnippet>1294</a>    <span class="kw">fn </span>reuse_or_create_new_schema_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_schema: <span class="kw-2">&amp;</span>Schema) -&gt; i32 {
+<a href=#1295 id=1295 data-nosnippet>1295</a>        <span class="self">self</span>.metadata
+<a href=#1296 id=1296 data-nosnippet>1296</a>            .schemas
+<a href=#1297 id=1297 data-nosnippet>1297</a>            .iter()
+<a href=#1298 id=1298 data-nosnippet>1298</a>            .find_map(|(id, schema)| new_schema.is_same_schema(schema).then_some(<span class="kw-2">*</span>id))
+<a href=#1299 id=1299 data-nosnippet>1299</a>            .unwrap_or_else(|| <span class="self">self</span>.get_highest_schema_id() + <span class="number">1</span>)
+<a href=#1300 id=1300 data-nosnippet>1300</a>    }
+<a href=#1301 id=1301 data-nosnippet>1301</a>
+<a href=#1302 id=1302 data-nosnippet>1302</a>    <span class="kw">fn </span>get_highest_schema_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; i32 {
+<a href=#1303 id=1303 data-nosnippet>1303</a>        <span class="kw-2">*</span><span class="self">self
+<a href=#1304 id=1304 data-nosnippet>1304</a>            </span>.metadata
+<a href=#1305 id=1305 data-nosnippet>1305</a>            .schemas
+<a href=#1306 id=1306 data-nosnippet>1306</a>            .keys()
+<a href=#1307 id=1307 data-nosnippet>1307</a>            .max()
+<a href=#1308 id=1308 data-nosnippet>1308</a>            .unwrap_or(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id)
+<a href=#1309 id=1309 data-nosnippet>1309</a>    }
+<a href=#1310 id=1310 data-nosnippet>1310</a>
+<a href=#1311 id=1311 data-nosnippet>1311</a>    <span class="kw">fn </span>get_current_schema(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw-2">&amp;</span>SchemaRef&gt; {
+<a href=#1312 id=1312 data-nosnippet>1312</a>        <span class="self">self</span>.metadata
+<a href=#1313 id=1313 data-nosnippet>1313</a>            .schemas
+<a href=#1314 id=1314 data-nosnippet>1314</a>            .get(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id)
+<a href=#1315 id=1315 data-nosnippet>1315</a>            .ok_or_else(|| {
+<a href=#1316 id=1316 data-nosnippet>1316</a>                Error::new(
+<a href=#1317 id=1317 data-nosnippet>1317</a>                    ErrorKind::DataInvalid,
+<a href=#1318 id=1318 data-nosnippet>1318</a>                    <span class="macro">format!</span>(
+<a href=#1319 id=1319 data-nosnippet>1319</a>                        <span class="string">"Current schema with id '{}' not found in table metadata."</span>,
+<a href=#1320 id=1320 data-nosnippet>1320</a>                        <span class="self">self</span>.metadata.current_schema_id
+<a href=#1321 id=1321 data-nosnippet>1321</a>                    ),
+<a href=#1322 id=1322 data-nosnippet>1322</a>                )
+<a href=#1323 id=1323 data-nosnippet>1323</a>            })
+<a href=#1324 id=1324 data-nosnippet>1324</a>    }
+<a href=#1325 id=1325 data-nosnippet>1325</a>
+<a href=#1326 id=1326 data-nosnippet>1326</a>    <span class="kw">fn </span>get_default_sort_order(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;SortOrderRef&gt; {
+<a href=#1327 id=1327 data-nosnippet>1327</a>        <span class="self">self</span>.metadata
+<a href=#1328 id=1328 data-nosnippet>1328</a>            .sort_orders
+<a href=#1329 id=1329 data-nosnippet>1329</a>            .get(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.default_sort_order_id)
+<a href=#1330 id=1330 data-nosnippet>1330</a>            .cloned()
+<a href=#1331 id=1331 data-nosnippet>1331</a>            .ok_or_else(|| {
+<a href=#1332 id=1332 data-nosnippet>1332</a>                Error::new(
+<a href=#1333 id=1333 data-nosnippet>1333</a>                    ErrorKind::DataInvalid,
+<a href=#1334 id=1334 data-nosnippet>1334</a>                    <span class="macro">format!</span>(
+<a href=#1335 id=1335 data-nosnippet>1335</a>                        <span class="string">"Default sort order with id '{}' not found in table metadata."</span>,
+<a href=#1336 id=1336 data-nosnippet>1336</a>                        <span class="self">self</span>.metadata.default_sort_order_id
+<a href=#1337 id=1337 data-nosnippet>1337</a>                    ),
+<a href=#1338 id=1338 data-nosnippet>1338</a>                )
+<a href=#1339 id=1339 data-nosnippet>1339</a>            })
+<a href=#1340 id=1340 data-nosnippet>1340</a>    }
+<a href=#1341 id=1341 data-nosnippet>1341</a>
+<a href=#1342 id=1342 data-nosnippet>1342</a>    <span class="doccomment">/// If a compatible spec already exists, use the same ID. Otherwise, use 1 more than the highest ID.
+<a href=#1343 id=1343 data-nosnippet>1343</a>    </span><span class="kw">fn </span>reuse_or_create_new_spec_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_spec: <span class="kw-2">&amp;</span>PartitionSpec) -&gt; i32 {
+<a href=#1344 id=1344 data-nosnippet>1344</a>        <span class="self">self</span>.metadata
+<a href=#1345 id=1345 data-nosnippet>1345</a>            .partition_specs
+<a href=#1346 id=1346 data-nosnippet>1346</a>            .iter()
+<a href=#1347 id=1347 data-nosnippet>1347</a>            .find_map(|(id, old_spec)| new_spec.is_compatible_with(old_spec).then_some(<span class="kw-2">*</span>id))
+<a href=#1348 id=1348 data-nosnippet>1348</a>            .unwrap_or_else(|| {
+<a href=#1349 id=1349 data-nosnippet>1349</a>                <span class="self">self</span>.get_highest_spec_id()
+<a href=#1350 id=1350 data-nosnippet>1350</a>                    .map(|id| id + <span class="number">1</span>)
+<a href=#1351 id=1351 data-nosnippet>1351</a>                    .unwrap_or(DEFAULT_PARTITION_SPEC_ID)
+<a href=#1352 id=1352 data-nosnippet>1352</a>            })
+<a href=#1353 id=1353 data-nosnippet>1353</a>    }
+<a href=#1354 id=1354 data-nosnippet>1354</a>
+<a href=#1355 id=1355 data-nosnippet>1355</a>    <span class="kw">fn </span>get_highest_spec_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Option</span>&lt;i32&gt; {
+<a href=#1356 id=1356 data-nosnippet>1356</a>        <span class="self">self</span>.metadata.partition_specs.keys().max().copied()
+<a href=#1357 id=1357 data-nosnippet>1357</a>    }
+<a href=#1358 id=1358 data-nosnippet>1358</a>
+<a href=#1359 id=1359 data-nosnippet>1359</a>    <span class="doccomment">/// If a compatible sort-order already exists, use the same ID. Otherwise, use 1 more than the highest ID.
+<a href=#1360 id=1360 data-nosnippet>1360</a>    </span><span class="kw">fn </span>reuse_or_create_new_sort_id(<span class="kw-2">&amp;</span><span class="self">self</span>, new_sort_order: <span class="kw-2">&amp;</span>SortOrder) -&gt; i64 {
+<a href=#1361 id=1361 data-nosnippet>1361</a>        <span class="kw">if </span>new_sort_order.is_unsorted() {
+<a href=#1362 id=1362 data-nosnippet>1362</a>            <span class="kw">return </span>SortOrder::unsorted_order().order_id;
+<a href=#1363 id=1363 data-nosnippet>1363</a>        }
+<a href=#1364 id=1364 data-nosnippet>1364</a>
+<a href=#1365 id=1365 data-nosnippet>1365</a>        <span class="self">self</span>.metadata
+<a href=#1366 id=1366 data-nosnippet>1366</a>            .sort_orders
+<a href=#1367 id=1367 data-nosnippet>1367</a>            .iter()
+<a href=#1368 id=1368 data-nosnippet>1368</a>            .find_map(|(id, sort_order)| {
+<a href=#1369 id=1369 data-nosnippet>1369</a>                sort_order.fields.eq(<span class="kw-2">&amp;</span>new_sort_order.fields).then_some(<span class="kw-2">*</span>id)
+<a href=#1370 id=1370 data-nosnippet>1370</a>            })
+<a href=#1371 id=1371 data-nosnippet>1371</a>            .unwrap_or_else(|| {
+<a href=#1372 id=1372 data-nosnippet>1372</a>                <span class="self">self</span>.highest_sort_order_id()
+<a href=#1373 id=1373 data-nosnippet>1373</a>                    .unwrap_or(SortOrder::unsorted_order().order_id)
+<a href=#1374 id=1374 data-nosnippet>1374</a>                    + <span class="number">1
+<a href=#1375 id=1375 data-nosnippet>1375</a>            </span>})
+<a href=#1376 id=1376 data-nosnippet>1376</a>    }
+<a href=#1377 id=1377 data-nosnippet>1377</a>
+<a href=#1378 id=1378 data-nosnippet>1378</a>    <span class="kw">fn </span>highest_sort_order_id(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Option</span>&lt;i64&gt; {
+<a href=#1379 id=1379 data-nosnippet>1379</a>        <span class="self">self</span>.metadata.sort_orders.keys().max().copied()
+<a href=#1380 id=1380 data-nosnippet>1380</a>    }
+<a href=#1381 id=1381 data-nosnippet>1381</a>
+<a href=#1382 id=1382 data-nosnippet>1382</a>    <span class="doccomment">/// Remove schemas by their ids from the table metadata.
+<a href=#1383 id=1383 data-nosnippet>1383</a>    /// Does nothing if a schema id is not present. Active schemas should not be removed.
+<a href=#1384 id=1384 data-nosnippet>1384</a>    </span><span class="kw">pub fn </span>remove_schemas(<span class="kw-2">mut </span><span class="self">self</span>, schema_id_to_remove: <span class="kw-2">&amp;</span>[i32]) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>&gt; {
+<a href=#1385 id=1385 data-nosnippet>1385</a>        <span class="kw">if </span>schema_id_to_remove.contains(<span class="kw-2">&amp;</span><span class="self">self</span>.metadata.current_schema_id) {
+<a href=#1386 id=1386 data-nosnippet>1386</a>            <span class="kw">return </span><span class="prelude-val">Err</span>(Error::new(
+<a href=#1387 id=1387 data-nosnippet>1387</a>                ErrorKind::DataInvalid,
+<a href=#1388 id=1388 data-nosnippet>1388</a>                <span class="string">"Cannot remove current schema"</span>,
+<a href=#1389 id=1389 data-nosnippet>1389</a>            ));
+<a href=#1390 id=1390 data-nosnippet>1390</a>        }
+<a href=#1391 id=1391 data-nosnippet>1391</a>
+<a href=#1392 id=1392 data-nosnippet>1392</a>        <span class="kw">if </span>schema_id_to_remove.is_empty() {
+<a href=#1393 id=1393 data-nosnippet>1393</a>            <span class="kw">return </span><span class="prelude-val">Ok</span>(<span class="self">self</span>);
+<a href=#1394 id=1394 data-nosnippet>1394</a>        }
+<a href=#1395 id=1395 data-nosnippet>1395</a>
+<a href=#1396 id=1396 data-nosnippet>1396</a>        <span class="kw">let </span><span class="kw-2">mut </span>removed_schemas = Vec::with_capacity(schema_id_to_remove.len());
+<a href=#1397 id=1397 data-nosnippet>1397</a>        <span class="self">self</span>.metadata.schemas.retain(|id, _schema| {
+<a href=#1398 id=1398 data-nosnippet>1398</a>            <span class="kw">if </span>schema_id_to_remove.contains(id) {
+<a href=#1399 id=1399 data-nosnippet>1399</a>                removed_schemas.push(<span class="kw-2">*</span>id);
+<a href=#1400 id=1400 data-nosnippet>1400</a>                <span class="bool-val">false
+<a href=#1401 id=1401 data-nosnippet>1401</a>            </span>} <span class="kw">else </span>{
+<a href=#1402 id=1402 data-nosnippet>1402</a>                <span class="bool-val">true
+<a href=#1403 id=1403 data-nosnippet>1403</a>            </span>}
+<a href=#1404 id=1404 data-nosnippet>1404</a>        });
+<a href=#1405 id=1405 data-nosnippet>1405</a>
+<a href=#1406 id=1406 data-nosnippet>1406</a>        <span class="self">self</span>.changes.push(TableUpdate::RemoveSchemas {
+<a href=#1407 id=1407 data-nosnippet>1407</a>            schema_ids: removed_schemas,
+<a href=#1408 id=1408 data-nosnippet>1408</a>        });
+<a href=#1409 id=1409 data-nosnippet>1409</a>
+<a href=#1410 id=1410 data-nosnippet>1410</a>        <span class="prelude-val">Ok</span>(<span class="self">self</span>)
+<a href=#1411 id=1411 data-nosnippet>1411</a>    }
+<a href=#1412 id=1412 data-nosnippet>1412</a>}
+<a href=#1413 id=1413 data-nosnippet>1413</a>
+<a href=#1414 id=1414 data-nosnippet>1414</a><span class="kw">impl </span>From&lt;TableMetadataBuildResult&gt; <span class="kw">for </span>TableMetadata {
+<a href=#1415 id=1415 data-nosnippet>1415</a>    <span class="kw">fn </span>from(result: TableMetadataBuildResult) -&gt; <span class="self">Self </span>{
+<a href=#1416 id=1416 data-nosnippet>1416</a>        result.metadata
+<a href=#1417 id=1417 data-nosnippet>1417</a>    }
+<a href=#1418 id=1418 data-nosnippet>1418</a>}
+<a href=#1419 id=1419 data-nosnippet>1419</a>
+<a href=#1420 id=1420 data-nosnippet>1420</a><span class="attr">#[cfg(test)]
+<a href=#1421 id=1421 data-nosnippet>1421</a></span><span class="kw">mod </span>tests {
+<a href=#1422 id=1422 data-nosnippet>1422</a>    <span class="kw">use </span>std::fs::File;
+<a href=#1423 id=1423 data-nosnippet>1423</a>    <span class="kw">use </span>std::io::BufReader;
+<a href=#1424 id=1424 data-nosnippet>1424</a>    <span class="kw">use </span>std::thread::sleep;
+<a href=#1425 id=1425 data-nosnippet>1425</a>
+<a href=#1426 id=1426 data-nosnippet>1426</a>    <span class="kw">use super</span>::<span class="kw-2">*</span>;
+<a href=#1427 id=1427 data-nosnippet>1427</a>    <span class="kw">use </span><span class="kw">crate</span>::TableIdent;
+<a href=#1428 id=1428 data-nosnippet>1428</a>    <span class="kw">use </span><span class="kw">crate</span>::io::FileIOBuilder;
+<a href=#1429 id=1429 data-nosnippet>1429</a>    <span class="kw">use </span><span class="kw">crate</span>::spec::{
+<a href=#1430 id=1430 data-nosnippet>1430</a>        BlobMetadata, NestedField, NullOrder, Operation, PartitionSpec, PrimitiveType, Schema,
+<a href=#1431 id=1431 data-nosnippet>1431</a>        SnapshotRetention, SortDirection, SortField, StructType, Summary, TableProperties,
+<a href=#1432 id=1432 data-nosnippet>1432</a>        Transform, Type, UnboundPartitionField,
+<a href=#1433 id=1433 data-nosnippet>1433</a>    };
+<a href=#1434 id=1434 data-nosnippet>1434</a>    <span class="kw">use </span><span class="kw">crate</span>::table::Table;
+<a href=#1435 id=1435 data-nosnippet>1435</a>
+<a href=#1436 id=1436 data-nosnippet>1436</a>    <span class="kw">const </span>TEST_LOCATION: <span class="kw-2">&amp;</span>str = <span class="string">"s3://bucket/test/location"</span>;
+<a href=#1437 id=1437 data-nosnippet>1437</a>    <span class="kw">const </span>LAST_ASSIGNED_COLUMN_ID: i32 = <span class="number">3</span>;
+<a href=#1438 id=1438 data-nosnippet>1438</a>
+<a href=#1439 id=1439 data-nosnippet>1439</a>    <span class="kw">fn </span>schema() -&gt; Schema {
+<a href=#1440 id=1440 data-nosnippet>1440</a>        Schema::builder()
+<a href=#1441 id=1441 data-nosnippet>1441</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#1442 id=1442 data-nosnippet>1442</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1443 id=1443 data-nosnippet>1443</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1444 id=1444 data-nosnippet>1444</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1445 id=1445 data-nosnippet>1445</a>            ])
+<a href=#1446 id=1446 data-nosnippet>1446</a>            .build()
+<a href=#1447 id=1447 data-nosnippet>1447</a>            .unwrap()
+<a href=#1448 id=1448 data-nosnippet>1448</a>    }
+<a href=#1449 id=1449 data-nosnippet>1449</a>
+<a href=#1450 id=1450 data-nosnippet>1450</a>    <span class="kw">fn </span>sort_order() -&gt; SortOrder {
+<a href=#1451 id=1451 data-nosnippet>1451</a>        <span class="kw">let </span>schema = schema();
+<a href=#1452 id=1452 data-nosnippet>1452</a>        SortOrder::builder()
+<a href=#1453 id=1453 data-nosnippet>1453</a>            .with_order_id(<span class="number">1</span>)
+<a href=#1454 id=1454 data-nosnippet>1454</a>            .with_sort_field(SortField {
+<a href=#1455 id=1455 data-nosnippet>1455</a>                source_id: <span class="number">3</span>,
+<a href=#1456 id=1456 data-nosnippet>1456</a>                transform: Transform::Bucket(<span class="number">4</span>),
+<a href=#1457 id=1457 data-nosnippet>1457</a>                direction: SortDirection::Descending,
+<a href=#1458 id=1458 data-nosnippet>1458</a>                null_order: NullOrder::First,
+<a href=#1459 id=1459 data-nosnippet>1459</a>            })
+<a href=#1460 id=1460 data-nosnippet>1460</a>            .build(<span class="kw-2">&amp;</span>schema)
+<a href=#1461 id=1461 data-nosnippet>1461</a>            .unwrap()
+<a href=#1462 id=1462 data-nosnippet>1462</a>    }
+<a href=#1463 id=1463 data-nosnippet>1463</a>
+<a href=#1464 id=1464 data-nosnippet>1464</a>    <span class="kw">fn </span>partition_spec() -&gt; UnboundPartitionSpec {
+<a href=#1465 id=1465 data-nosnippet>1465</a>        UnboundPartitionSpec::builder()
+<a href=#1466 id=1466 data-nosnippet>1466</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#1467 id=1467 data-nosnippet>1467</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"y"</span>, Transform::Identity)
+<a href=#1468 id=1468 data-nosnippet>1468</a>            .unwrap()
+<a href=#1469 id=1469 data-nosnippet>1469</a>            .build()
+<a href=#1470 id=1470 data-nosnippet>1470</a>    }
+<a href=#1471 id=1471 data-nosnippet>1471</a>
+<a href=#1472 id=1472 data-nosnippet>1472</a>    <span class="kw">fn </span>builder_without_changes(format_version: FormatVersion) -&gt; TableMetadataBuilder {
+<a href=#1473 id=1473 data-nosnippet>1473</a>        TableMetadataBuilder::new(
+<a href=#1474 id=1474 data-nosnippet>1474</a>            schema(),
+<a href=#1475 id=1475 data-nosnippet>1475</a>            partition_spec(),
+<a href=#1476 id=1476 data-nosnippet>1476</a>            sort_order(),
+<a href=#1477 id=1477 data-nosnippet>1477</a>            TEST_LOCATION.to_string(),
+<a href=#1478 id=1478 data-nosnippet>1478</a>            format_version,
+<a href=#1479 id=1479 data-nosnippet>1479</a>            HashMap::new(),
+<a href=#1480 id=1480 data-nosnippet>1480</a>        )
 <a href=#1481 id=1481 data-nosnippet>1481</a>        .unwrap()
-<a href=#1482 id=1482 data-nosnippet>1482</a>        .metadata
-<a href=#1483 id=1483 data-nosnippet>1483</a>        .into_builder(<span class="prelude-val">Some</span>(
-<a href=#1484 id=1484 data-nosnippet>1484</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#1485 id=1485 data-nosnippet>1485</a>        ))
-<a href=#1486 id=1486 data-nosnippet>1486</a>    }
-<a href=#1487 id=1487 data-nosnippet>1487</a>
-<a href=#1488 id=1488 data-nosnippet>1488</a>    <span class="attr">#[test]
-<a href=#1489 id=1489 data-nosnippet>1489</a>    </span><span class="kw">fn </span>test_minimal_build() {
-<a href=#1490 id=1490 data-nosnippet>1490</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#1491 id=1491 data-nosnippet>1491</a>            schema(),
-<a href=#1492 id=1492 data-nosnippet>1492</a>            partition_spec(),
-<a href=#1493 id=1493 data-nosnippet>1493</a>            sort_order(),
-<a href=#1494 id=1494 data-nosnippet>1494</a>            TEST_LOCATION.to_string(),
-<a href=#1495 id=1495 data-nosnippet>1495</a>            FormatVersion::V1,
-<a href=#1496 id=1496 data-nosnippet>1496</a>            HashMap::new(),
-<a href=#1497 id=1497 data-nosnippet>1497</a>        )
-<a href=#1498 id=1498 data-nosnippet>1498</a>        .unwrap()
-<a href=#1499 id=1499 data-nosnippet>1499</a>        .build()
+<a href=#1482 id=1482 data-nosnippet>1482</a>        .build()
+<a href=#1483 id=1483 data-nosnippet>1483</a>        .unwrap()
+<a href=#1484 id=1484 data-nosnippet>1484</a>        .metadata
+<a href=#1485 id=1485 data-nosnippet>1485</a>        .into_builder(<span class="prelude-val">Some</span>(
+<a href=#1486 id=1486 data-nosnippet>1486</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#1487 id=1487 data-nosnippet>1487</a>        ))
+<a href=#1488 id=1488 data-nosnippet>1488</a>    }
+<a href=#1489 id=1489 data-nosnippet>1489</a>
+<a href=#1490 id=1490 data-nosnippet>1490</a>    <span class="attr">#[test]
+<a href=#1491 id=1491 data-nosnippet>1491</a>    </span><span class="kw">fn </span>test_minimal_build() {
+<a href=#1492 id=1492 data-nosnippet>1492</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#1493 id=1493 data-nosnippet>1493</a>            schema(),
+<a href=#1494 id=1494 data-nosnippet>1494</a>            partition_spec(),
+<a href=#1495 id=1495 data-nosnippet>1495</a>            sort_order(),
+<a href=#1496 id=1496 data-nosnippet>1496</a>            TEST_LOCATION.to_string(),
+<a href=#1497 id=1497 data-nosnippet>1497</a>            FormatVersion::V1,
+<a href=#1498 id=1498 data-nosnippet>1498</a>            HashMap::new(),
+<a href=#1499 id=1499 data-nosnippet>1499</a>        )
 <a href=#1500 id=1500 data-nosnippet>1500</a>        .unwrap()
-<a href=#1501 id=1501 data-nosnippet>1501</a>        .metadata;
-<a href=#1502 id=1502 data-nosnippet>1502</a>
-<a href=#1503 id=1503 data-nosnippet>1503</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V1);
-<a href=#1504 id=1504 data-nosnippet>1504</a>        <span class="macro">assert_eq!</span>(metadata.location, TEST_LOCATION);
-<a href=#1505 id=1505 data-nosnippet>1505</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
-<a href=#1506 id=1506 data-nosnippet>1506</a>        <span class="macro">assert_eq!</span>(metadata.default_spec.spec_id(), <span class="number">0</span>);
-<a href=#1507 id=1507 data-nosnippet>1507</a>        <span class="macro">assert_eq!</span>(metadata.default_sort_order_id, <span class="number">1</span>);
-<a href=#1508 id=1508 data-nosnippet>1508</a>        <span class="macro">assert_eq!</span>(metadata.last_partition_id, <span class="number">1000</span>);
-<a href=#1509 id=1509 data-nosnippet>1509</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, <span class="number">3</span>);
-<a href=#1510 id=1510 data-nosnippet>1510</a>        <span class="macro">assert_eq!</span>(metadata.snapshots.len(), <span class="number">0</span>);
-<a href=#1511 id=1511 data-nosnippet>1511</a>        <span class="macro">assert_eq!</span>(metadata.current_snapshot_id, <span class="prelude-val">None</span>);
-<a href=#1512 id=1512 data-nosnippet>1512</a>        <span class="macro">assert_eq!</span>(metadata.refs.len(), <span class="number">0</span>);
-<a href=#1513 id=1513 data-nosnippet>1513</a>        <span class="macro">assert_eq!</span>(metadata.properties.len(), <span class="number">0</span>);
-<a href=#1514 id=1514 data-nosnippet>1514</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">0</span>);
-<a href=#1515 id=1515 data-nosnippet>1515</a>        <span class="macro">assert_eq!</span>(metadata.last_sequence_number, <span class="number">0</span>);
-<a href=#1516 id=1516 data-nosnippet>1516</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, LAST_ASSIGNED_COLUMN_ID);
-<a href=#1517 id=1517 data-nosnippet>1517</a>
-<a href=#1518 id=1518 data-nosnippet>1518</a>        <span class="comment">// Test can serialize v1
-<a href=#1519 id=1519 data-nosnippet>1519</a>        </span><span class="kw">let _ </span>= serde_json::to_string(<span class="kw-2">&amp;</span>metadata).unwrap();
-<a href=#1520 id=1520 data-nosnippet>1520</a>
-<a href=#1521 id=1521 data-nosnippet>1521</a>        <span class="comment">// Test can serialize v2
-<a href=#1522 id=1522 data-nosnippet>1522</a>        </span><span class="kw">let </span>metadata = metadata
-<a href=#1523 id=1523 data-nosnippet>1523</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#1524 id=1524 data-nosnippet>1524</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#1525 id=1525 data-nosnippet>1525</a>            ))
-<a href=#1526 id=1526 data-nosnippet>1526</a>            .upgrade_format_version(FormatVersion::V2)
-<a href=#1527 id=1527 data-nosnippet>1527</a>            .unwrap()
-<a href=#1528 id=1528 data-nosnippet>1528</a>            .build()
+<a href=#1501 id=1501 data-nosnippet>1501</a>        .build()
+<a href=#1502 id=1502 data-nosnippet>1502</a>        .unwrap()
+<a href=#1503 id=1503 data-nosnippet>1503</a>        .metadata;
+<a href=#1504 id=1504 data-nosnippet>1504</a>
+<a href=#1505 id=1505 data-nosnippet>1505</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V1);
+<a href=#1506 id=1506 data-nosnippet>1506</a>        <span class="macro">assert_eq!</span>(metadata.location, TEST_LOCATION);
+<a href=#1507 id=1507 data-nosnippet>1507</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
+<a href=#1508 id=1508 data-nosnippet>1508</a>        <span class="macro">assert_eq!</span>(metadata.default_spec.spec_id(), <span class="number">0</span>);
+<a href=#1509 id=1509 data-nosnippet>1509</a>        <span class="macro">assert_eq!</span>(metadata.default_sort_order_id, <span class="number">1</span>);
+<a href=#1510 id=1510 data-nosnippet>1510</a>        <span class="macro">assert_eq!</span>(metadata.last_partition_id, <span class="number">1000</span>);
+<a href=#1511 id=1511 data-nosnippet>1511</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, <span class="number">3</span>);
+<a href=#1512 id=1512 data-nosnippet>1512</a>        <span class="macro">assert_eq!</span>(metadata.snapshots.len(), <span class="number">0</span>);
+<a href=#1513 id=1513 data-nosnippet>1513</a>        <span class="macro">assert_eq!</span>(metadata.current_snapshot_id, <span class="prelude-val">None</span>);
+<a href=#1514 id=1514 data-nosnippet>1514</a>        <span class="macro">assert_eq!</span>(metadata.refs.len(), <span class="number">0</span>);
+<a href=#1515 id=1515 data-nosnippet>1515</a>        <span class="macro">assert_eq!</span>(metadata.properties.len(), <span class="number">0</span>);
+<a href=#1516 id=1516 data-nosnippet>1516</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">0</span>);
+<a href=#1517 id=1517 data-nosnippet>1517</a>        <span class="macro">assert_eq!</span>(metadata.last_sequence_number, <span class="number">0</span>);
+<a href=#1518 id=1518 data-nosnippet>1518</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, LAST_ASSIGNED_COLUMN_ID);
+<a href=#1519 id=1519 data-nosnippet>1519</a>
+<a href=#1520 id=1520 data-nosnippet>1520</a>        <span class="comment">// Test can serialize v1
+<a href=#1521 id=1521 data-nosnippet>1521</a>        </span><span class="kw">let _ </span>= serde_json::to_string(<span class="kw-2">&amp;</span>metadata).unwrap();
+<a href=#1522 id=1522 data-nosnippet>1522</a>
+<a href=#1523 id=1523 data-nosnippet>1523</a>        <span class="comment">// Test can serialize v2
+<a href=#1524 id=1524 data-nosnippet>1524</a>        </span><span class="kw">let </span>metadata = metadata
+<a href=#1525 id=1525 data-nosnippet>1525</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#1526 id=1526 data-nosnippet>1526</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#1527 id=1527 data-nosnippet>1527</a>            ))
+<a href=#1528 id=1528 data-nosnippet>1528</a>            .upgrade_format_version(FormatVersion::V2)
 <a href=#1529 id=1529 data-nosnippet>1529</a>            .unwrap()
-<a href=#1530 id=1530 data-nosnippet>1530</a>            .metadata;
-<a href=#1531 id=1531 data-nosnippet>1531</a>
-<a href=#1532 id=1532 data-nosnippet>1532</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V2);
-<a href=#1533 id=1533 data-nosnippet>1533</a>        <span class="kw">let _ </span>= serde_json::to_string(<span class="kw-2">&amp;</span>metadata).unwrap();
-<a href=#1534 id=1534 data-nosnippet>1534</a>    }
-<a href=#1535 id=1535 data-nosnippet>1535</a>
-<a href=#1536 id=1536 data-nosnippet>1536</a>    <span class="attr">#[test]
-<a href=#1537 id=1537 data-nosnippet>1537</a>    </span><span class="kw">fn </span>test_build_unpartitioned_unsorted() {
-<a href=#1538 id=1538 data-nosnippet>1538</a>        <span class="kw">let </span>schema = Schema::builder().build().unwrap();
-<a href=#1539 id=1539 data-nosnippet>1539</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#1540 id=1540 data-nosnippet>1540</a>            schema.clone(),
-<a href=#1541 id=1541 data-nosnippet>1541</a>            PartitionSpec::unpartition_spec(),
-<a href=#1542 id=1542 data-nosnippet>1542</a>            SortOrder::unsorted_order(),
-<a href=#1543 id=1543 data-nosnippet>1543</a>            TEST_LOCATION.to_string(),
-<a href=#1544 id=1544 data-nosnippet>1544</a>            FormatVersion::V2,
-<a href=#1545 id=1545 data-nosnippet>1545</a>            HashMap::new(),
-<a href=#1546 id=1546 data-nosnippet>1546</a>        )
-<a href=#1547 id=1547 data-nosnippet>1547</a>        .unwrap()
-<a href=#1548 id=1548 data-nosnippet>1548</a>        .build()
+<a href=#1530 id=1530 data-nosnippet>1530</a>            .build()
+<a href=#1531 id=1531 data-nosnippet>1531</a>            .unwrap()
+<a href=#1532 id=1532 data-nosnippet>1532</a>            .metadata;
+<a href=#1533 id=1533 data-nosnippet>1533</a>
+<a href=#1534 id=1534 data-nosnippet>1534</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V2);
+<a href=#1535 id=1535 data-nosnippet>1535</a>        <span class="kw">let _ </span>= serde_json::to_string(<span class="kw-2">&amp;</span>metadata).unwrap();
+<a href=#1536 id=1536 data-nosnippet>1536</a>    }
+<a href=#1537 id=1537 data-nosnippet>1537</a>
+<a href=#1538 id=1538 data-nosnippet>1538</a>    <span class="attr">#[test]
+<a href=#1539 id=1539 data-nosnippet>1539</a>    </span><span class="kw">fn </span>test_build_unpartitioned_unsorted() {
+<a href=#1540 id=1540 data-nosnippet>1540</a>        <span class="kw">let </span>schema = Schema::builder().build().unwrap();
+<a href=#1541 id=1541 data-nosnippet>1541</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#1542 id=1542 data-nosnippet>1542</a>            schema.clone(),
+<a href=#1543 id=1543 data-nosnippet>1543</a>            PartitionSpec::unpartition_spec(),
+<a href=#1544 id=1544 data-nosnippet>1544</a>            SortOrder::unsorted_order(),
+<a href=#1545 id=1545 data-nosnippet>1545</a>            TEST_LOCATION.to_string(),
+<a href=#1546 id=1546 data-nosnippet>1546</a>            FormatVersion::V2,
+<a href=#1547 id=1547 data-nosnippet>1547</a>            HashMap::new(),
+<a href=#1548 id=1548 data-nosnippet>1548</a>        )
 <a href=#1549 id=1549 data-nosnippet>1549</a>        .unwrap()
-<a href=#1550 id=1550 data-nosnippet>1550</a>        .metadata;
-<a href=#1551 id=1551 data-nosnippet>1551</a>
-<a href=#1552 id=1552 data-nosnippet>1552</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V2);
-<a href=#1553 id=1553 data-nosnippet>1553</a>        <span class="macro">assert_eq!</span>(metadata.location, TEST_LOCATION);
-<a href=#1554 id=1554 data-nosnippet>1554</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
-<a href=#1555 id=1555 data-nosnippet>1555</a>        <span class="macro">assert_eq!</span>(metadata.default_spec.spec_id(), <span class="number">0</span>);
-<a href=#1556 id=1556 data-nosnippet>1556</a>        <span class="macro">assert_eq!</span>(metadata.default_sort_order_id, <span class="number">0</span>);
-<a href=#1557 id=1557 data-nosnippet>1557</a>        <span class="macro">assert_eq!</span>(metadata.last_partition_id, UNPARTITIONED_LAST_ASSIGNED_ID);
-<a href=#1558 id=1558 data-nosnippet>1558</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, <span class="number">0</span>);
-<a href=#1559 id=1559 data-nosnippet>1559</a>        <span class="macro">assert_eq!</span>(metadata.snapshots.len(), <span class="number">0</span>);
-<a href=#1560 id=1560 data-nosnippet>1560</a>        <span class="macro">assert_eq!</span>(metadata.current_snapshot_id, <span class="prelude-val">None</span>);
-<a href=#1561 id=1561 data-nosnippet>1561</a>        <span class="macro">assert_eq!</span>(metadata.refs.len(), <span class="number">0</span>);
-<a href=#1562 id=1562 data-nosnippet>1562</a>        <span class="macro">assert_eq!</span>(metadata.properties.len(), <span class="number">0</span>);
-<a href=#1563 id=1563 data-nosnippet>1563</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">0</span>);
-<a href=#1564 id=1564 data-nosnippet>1564</a>        <span class="macro">assert_eq!</span>(metadata.last_sequence_number, <span class="number">0</span>);
-<a href=#1565 id=1565 data-nosnippet>1565</a>    }
-<a href=#1566 id=1566 data-nosnippet>1566</a>
-<a href=#1567 id=1567 data-nosnippet>1567</a>    <span class="attr">#[test]
-<a href=#1568 id=1568 data-nosnippet>1568</a>    </span><span class="kw">fn </span>test_reassigns_ids() {
-<a href=#1569 id=1569 data-nosnippet>1569</a>        <span class="kw">let </span>schema = Schema::builder()
-<a href=#1570 id=1570 data-nosnippet>1570</a>            .with_schema_id(<span class="number">10</span>)
-<a href=#1571 id=1571 data-nosnippet>1571</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#1572 id=1572 data-nosnippet>1572</a>                NestedField::required(<span class="number">11</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1573 id=1573 data-nosnippet>1573</a>                NestedField::required(<span class="number">12</span>, <span class="string">"b"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1574 id=1574 data-nosnippet>1574</a>                NestedField::required(
-<a href=#1575 id=1575 data-nosnippet>1575</a>                    <span class="number">13</span>,
-<a href=#1576 id=1576 data-nosnippet>1576</a>                    <span class="string">"struct"</span>,
-<a href=#1577 id=1577 data-nosnippet>1577</a>                    Type::Struct(StructType::new(<span class="macro">vec!</span>[
-<a href=#1578 id=1578 data-nosnippet>1578</a>                        NestedField::required(<span class="number">14</span>, <span class="string">"nested"</span>, Type::Primitive(PrimitiveType::Long))
-<a href=#1579 id=1579 data-nosnippet>1579</a>                            .into(),
-<a href=#1580 id=1580 data-nosnippet>1580</a>                    ])),
-<a href=#1581 id=1581 data-nosnippet>1581</a>                )
-<a href=#1582 id=1582 data-nosnippet>1582</a>                .into(),
-<a href=#1583 id=1583 data-nosnippet>1583</a>                NestedField::required(<span class="number">15</span>, <span class="string">"c"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1584 id=1584 data-nosnippet>1584</a>            ])
-<a href=#1585 id=1585 data-nosnippet>1585</a>            .build()
-<a href=#1586 id=1586 data-nosnippet>1586</a>            .unwrap();
-<a href=#1587 id=1587 data-nosnippet>1587</a>        <span class="kw">let </span>spec = PartitionSpec::builder(schema.clone())
-<a href=#1588 id=1588 data-nosnippet>1588</a>            .with_spec_id(<span class="number">20</span>)
-<a href=#1589 id=1589 data-nosnippet>1589</a>            .add_partition_field(<span class="string">"a"</span>, <span class="string">"a"</span>, Transform::Identity)
-<a href=#1590 id=1590 data-nosnippet>1590</a>            .unwrap()
-<a href=#1591 id=1591 data-nosnippet>1591</a>            .add_partition_field(<span class="string">"struct.nested"</span>, <span class="string">"nested_partition"</span>, Transform::Identity)
+<a href=#1550 id=1550 data-nosnippet>1550</a>        .build()
+<a href=#1551 id=1551 data-nosnippet>1551</a>        .unwrap()
+<a href=#1552 id=1552 data-nosnippet>1552</a>        .metadata;
+<a href=#1553 id=1553 data-nosnippet>1553</a>
+<a href=#1554 id=1554 data-nosnippet>1554</a>        <span class="macro">assert_eq!</span>(metadata.format_version, FormatVersion::V2);
+<a href=#1555 id=1555 data-nosnippet>1555</a>        <span class="macro">assert_eq!</span>(metadata.location, TEST_LOCATION);
+<a href=#1556 id=1556 data-nosnippet>1556</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
+<a href=#1557 id=1557 data-nosnippet>1557</a>        <span class="macro">assert_eq!</span>(metadata.default_spec.spec_id(), <span class="number">0</span>);
+<a href=#1558 id=1558 data-nosnippet>1558</a>        <span class="macro">assert_eq!</span>(metadata.default_sort_order_id, <span class="number">0</span>);
+<a href=#1559 id=1559 data-nosnippet>1559</a>        <span class="macro">assert_eq!</span>(metadata.last_partition_id, UNPARTITIONED_LAST_ASSIGNED_ID);
+<a href=#1560 id=1560 data-nosnippet>1560</a>        <span class="macro">assert_eq!</span>(metadata.last_column_id, <span class="number">0</span>);
+<a href=#1561 id=1561 data-nosnippet>1561</a>        <span class="macro">assert_eq!</span>(metadata.snapshots.len(), <span class="number">0</span>);
+<a href=#1562 id=1562 data-nosnippet>1562</a>        <span class="macro">assert_eq!</span>(metadata.current_snapshot_id, <span class="prelude-val">None</span>);
+<a href=#1563 id=1563 data-nosnippet>1563</a>        <span class="macro">assert_eq!</span>(metadata.refs.len(), <span class="number">0</span>);
+<a href=#1564 id=1564 data-nosnippet>1564</a>        <span class="macro">assert_eq!</span>(metadata.properties.len(), <span class="number">0</span>);
+<a href=#1565 id=1565 data-nosnippet>1565</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">0</span>);
+<a href=#1566 id=1566 data-nosnippet>1566</a>        <span class="macro">assert_eq!</span>(metadata.last_sequence_number, <span class="number">0</span>);
+<a href=#1567 id=1567 data-nosnippet>1567</a>    }
+<a href=#1568 id=1568 data-nosnippet>1568</a>
+<a href=#1569 id=1569 data-nosnippet>1569</a>    <span class="attr">#[test]
+<a href=#1570 id=1570 data-nosnippet>1570</a>    </span><span class="kw">fn </span>test_reassigns_ids() {
+<a href=#1571 id=1571 data-nosnippet>1571</a>        <span class="kw">let </span>schema = Schema::builder()
+<a href=#1572 id=1572 data-nosnippet>1572</a>            .with_schema_id(<span class="number">10</span>)
+<a href=#1573 id=1573 data-nosnippet>1573</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#1574 id=1574 data-nosnippet>1574</a>                NestedField::required(<span class="number">11</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1575 id=1575 data-nosnippet>1575</a>                NestedField::required(<span class="number">12</span>, <span class="string">"b"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1576 id=1576 data-nosnippet>1576</a>                NestedField::required(
+<a href=#1577 id=1577 data-nosnippet>1577</a>                    <span class="number">13</span>,
+<a href=#1578 id=1578 data-nosnippet>1578</a>                    <span class="string">"struct"</span>,
+<a href=#1579 id=1579 data-nosnippet>1579</a>                    Type::Struct(StructType::new(<span class="macro">vec!</span>[
+<a href=#1580 id=1580 data-nosnippet>1580</a>                        NestedField::required(<span class="number">14</span>, <span class="string">"nested"</span>, Type::Primitive(PrimitiveType::Long))
+<a href=#1581 id=1581 data-nosnippet>1581</a>                            .into(),
+<a href=#1582 id=1582 data-nosnippet>1582</a>                    ])),
+<a href=#1583 id=1583 data-nosnippet>1583</a>                )
+<a href=#1584 id=1584 data-nosnippet>1584</a>                .into(),
+<a href=#1585 id=1585 data-nosnippet>1585</a>                NestedField::required(<span class="number">15</span>, <span class="string">"c"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1586 id=1586 data-nosnippet>1586</a>            ])
+<a href=#1587 id=1587 data-nosnippet>1587</a>            .build()
+<a href=#1588 id=1588 data-nosnippet>1588</a>            .unwrap();
+<a href=#1589 id=1589 data-nosnippet>1589</a>        <span class="kw">let </span>spec = PartitionSpec::builder(schema.clone())
+<a href=#1590 id=1590 data-nosnippet>1590</a>            .with_spec_id(<span class="number">20</span>)
+<a href=#1591 id=1591 data-nosnippet>1591</a>            .add_partition_field(<span class="string">"a"</span>, <span class="string">"a"</span>, Transform::Identity)
 <a href=#1592 id=1592 data-nosnippet>1592</a>            .unwrap()
-<a href=#1593 id=1593 data-nosnippet>1593</a>            .build()
-<a href=#1594 id=1594 data-nosnippet>1594</a>            .unwrap();
-<a href=#1595 id=1595 data-nosnippet>1595</a>        <span class="kw">let </span>sort_order = SortOrder::builder()
-<a href=#1596 id=1596 data-nosnippet>1596</a>            .with_fields(<span class="macro">vec!</span>[SortField {
-<a href=#1597 id=1597 data-nosnippet>1597</a>                source_id: <span class="number">11</span>,
-<a href=#1598 id=1598 data-nosnippet>1598</a>                transform: Transform::Identity,
-<a href=#1599 id=1599 data-nosnippet>1599</a>                direction: SortDirection::Ascending,
-<a href=#1600 id=1600 data-nosnippet>1600</a>                null_order: NullOrder::First,
-<a href=#1601 id=1601 data-nosnippet>1601</a>            }])
-<a href=#1602 id=1602 data-nosnippet>1602</a>            .with_order_id(<span class="number">10</span>)
-<a href=#1603 id=1603 data-nosnippet>1603</a>            .build(<span class="kw-2">&amp;</span>schema)
-<a href=#1604 id=1604 data-nosnippet>1604</a>            .unwrap();
-<a href=#1605 id=1605 data-nosnippet>1605</a>
-<a href=#1606 id=1606 data-nosnippet>1606</a>        <span class="kw">let </span>(fresh_schema, fresh_spec, fresh_sort_order) =
-<a href=#1607 id=1607 data-nosnippet>1607</a>            TableMetadataBuilder::reassign_ids(schema, spec.into_unbound(), sort_order).unwrap();
-<a href=#1608 id=1608 data-nosnippet>1608</a>
-<a href=#1609 id=1609 data-nosnippet>1609</a>        <span class="kw">let </span>expected_schema = Schema::builder()
-<a href=#1610 id=1610 data-nosnippet>1610</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#1611 id=1611 data-nosnippet>1611</a>                NestedField::required(<span class="number">1</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1612 id=1612 data-nosnippet>1612</a>                NestedField::required(<span class="number">2</span>, <span class="string">"b"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1613 id=1613 data-nosnippet>1613</a>                NestedField::required(
-<a href=#1614 id=1614 data-nosnippet>1614</a>                    <span class="number">3</span>,
-<a href=#1615 id=1615 data-nosnippet>1615</a>                    <span class="string">"struct"</span>,
-<a href=#1616 id=1616 data-nosnippet>1616</a>                    Type::Struct(StructType::new(<span class="macro">vec!</span>[
-<a href=#1617 id=1617 data-nosnippet>1617</a>                        NestedField::required(<span class="number">5</span>, <span class="string">"nested"</span>, Type::Primitive(PrimitiveType::Long))
-<a href=#1618 id=1618 data-nosnippet>1618</a>                            .into(),
-<a href=#1619 id=1619 data-nosnippet>1619</a>                    ])),
-<a href=#1620 id=1620 data-nosnippet>1620</a>                )
-<a href=#1621 id=1621 data-nosnippet>1621</a>                .into(),
-<a href=#1622 id=1622 data-nosnippet>1622</a>                NestedField::required(<span class="number">4</span>, <span class="string">"c"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1623 id=1623 data-nosnippet>1623</a>            ])
-<a href=#1624 id=1624 data-nosnippet>1624</a>            .build()
-<a href=#1625 id=1625 data-nosnippet>1625</a>            .unwrap();
-<a href=#1626 id=1626 data-nosnippet>1626</a>
-<a href=#1627 id=1627 data-nosnippet>1627</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(expected_schema.clone())
-<a href=#1628 id=1628 data-nosnippet>1628</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#1629 id=1629 data-nosnippet>1629</a>            .add_partition_field(<span class="string">"a"</span>, <span class="string">"a"</span>, Transform::Identity)
-<a href=#1630 id=1630 data-nosnippet>1630</a>            .unwrap()
-<a href=#1631 id=1631 data-nosnippet>1631</a>            .add_partition_field(<span class="string">"struct.nested"</span>, <span class="string">"nested_partition"</span>, Transform::Identity)
+<a href=#1593 id=1593 data-nosnippet>1593</a>            .add_partition_field(<span class="string">"struct.nested"</span>, <span class="string">"nested_partition"</span>, Transform::Identity)
+<a href=#1594 id=1594 data-nosnippet>1594</a>            .unwrap()
+<a href=#1595 id=1595 data-nosnippet>1595</a>            .build()
+<a href=#1596 id=1596 data-nosnippet>1596</a>            .unwrap();
+<a href=#1597 id=1597 data-nosnippet>1597</a>        <span class="kw">let </span>sort_order = SortOrder::builder()
+<a href=#1598 id=1598 data-nosnippet>1598</a>            .with_fields(<span class="macro">vec!</span>[SortField {
+<a href=#1599 id=1599 data-nosnippet>1599</a>                source_id: <span class="number">11</span>,
+<a href=#1600 id=1600 data-nosnippet>1600</a>                transform: Transform::Identity,
+<a href=#1601 id=1601 data-nosnippet>1601</a>                direction: SortDirection::Ascending,
+<a href=#1602 id=1602 data-nosnippet>1602</a>                null_order: NullOrder::First,
+<a href=#1603 id=1603 data-nosnippet>1603</a>            }])
+<a href=#1604 id=1604 data-nosnippet>1604</a>            .with_order_id(<span class="number">10</span>)
+<a href=#1605 id=1605 data-nosnippet>1605</a>            .build(<span class="kw-2">&amp;</span>schema)
+<a href=#1606 id=1606 data-nosnippet>1606</a>            .unwrap();
+<a href=#1607 id=1607 data-nosnippet>1607</a>
+<a href=#1608 id=1608 data-nosnippet>1608</a>        <span class="kw">let </span>(fresh_schema, fresh_spec, fresh_sort_order) =
+<a href=#1609 id=1609 data-nosnippet>1609</a>            TableMetadataBuilder::reassign_ids(schema, spec.into_unbound(), sort_order).unwrap();
+<a href=#1610 id=1610 data-nosnippet>1610</a>
+<a href=#1611 id=1611 data-nosnippet>1611</a>        <span class="kw">let </span>expected_schema = Schema::builder()
+<a href=#1612 id=1612 data-nosnippet>1612</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#1613 id=1613 data-nosnippet>1613</a>                NestedField::required(<span class="number">1</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1614 id=1614 data-nosnippet>1614</a>                NestedField::required(<span class="number">2</span>, <span class="string">"b"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1615 id=1615 data-nosnippet>1615</a>                NestedField::required(
+<a href=#1616 id=1616 data-nosnippet>1616</a>                    <span class="number">3</span>,
+<a href=#1617 id=1617 data-nosnippet>1617</a>                    <span class="string">"struct"</span>,
+<a href=#1618 id=1618 data-nosnippet>1618</a>                    Type::Struct(StructType::new(<span class="macro">vec!</span>[
+<a href=#1619 id=1619 data-nosnippet>1619</a>                        NestedField::required(<span class="number">5</span>, <span class="string">"nested"</span>, Type::Primitive(PrimitiveType::Long))
+<a href=#1620 id=1620 data-nosnippet>1620</a>                            .into(),
+<a href=#1621 id=1621 data-nosnippet>1621</a>                    ])),
+<a href=#1622 id=1622 data-nosnippet>1622</a>                )
+<a href=#1623 id=1623 data-nosnippet>1623</a>                .into(),
+<a href=#1624 id=1624 data-nosnippet>1624</a>                NestedField::required(<span class="number">4</span>, <span class="string">"c"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1625 id=1625 data-nosnippet>1625</a>            ])
+<a href=#1626 id=1626 data-nosnippet>1626</a>            .build()
+<a href=#1627 id=1627 data-nosnippet>1627</a>            .unwrap();
+<a href=#1628 id=1628 data-nosnippet>1628</a>
+<a href=#1629 id=1629 data-nosnippet>1629</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(expected_schema.clone())
+<a href=#1630 id=1630 data-nosnippet>1630</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#1631 id=1631 data-nosnippet>1631</a>            .add_partition_field(<span class="string">"a"</span>, <span class="string">"a"</span>, Transform::Identity)
 <a href=#1632 id=1632 data-nosnippet>1632</a>            .unwrap()
-<a href=#1633 id=1633 data-nosnippet>1633</a>            .build()
-<a href=#1634 id=1634 data-nosnippet>1634</a>            .unwrap();
-<a href=#1635 id=1635 data-nosnippet>1635</a>
-<a href=#1636 id=1636 data-nosnippet>1636</a>        <span class="kw">let </span>expected_sort_order = SortOrder::builder()
-<a href=#1637 id=1637 data-nosnippet>1637</a>            .with_fields(<span class="macro">vec!</span>[SortField {
-<a href=#1638 id=1638 data-nosnippet>1638</a>                source_id: <span class="number">1</span>,
-<a href=#1639 id=1639 data-nosnippet>1639</a>                transform: Transform::Identity,
-<a href=#1640 id=1640 data-nosnippet>1640</a>                direction: SortDirection::Ascending,
-<a href=#1641 id=1641 data-nosnippet>1641</a>                null_order: NullOrder::First,
-<a href=#1642 id=1642 data-nosnippet>1642</a>            }])
-<a href=#1643 id=1643 data-nosnippet>1643</a>            .with_order_id(<span class="number">1</span>)
-<a href=#1644 id=1644 data-nosnippet>1644</a>            .build(<span class="kw-2">&amp;</span>expected_schema)
-<a href=#1645 id=1645 data-nosnippet>1645</a>            .unwrap();
-<a href=#1646 id=1646 data-nosnippet>1646</a>
-<a href=#1647 id=1647 data-nosnippet>1647</a>        <span class="macro">assert_eq!</span>(fresh_schema, expected_schema);
-<a href=#1648 id=1648 data-nosnippet>1648</a>        <span class="macro">assert_eq!</span>(fresh_spec, expected_spec);
-<a href=#1649 id=1649 data-nosnippet>1649</a>        <span class="macro">assert_eq!</span>(fresh_sort_order, expected_sort_order);
-<a href=#1650 id=1650 data-nosnippet>1650</a>    }
-<a href=#1651 id=1651 data-nosnippet>1651</a>
-<a href=#1652 id=1652 data-nosnippet>1652</a>    <span class="attr">#[test]
-<a href=#1653 id=1653 data-nosnippet>1653</a>    </span><span class="kw">fn </span>test_ids_are_reassigned_for_new_metadata() {
-<a href=#1654 id=1654 data-nosnippet>1654</a>        <span class="kw">let </span>schema = schema().into_builder().with_schema_id(<span class="number">10</span>).build().unwrap();
-<a href=#1655 id=1655 data-nosnippet>1655</a>
-<a href=#1656 id=1656 data-nosnippet>1656</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#1657 id=1657 data-nosnippet>1657</a>            schema,
-<a href=#1658 id=1658 data-nosnippet>1658</a>            partition_spec(),
-<a href=#1659 id=1659 data-nosnippet>1659</a>            sort_order(),
-<a href=#1660 id=1660 data-nosnippet>1660</a>            TEST_LOCATION.to_string(),
-<a href=#1661 id=1661 data-nosnippet>1661</a>            FormatVersion::V1,
-<a href=#1662 id=1662 data-nosnippet>1662</a>            HashMap::new(),
-<a href=#1663 id=1663 data-nosnippet>1663</a>        )
-<a href=#1664 id=1664 data-nosnippet>1664</a>        .unwrap()
-<a href=#1665 id=1665 data-nosnippet>1665</a>        .build()
+<a href=#1633 id=1633 data-nosnippet>1633</a>            .add_partition_field(<span class="string">"struct.nested"</span>, <span class="string">"nested_partition"</span>, Transform::Identity)
+<a href=#1634 id=1634 data-nosnippet>1634</a>            .unwrap()
+<a href=#1635 id=1635 data-nosnippet>1635</a>            .build()
+<a href=#1636 id=1636 data-nosnippet>1636</a>            .unwrap();
+<a href=#1637 id=1637 data-nosnippet>1637</a>
+<a href=#1638 id=1638 data-nosnippet>1638</a>        <span class="kw">let </span>expected_sort_order = SortOrder::builder()
+<a href=#1639 id=1639 data-nosnippet>1639</a>            .with_fields(<span class="macro">vec!</span>[SortField {
+<a href=#1640 id=1640 data-nosnippet>1640</a>                source_id: <span class="number">1</span>,
+<a href=#1641 id=1641 data-nosnippet>1641</a>                transform: Transform::Identity,
+<a href=#1642 id=1642 data-nosnippet>1642</a>                direction: SortDirection::Ascending,
+<a href=#1643 id=1643 data-nosnippet>1643</a>                null_order: NullOrder::First,
+<a href=#1644 id=1644 data-nosnippet>1644</a>            }])
+<a href=#1645 id=1645 data-nosnippet>1645</a>            .with_order_id(<span class="number">1</span>)
+<a href=#1646 id=1646 data-nosnippet>1646</a>            .build(<span class="kw-2">&amp;</span>expected_schema)
+<a href=#1647 id=1647 data-nosnippet>1647</a>            .unwrap();
+<a href=#1648 id=1648 data-nosnippet>1648</a>
+<a href=#1649 id=1649 data-nosnippet>1649</a>        <span class="macro">assert_eq!</span>(fresh_schema, expected_schema);
+<a href=#1650 id=1650 data-nosnippet>1650</a>        <span class="macro">assert_eq!</span>(fresh_spec, expected_spec);
+<a href=#1651 id=1651 data-nosnippet>1651</a>        <span class="macro">assert_eq!</span>(fresh_sort_order, expected_sort_order);
+<a href=#1652 id=1652 data-nosnippet>1652</a>    }
+<a href=#1653 id=1653 data-nosnippet>1653</a>
+<a href=#1654 id=1654 data-nosnippet>1654</a>    <span class="attr">#[test]
+<a href=#1655 id=1655 data-nosnippet>1655</a>    </span><span class="kw">fn </span>test_ids_are_reassigned_for_new_metadata() {
+<a href=#1656 id=1656 data-nosnippet>1656</a>        <span class="kw">let </span>schema = schema().into_builder().with_schema_id(<span class="number">10</span>).build().unwrap();
+<a href=#1657 id=1657 data-nosnippet>1657</a>
+<a href=#1658 id=1658 data-nosnippet>1658</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#1659 id=1659 data-nosnippet>1659</a>            schema,
+<a href=#1660 id=1660 data-nosnippet>1660</a>            partition_spec(),
+<a href=#1661 id=1661 data-nosnippet>1661</a>            sort_order(),
+<a href=#1662 id=1662 data-nosnippet>1662</a>            TEST_LOCATION.to_string(),
+<a href=#1663 id=1663 data-nosnippet>1663</a>            FormatVersion::V1,
+<a href=#1664 id=1664 data-nosnippet>1664</a>            HashMap::new(),
+<a href=#1665 id=1665 data-nosnippet>1665</a>        )
 <a href=#1666 id=1666 data-nosnippet>1666</a>        .unwrap()
-<a href=#1667 id=1667 data-nosnippet>1667</a>        .metadata;
-<a href=#1668 id=1668 data-nosnippet>1668</a>
-<a href=#1669 id=1669 data-nosnippet>1669</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
-<a href=#1670 id=1670 data-nosnippet>1670</a>        <span class="macro">assert_eq!</span>(metadata.current_schema().schema_id(), <span class="number">0</span>);
-<a href=#1671 id=1671 data-nosnippet>1671</a>    }
-<a href=#1672 id=1672 data-nosnippet>1672</a>
-<a href=#1673 id=1673 data-nosnippet>1673</a>    <span class="attr">#[test]
-<a href=#1674 id=1674 data-nosnippet>1674</a>    </span><span class="kw">fn </span>test_new_metadata_changes() {
-<a href=#1675 id=1675 data-nosnippet>1675</a>        <span class="kw">let </span>changes = TableMetadataBuilder::new(
-<a href=#1676 id=1676 data-nosnippet>1676</a>            schema(),
-<a href=#1677 id=1677 data-nosnippet>1677</a>            partition_spec(),
-<a href=#1678 id=1678 data-nosnippet>1678</a>            sort_order(),
-<a href=#1679 id=1679 data-nosnippet>1679</a>            TEST_LOCATION.to_string(),
-<a href=#1680 id=1680 data-nosnippet>1680</a>            FormatVersion::V1,
-<a href=#1681 id=1681 data-nosnippet>1681</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="string">"property 1"</span>.to_string(), <span class="string">"value 1"</span>.to_string())]),
-<a href=#1682 id=1682 data-nosnippet>1682</a>        )
-<a href=#1683 id=1683 data-nosnippet>1683</a>        .unwrap()
-<a href=#1684 id=1684 data-nosnippet>1684</a>        .build()
+<a href=#1667 id=1667 data-nosnippet>1667</a>        .build()
+<a href=#1668 id=1668 data-nosnippet>1668</a>        .unwrap()
+<a href=#1669 id=1669 data-nosnippet>1669</a>        .metadata;
+<a href=#1670 id=1670 data-nosnippet>1670</a>
+<a href=#1671 id=1671 data-nosnippet>1671</a>        <span class="macro">assert_eq!</span>(metadata.current_schema_id, <span class="number">0</span>);
+<a href=#1672 id=1672 data-nosnippet>1672</a>        <span class="macro">assert_eq!</span>(metadata.current_schema().schema_id(), <span class="number">0</span>);
+<a href=#1673 id=1673 data-nosnippet>1673</a>    }
+<a href=#1674 id=1674 data-nosnippet>1674</a>
+<a href=#1675 id=1675 data-nosnippet>1675</a>    <span class="attr">#[test]
+<a href=#1676 id=1676 data-nosnippet>1676</a>    </span><span class="kw">fn </span>test_new_metadata_changes() {
+<a href=#1677 id=1677 data-nosnippet>1677</a>        <span class="kw">let </span>changes = TableMetadataBuilder::new(
+<a href=#1678 id=1678 data-nosnippet>1678</a>            schema(),
+<a href=#1679 id=1679 data-nosnippet>1679</a>            partition_spec(),
+<a href=#1680 id=1680 data-nosnippet>1680</a>            sort_order(),
+<a href=#1681 id=1681 data-nosnippet>1681</a>            TEST_LOCATION.to_string(),
+<a href=#1682 id=1682 data-nosnippet>1682</a>            FormatVersion::V1,
+<a href=#1683 id=1683 data-nosnippet>1683</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="string">"property 1"</span>.to_string(), <span class="string">"value 1"</span>.to_string())]),
+<a href=#1684 id=1684 data-nosnippet>1684</a>        )
 <a href=#1685 id=1685 data-nosnippet>1685</a>        .unwrap()
-<a href=#1686 id=1686 data-nosnippet>1686</a>        .changes;
-<a href=#1687 id=1687 data-nosnippet>1687</a>
-<a href=#1688 id=1688 data-nosnippet>1688</a>        <span class="macro">pretty_assertions::assert_eq!</span>(changes, <span class="macro">vec!</span>[
-<a href=#1689 id=1689 data-nosnippet>1689</a>            TableUpdate::SetLocation {
-<a href=#1690 id=1690 data-nosnippet>1690</a>                location: TEST_LOCATION.to_string()
-<a href=#1691 id=1691 data-nosnippet>1691</a>            },
-<a href=#1692 id=1692 data-nosnippet>1692</a>            TableUpdate::AddSchema { schema: schema() },
-<a href=#1693 id=1693 data-nosnippet>1693</a>            TableUpdate::SetCurrentSchema { schema_id: -<span class="number">1 </span>},
-<a href=#1694 id=1694 data-nosnippet>1694</a>            TableUpdate::AddSpec {
-<a href=#1695 id=1695 data-nosnippet>1695</a>                <span class="comment">// Because this is a new tables, field-ids are assigned
-<a href=#1696 id=1696 data-nosnippet>1696</a>                // partition_spec() has None set for field-id
-<a href=#1697 id=1697 data-nosnippet>1697</a>                </span>spec: PartitionSpec::builder(schema())
-<a href=#1698 id=1698 data-nosnippet>1698</a>                    .with_spec_id(<span class="number">0</span>)
-<a href=#1699 id=1699 data-nosnippet>1699</a>                    .add_unbound_field(UnboundPartitionField {
-<a href=#1700 id=1700 data-nosnippet>1700</a>                        name: <span class="string">"y"</span>.to_string(),
-<a href=#1701 id=1701 data-nosnippet>1701</a>                        transform: Transform::Identity,
-<a href=#1702 id=1702 data-nosnippet>1702</a>                        source_id: <span class="number">2</span>,
-<a href=#1703 id=1703 data-nosnippet>1703</a>                        field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>)
-<a href=#1704 id=1704 data-nosnippet>1704</a>                    })
-<a href=#1705 id=1705 data-nosnippet>1705</a>                    .unwrap()
-<a href=#1706 id=1706 data-nosnippet>1706</a>                    .build()
+<a href=#1686 id=1686 data-nosnippet>1686</a>        .build()
+<a href=#1687 id=1687 data-nosnippet>1687</a>        .unwrap()
+<a href=#1688 id=1688 data-nosnippet>1688</a>        .changes;
+<a href=#1689 id=1689 data-nosnippet>1689</a>
+<a href=#1690 id=1690 data-nosnippet>1690</a>        <span class="macro">pretty_assertions::assert_eq!</span>(changes, <span class="macro">vec!</span>[
+<a href=#1691 id=1691 data-nosnippet>1691</a>            TableUpdate::SetLocation {
+<a href=#1692 id=1692 data-nosnippet>1692</a>                location: TEST_LOCATION.to_string()
+<a href=#1693 id=1693 data-nosnippet>1693</a>            },
+<a href=#1694 id=1694 data-nosnippet>1694</a>            TableUpdate::AddSchema { schema: schema() },
+<a href=#1695 id=1695 data-nosnippet>1695</a>            TableUpdate::SetCurrentSchema { schema_id: -<span class="number">1 </span>},
+<a href=#1696 id=1696 data-nosnippet>1696</a>            TableUpdate::AddSpec {
+<a href=#1697 id=1697 data-nosnippet>1697</a>                <span class="comment">// Because this is a new tables, field-ids are assigned
+<a href=#1698 id=1698 data-nosnippet>1698</a>                // partition_spec() has None set for field-id
+<a href=#1699 id=1699 data-nosnippet>1699</a>                </span>spec: PartitionSpec::builder(schema())
+<a href=#1700 id=1700 data-nosnippet>1700</a>                    .with_spec_id(<span class="number">0</span>)
+<a href=#1701 id=1701 data-nosnippet>1701</a>                    .add_unbound_field(UnboundPartitionField {
+<a href=#1702 id=1702 data-nosnippet>1702</a>                        name: <span class="string">"y"</span>.to_string(),
+<a href=#1703 id=1703 data-nosnippet>1703</a>                        transform: Transform::Identity,
+<a href=#1704 id=1704 data-nosnippet>1704</a>                        source_id: <span class="number">2</span>,
+<a href=#1705 id=1705 data-nosnippet>1705</a>                        field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>)
+<a href=#1706 id=1706 data-nosnippet>1706</a>                    })
 <a href=#1707 id=1707 data-nosnippet>1707</a>                    .unwrap()
-<a href=#1708 id=1708 data-nosnippet>1708</a>                    .into_unbound(),
-<a href=#1709 id=1709 data-nosnippet>1709</a>            },
-<a href=#1710 id=1710 data-nosnippet>1710</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>},
-<a href=#1711 id=1711 data-nosnippet>1711</a>            TableUpdate::AddSortOrder {
-<a href=#1712 id=1712 data-nosnippet>1712</a>                sort_order: sort_order(),
-<a href=#1713 id=1713 data-nosnippet>1713</a>            },
-<a href=#1714 id=1714 data-nosnippet>1714</a>            TableUpdate::SetDefaultSortOrder { sort_order_id: -<span class="number">1 </span>},
-<a href=#1715 id=1715 data-nosnippet>1715</a>            TableUpdate::SetProperties {
-<a href=#1716 id=1716 data-nosnippet>1716</a>                updates: HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#1717 id=1717 data-nosnippet>1717</a>                    <span class="string">"property 1"</span>.to_string(),
-<a href=#1718 id=1718 data-nosnippet>1718</a>                    <span class="string">"value 1"</span>.to_string()
-<a href=#1719 id=1719 data-nosnippet>1719</a>                )]),
-<a href=#1720 id=1720 data-nosnippet>1720</a>            }
-<a href=#1721 id=1721 data-nosnippet>1721</a>        ]);
-<a href=#1722 id=1722 data-nosnippet>1722</a>    }
-<a href=#1723 id=1723 data-nosnippet>1723</a>
-<a href=#1724 id=1724 data-nosnippet>1724</a>    <span class="attr">#[test]
-<a href=#1725 id=1725 data-nosnippet>1725</a>    </span><span class="kw">fn </span>test_new_metadata_changes_unpartitioned_unsorted() {
-<a href=#1726 id=1726 data-nosnippet>1726</a>        <span class="kw">let </span>schema = Schema::builder().build().unwrap();
-<a href=#1727 id=1727 data-nosnippet>1727</a>        <span class="kw">let </span>changes = TableMetadataBuilder::new(
-<a href=#1728 id=1728 data-nosnippet>1728</a>            schema.clone(),
-<a href=#1729 id=1729 data-nosnippet>1729</a>            PartitionSpec::unpartition_spec().into_unbound(),
-<a href=#1730 id=1730 data-nosnippet>1730</a>            SortOrder::unsorted_order(),
-<a href=#1731 id=1731 data-nosnippet>1731</a>            TEST_LOCATION.to_string(),
-<a href=#1732 id=1732 data-nosnippet>1732</a>            FormatVersion::V1,
-<a href=#1733 id=1733 data-nosnippet>1733</a>            HashMap::new(),
-<a href=#1734 id=1734 data-nosnippet>1734</a>        )
-<a href=#1735 id=1735 data-nosnippet>1735</a>        .unwrap()
-<a href=#1736 id=1736 data-nosnippet>1736</a>        .build()
+<a href=#1708 id=1708 data-nosnippet>1708</a>                    .build()
+<a href=#1709 id=1709 data-nosnippet>1709</a>                    .unwrap()
+<a href=#1710 id=1710 data-nosnippet>1710</a>                    .into_unbound(),
+<a href=#1711 id=1711 data-nosnippet>1711</a>            },
+<a href=#1712 id=1712 data-nosnippet>1712</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>},
+<a href=#1713 id=1713 data-nosnippet>1713</a>            TableUpdate::AddSortOrder {
+<a href=#1714 id=1714 data-nosnippet>1714</a>                sort_order: sort_order(),
+<a href=#1715 id=1715 data-nosnippet>1715</a>            },
+<a href=#1716 id=1716 data-nosnippet>1716</a>            TableUpdate::SetDefaultSortOrder { sort_order_id: -<span class="number">1 </span>},
+<a href=#1717 id=1717 data-nosnippet>1717</a>            TableUpdate::SetProperties {
+<a href=#1718 id=1718 data-nosnippet>1718</a>                updates: HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#1719 id=1719 data-nosnippet>1719</a>                    <span class="string">"property 1"</span>.to_string(),
+<a href=#1720 id=1720 data-nosnippet>1720</a>                    <span class="string">"value 1"</span>.to_string()
+<a href=#1721 id=1721 data-nosnippet>1721</a>                )]),
+<a href=#1722 id=1722 data-nosnippet>1722</a>            }
+<a href=#1723 id=1723 data-nosnippet>1723</a>        ]);
+<a href=#1724 id=1724 data-nosnippet>1724</a>    }
+<a href=#1725 id=1725 data-nosnippet>1725</a>
+<a href=#1726 id=1726 data-nosnippet>1726</a>    <span class="attr">#[test]
+<a href=#1727 id=1727 data-nosnippet>1727</a>    </span><span class="kw">fn </span>test_new_metadata_changes_unpartitioned_unsorted() {
+<a href=#1728 id=1728 data-nosnippet>1728</a>        <span class="kw">let </span>schema = Schema::builder().build().unwrap();
+<a href=#1729 id=1729 data-nosnippet>1729</a>        <span class="kw">let </span>changes = TableMetadataBuilder::new(
+<a href=#1730 id=1730 data-nosnippet>1730</a>            schema.clone(),
+<a href=#1731 id=1731 data-nosnippet>1731</a>            PartitionSpec::unpartition_spec().into_unbound(),
+<a href=#1732 id=1732 data-nosnippet>1732</a>            SortOrder::unsorted_order(),
+<a href=#1733 id=1733 data-nosnippet>1733</a>            TEST_LOCATION.to_string(),
+<a href=#1734 id=1734 data-nosnippet>1734</a>            FormatVersion::V1,
+<a href=#1735 id=1735 data-nosnippet>1735</a>            HashMap::new(),
+<a href=#1736 id=1736 data-nosnippet>1736</a>        )
 <a href=#1737 id=1737 data-nosnippet>1737</a>        .unwrap()
-<a href=#1738 id=1738 data-nosnippet>1738</a>        .changes;
-<a href=#1739 id=1739 data-nosnippet>1739</a>
-<a href=#1740 id=1740 data-nosnippet>1740</a>        <span class="macro">pretty_assertions::assert_eq!</span>(changes, <span class="macro">vec!</span>[
-<a href=#1741 id=1741 data-nosnippet>1741</a>            TableUpdate::SetLocation {
-<a href=#1742 id=1742 data-nosnippet>1742</a>                location: TEST_LOCATION.to_string()
-<a href=#1743 id=1743 data-nosnippet>1743</a>            },
-<a href=#1744 id=1744 data-nosnippet>1744</a>            TableUpdate::AddSchema {
-<a href=#1745 id=1745 data-nosnippet>1745</a>                schema: Schema::builder().build().unwrap(),
-<a href=#1746 id=1746 data-nosnippet>1746</a>            },
-<a href=#1747 id=1747 data-nosnippet>1747</a>            TableUpdate::SetCurrentSchema { schema_id: -<span class="number">1 </span>},
-<a href=#1748 id=1748 data-nosnippet>1748</a>            TableUpdate::AddSpec {
-<a href=#1749 id=1749 data-nosnippet>1749</a>                <span class="comment">// Because this is a new tables, field-ids are assigned
-<a href=#1750 id=1750 data-nosnippet>1750</a>                // partition_spec() has None set for field-id
-<a href=#1751 id=1751 data-nosnippet>1751</a>                </span>spec: PartitionSpec::builder(schema)
-<a href=#1752 id=1752 data-nosnippet>1752</a>                    .with_spec_id(<span class="number">0</span>)
-<a href=#1753 id=1753 data-nosnippet>1753</a>                    .build()
-<a href=#1754 id=1754 data-nosnippet>1754</a>                    .unwrap()
-<a href=#1755 id=1755 data-nosnippet>1755</a>                    .into_unbound(),
-<a href=#1756 id=1756 data-nosnippet>1756</a>            },
-<a href=#1757 id=1757 data-nosnippet>1757</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>},
-<a href=#1758 id=1758 data-nosnippet>1758</a>            TableUpdate::AddSortOrder {
-<a href=#1759 id=1759 data-nosnippet>1759</a>                sort_order: SortOrder::unsorted_order(),
-<a href=#1760 id=1760 data-nosnippet>1760</a>            },
-<a href=#1761 id=1761 data-nosnippet>1761</a>            TableUpdate::SetDefaultSortOrder { sort_order_id: -<span class="number">1 </span>},
-<a href=#1762 id=1762 data-nosnippet>1762</a>        ]);
-<a href=#1763 id=1763 data-nosnippet>1763</a>    }
-<a href=#1764 id=1764 data-nosnippet>1764</a>
-<a href=#1765 id=1765 data-nosnippet>1765</a>    <span class="attr">#[test]
-<a href=#1766 id=1766 data-nosnippet>1766</a>    </span><span class="kw">fn </span>test_add_partition_spec() {
-<a href=#1767 id=1767 data-nosnippet>1767</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#1768 id=1768 data-nosnippet>1768</a>
-<a href=#1769 id=1769 data-nosnippet>1769</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
-<a href=#1770 id=1770 data-nosnippet>1770</a>            .with_spec_id(<span class="number">10</span>)
-<a href=#1771 id=1771 data-nosnippet>1771</a>            .add_partition_fields(<span class="macro">vec!</span>[
-<a href=#1772 id=1772 data-nosnippet>1772</a>                UnboundPartitionField {
-<a href=#1773 id=1773 data-nosnippet>1773</a>                    <span class="comment">// The previous field - has field_id set
-<a href=#1774 id=1774 data-nosnippet>1774</a>                    </span>name: <span class="string">"y"</span>.to_string(),
-<a href=#1775 id=1775 data-nosnippet>1775</a>                    transform: Transform::Identity,
-<a href=#1776 id=1776 data-nosnippet>1776</a>                    source_id: <span class="number">2</span>,
-<a href=#1777 id=1777 data-nosnippet>1777</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
-<a href=#1778 id=1778 data-nosnippet>1778</a>                },
-<a href=#1779 id=1779 data-nosnippet>1779</a>                UnboundPartitionField {
-<a href=#1780 id=1780 data-nosnippet>1780</a>                    <span class="comment">// A new field without field id - should still be without field id in changes
-<a href=#1781 id=1781 data-nosnippet>1781</a>                    </span>name: <span class="string">"z"</span>.to_string(),
-<a href=#1782 id=1782 data-nosnippet>1782</a>                    transform: Transform::Identity,
-<a href=#1783 id=1783 data-nosnippet>1783</a>                    source_id: <span class="number">3</span>,
-<a href=#1784 id=1784 data-nosnippet>1784</a>                    field_id: <span class="prelude-val">None</span>,
-<a href=#1785 id=1785 data-nosnippet>1785</a>                },
-<a href=#1786 id=1786 data-nosnippet>1786</a>            ])
-<a href=#1787 id=1787 data-nosnippet>1787</a>            .unwrap()
-<a href=#1788 id=1788 data-nosnippet>1788</a>            .build();
-<a href=#1789 id=1789 data-nosnippet>1789</a>
-<a href=#1790 id=1790 data-nosnippet>1790</a>        <span class="kw">let </span>build_result = builder
-<a href=#1791 id=1791 data-nosnippet>1791</a>            .add_partition_spec(added_spec.clone())
-<a href=#1792 id=1792 data-nosnippet>1792</a>            .unwrap()
-<a href=#1793 id=1793 data-nosnippet>1793</a>            .build()
-<a href=#1794 id=1794 data-nosnippet>1794</a>            .unwrap();
-<a href=#1795 id=1795 data-nosnippet>1795</a>
-<a href=#1796 id=1796 data-nosnippet>1796</a>        <span class="comment">// Spec id should be re-assigned
-<a href=#1797 id=1797 data-nosnippet>1797</a>        </span><span class="kw">let </span>expected_change = added_spec.with_spec_id(<span class="number">1</span>);
-<a href=#1798 id=1798 data-nosnippet>1798</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(schema())
-<a href=#1799 id=1799 data-nosnippet>1799</a>            .with_spec_id(<span class="number">1</span>)
-<a href=#1800 id=1800 data-nosnippet>1800</a>            .add_unbound_field(UnboundPartitionField {
-<a href=#1801 id=1801 data-nosnippet>1801</a>                name: <span class="string">"y"</span>.to_string(),
-<a href=#1802 id=1802 data-nosnippet>1802</a>                transform: Transform::Identity,
-<a href=#1803 id=1803 data-nosnippet>1803</a>                source_id: <span class="number">2</span>,
-<a href=#1804 id=1804 data-nosnippet>1804</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
-<a href=#1805 id=1805 data-nosnippet>1805</a>            })
-<a href=#1806 id=1806 data-nosnippet>1806</a>            .unwrap()
-<a href=#1807 id=1807 data-nosnippet>1807</a>            .add_unbound_field(UnboundPartitionField {
-<a href=#1808 id=1808 data-nosnippet>1808</a>                name: <span class="string">"z"</span>.to_string(),
-<a href=#1809 id=1809 data-nosnippet>1809</a>                transform: Transform::Identity,
-<a href=#1810 id=1810 data-nosnippet>1810</a>                source_id: <span class="number">3</span>,
-<a href=#1811 id=1811 data-nosnippet>1811</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1001</span>),
-<a href=#1812 id=1812 data-nosnippet>1812</a>            })
-<a href=#1813 id=1813 data-nosnippet>1813</a>            .unwrap()
-<a href=#1814 id=1814 data-nosnippet>1814</a>            .build()
-<a href=#1815 id=1815 data-nosnippet>1815</a>            .unwrap();
-<a href=#1816 id=1816 data-nosnippet>1816</a>
-<a href=#1817 id=1817 data-nosnippet>1817</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#1818 id=1818 data-nosnippet>1818</a>        <span class="macro">assert_eq!</span>(
-<a href=#1819 id=1819 data-nosnippet>1819</a>            build_result.metadata.partition_spec_by_id(<span class="number">1</span>),
-<a href=#1820 id=1820 data-nosnippet>1820</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(expected_spec))
-<a href=#1821 id=1821 data-nosnippet>1821</a>        );
-<a href=#1822 id=1822 data-nosnippet>1822</a>        <span class="macro">assert_eq!</span>(build_result.metadata.default_spec.spec_id(), <span class="number">0</span>);
-<a href=#1823 id=1823 data-nosnippet>1823</a>        <span class="macro">assert_eq!</span>(build_result.metadata.last_partition_id, <span class="number">1001</span>);
-<a href=#1824 id=1824 data-nosnippet>1824</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSpec {
-<a href=#1825 id=1825 data-nosnippet>1825</a>            spec: expected_change
-<a href=#1826 id=1826 data-nosnippet>1826</a>        });
-<a href=#1827 id=1827 data-nosnippet>1827</a>
-<a href=#1828 id=1828 data-nosnippet>1828</a>        <span class="comment">// Remove the spec
-<a href=#1829 id=1829 data-nosnippet>1829</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#1830 id=1830 data-nosnippet>1830</a>            .metadata
-<a href=#1831 id=1831 data-nosnippet>1831</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#1832 id=1832 data-nosnippet>1832</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#1833 id=1833 data-nosnippet>1833</a>            ))
-<a href=#1834 id=1834 data-nosnippet>1834</a>            .remove_partition_specs(<span class="kw-2">&amp;</span>[<span class="number">1</span>])
-<a href=#1835 id=1835 data-nosnippet>1835</a>            .unwrap()
-<a href=#1836 id=1836 data-nosnippet>1836</a>            .build()
-<a href=#1837 id=1837 data-nosnippet>1837</a>            .unwrap();
-<a href=#1838 id=1838 data-nosnippet>1838</a>
-<a href=#1839 id=1839 data-nosnippet>1839</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#1840 id=1840 data-nosnippet>1840</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_specs.len(), <span class="number">1</span>);
-<a href=#1841 id=1841 data-nosnippet>1841</a>        <span class="macro">assert!</span>(build_result.metadata.partition_spec_by_id(<span class="number">1</span>).is_none());
-<a href=#1842 id=1842 data-nosnippet>1842</a>    }
-<a href=#1843 id=1843 data-nosnippet>1843</a>
-<a href=#1844 id=1844 data-nosnippet>1844</a>    <span class="attr">#[test]
-<a href=#1845 id=1845 data-nosnippet>1845</a>    </span><span class="kw">fn </span>test_set_default_partition_spec() {
-<a href=#1846 id=1846 data-nosnippet>1846</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#1847 id=1847 data-nosnippet>1847</a>        <span class="kw">let </span>schema = builder.get_current_schema().unwrap().clone();
-<a href=#1848 id=1848 data-nosnippet>1848</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
-<a href=#1849 id=1849 data-nosnippet>1849</a>            .with_spec_id(<span class="number">10</span>)
-<a href=#1850 id=1850 data-nosnippet>1850</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"y_bucket[2]"</span>, Transform::Bucket(<span class="number">2</span>))
-<a href=#1851 id=1851 data-nosnippet>1851</a>            .unwrap()
-<a href=#1852 id=1852 data-nosnippet>1852</a>            .build();
-<a href=#1853 id=1853 data-nosnippet>1853</a>
-<a href=#1854 id=1854 data-nosnippet>1854</a>        <span class="kw">let </span>build_result = builder
-<a href=#1855 id=1855 data-nosnippet>1855</a>            .add_partition_spec(added_spec.clone())
-<a href=#1856 id=1856 data-nosnippet>1856</a>            .unwrap()
-<a href=#1857 id=1857 data-nosnippet>1857</a>            .set_default_partition_spec(-<span class="number">1</span>)
+<a href=#1738 id=1738 data-nosnippet>1738</a>        .build()
+<a href=#1739 id=1739 data-nosnippet>1739</a>        .unwrap()
+<a href=#1740 id=1740 data-nosnippet>1740</a>        .changes;
+<a href=#1741 id=1741 data-nosnippet>1741</a>
+<a href=#1742 id=1742 data-nosnippet>1742</a>        <span class="macro">pretty_assertions::assert_eq!</span>(changes, <span class="macro">vec!</span>[
+<a href=#1743 id=1743 data-nosnippet>1743</a>            TableUpdate::SetLocation {
+<a href=#1744 id=1744 data-nosnippet>1744</a>                location: TEST_LOCATION.to_string()
+<a href=#1745 id=1745 data-nosnippet>1745</a>            },
+<a href=#1746 id=1746 data-nosnippet>1746</a>            TableUpdate::AddSchema {
+<a href=#1747 id=1747 data-nosnippet>1747</a>                schema: Schema::builder().build().unwrap(),
+<a href=#1748 id=1748 data-nosnippet>1748</a>            },
+<a href=#1749 id=1749 data-nosnippet>1749</a>            TableUpdate::SetCurrentSchema { schema_id: -<span class="number">1 </span>},
+<a href=#1750 id=1750 data-nosnippet>1750</a>            TableUpdate::AddSpec {
+<a href=#1751 id=1751 data-nosnippet>1751</a>                <span class="comment">// Because this is a new tables, field-ids are assigned
+<a href=#1752 id=1752 data-nosnippet>1752</a>                // partition_spec() has None set for field-id
+<a href=#1753 id=1753 data-nosnippet>1753</a>                </span>spec: PartitionSpec::builder(schema)
+<a href=#1754 id=1754 data-nosnippet>1754</a>                    .with_spec_id(<span class="number">0</span>)
+<a href=#1755 id=1755 data-nosnippet>1755</a>                    .build()
+<a href=#1756 id=1756 data-nosnippet>1756</a>                    .unwrap()
+<a href=#1757 id=1757 data-nosnippet>1757</a>                    .into_unbound(),
+<a href=#1758 id=1758 data-nosnippet>1758</a>            },
+<a href=#1759 id=1759 data-nosnippet>1759</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>},
+<a href=#1760 id=1760 data-nosnippet>1760</a>            TableUpdate::AddSortOrder {
+<a href=#1761 id=1761 data-nosnippet>1761</a>                sort_order: SortOrder::unsorted_order(),
+<a href=#1762 id=1762 data-nosnippet>1762</a>            },
+<a href=#1763 id=1763 data-nosnippet>1763</a>            TableUpdate::SetDefaultSortOrder { sort_order_id: -<span class="number">1 </span>},
+<a href=#1764 id=1764 data-nosnippet>1764</a>        ]);
+<a href=#1765 id=1765 data-nosnippet>1765</a>    }
+<a href=#1766 id=1766 data-nosnippet>1766</a>
+<a href=#1767 id=1767 data-nosnippet>1767</a>    <span class="attr">#[test]
+<a href=#1768 id=1768 data-nosnippet>1768</a>    </span><span class="kw">fn </span>test_add_partition_spec() {
+<a href=#1769 id=1769 data-nosnippet>1769</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#1770 id=1770 data-nosnippet>1770</a>
+<a href=#1771 id=1771 data-nosnippet>1771</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
+<a href=#1772 id=1772 data-nosnippet>1772</a>            .with_spec_id(<span class="number">10</span>)
+<a href=#1773 id=1773 data-nosnippet>1773</a>            .add_partition_fields(<span class="macro">vec!</span>[
+<a href=#1774 id=1774 data-nosnippet>1774</a>                UnboundPartitionField {
+<a href=#1775 id=1775 data-nosnippet>1775</a>                    <span class="comment">// The previous field - has field_id set
+<a href=#1776 id=1776 data-nosnippet>1776</a>                    </span>name: <span class="string">"y"</span>.to_string(),
+<a href=#1777 id=1777 data-nosnippet>1777</a>                    transform: Transform::Identity,
+<a href=#1778 id=1778 data-nosnippet>1778</a>                    source_id: <span class="number">2</span>,
+<a href=#1779 id=1779 data-nosnippet>1779</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
+<a href=#1780 id=1780 data-nosnippet>1780</a>                },
+<a href=#1781 id=1781 data-nosnippet>1781</a>                UnboundPartitionField {
+<a href=#1782 id=1782 data-nosnippet>1782</a>                    <span class="comment">// A new field without field id - should still be without field id in changes
+<a href=#1783 id=1783 data-nosnippet>1783</a>                    </span>name: <span class="string">"z"</span>.to_string(),
+<a href=#1784 id=1784 data-nosnippet>1784</a>                    transform: Transform::Identity,
+<a href=#1785 id=1785 data-nosnippet>1785</a>                    source_id: <span class="number">3</span>,
+<a href=#1786 id=1786 data-nosnippet>1786</a>                    field_id: <span class="prelude-val">None</span>,
+<a href=#1787 id=1787 data-nosnippet>1787</a>                },
+<a href=#1788 id=1788 data-nosnippet>1788</a>            ])
+<a href=#1789 id=1789 data-nosnippet>1789</a>            .unwrap()
+<a href=#1790 id=1790 data-nosnippet>1790</a>            .build();
+<a href=#1791 id=1791 data-nosnippet>1791</a>
+<a href=#1792 id=1792 data-nosnippet>1792</a>        <span class="kw">let </span>build_result = builder
+<a href=#1793 id=1793 data-nosnippet>1793</a>            .add_partition_spec(added_spec.clone())
+<a href=#1794 id=1794 data-nosnippet>1794</a>            .unwrap()
+<a href=#1795 id=1795 data-nosnippet>1795</a>            .build()
+<a href=#1796 id=1796 data-nosnippet>1796</a>            .unwrap();
+<a href=#1797 id=1797 data-nosnippet>1797</a>
+<a href=#1798 id=1798 data-nosnippet>1798</a>        <span class="comment">// Spec id should be re-assigned
+<a href=#1799 id=1799 data-nosnippet>1799</a>        </span><span class="kw">let </span>expected_change = added_spec.with_spec_id(<span class="number">1</span>);
+<a href=#1800 id=1800 data-nosnippet>1800</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(schema())
+<a href=#1801 id=1801 data-nosnippet>1801</a>            .with_spec_id(<span class="number">1</span>)
+<a href=#1802 id=1802 data-nosnippet>1802</a>            .add_unbound_field(UnboundPartitionField {
+<a href=#1803 id=1803 data-nosnippet>1803</a>                name: <span class="string">"y"</span>.to_string(),
+<a href=#1804 id=1804 data-nosnippet>1804</a>                transform: Transform::Identity,
+<a href=#1805 id=1805 data-nosnippet>1805</a>                source_id: <span class="number">2</span>,
+<a href=#1806 id=1806 data-nosnippet>1806</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
+<a href=#1807 id=1807 data-nosnippet>1807</a>            })
+<a href=#1808 id=1808 data-nosnippet>1808</a>            .unwrap()
+<a href=#1809 id=1809 data-nosnippet>1809</a>            .add_unbound_field(UnboundPartitionField {
+<a href=#1810 id=1810 data-nosnippet>1810</a>                name: <span class="string">"z"</span>.to_string(),
+<a href=#1811 id=1811 data-nosnippet>1811</a>                transform: Transform::Identity,
+<a href=#1812 id=1812 data-nosnippet>1812</a>                source_id: <span class="number">3</span>,
+<a href=#1813 id=1813 data-nosnippet>1813</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1001</span>),
+<a href=#1814 id=1814 data-nosnippet>1814</a>            })
+<a href=#1815 id=1815 data-nosnippet>1815</a>            .unwrap()
+<a href=#1816 id=1816 data-nosnippet>1816</a>            .build()
+<a href=#1817 id=1817 data-nosnippet>1817</a>            .unwrap();
+<a href=#1818 id=1818 data-nosnippet>1818</a>
+<a href=#1819 id=1819 data-nosnippet>1819</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#1820 id=1820 data-nosnippet>1820</a>        <span class="macro">assert_eq!</span>(
+<a href=#1821 id=1821 data-nosnippet>1821</a>            build_result.metadata.partition_spec_by_id(<span class="number">1</span>),
+<a href=#1822 id=1822 data-nosnippet>1822</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(expected_spec))
+<a href=#1823 id=1823 data-nosnippet>1823</a>        );
+<a href=#1824 id=1824 data-nosnippet>1824</a>        <span class="macro">assert_eq!</span>(build_result.metadata.default_spec.spec_id(), <span class="number">0</span>);
+<a href=#1825 id=1825 data-nosnippet>1825</a>        <span class="macro">assert_eq!</span>(build_result.metadata.last_partition_id, <span class="number">1001</span>);
+<a href=#1826 id=1826 data-nosnippet>1826</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSpec {
+<a href=#1827 id=1827 data-nosnippet>1827</a>            spec: expected_change
+<a href=#1828 id=1828 data-nosnippet>1828</a>        });
+<a href=#1829 id=1829 data-nosnippet>1829</a>
+<a href=#1830 id=1830 data-nosnippet>1830</a>        <span class="comment">// Remove the spec
+<a href=#1831 id=1831 data-nosnippet>1831</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#1832 id=1832 data-nosnippet>1832</a>            .metadata
+<a href=#1833 id=1833 data-nosnippet>1833</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#1834 id=1834 data-nosnippet>1834</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#1835 id=1835 data-nosnippet>1835</a>            ))
+<a href=#1836 id=1836 data-nosnippet>1836</a>            .remove_partition_specs(<span class="kw-2">&amp;</span>[<span class="number">1</span>])
+<a href=#1837 id=1837 data-nosnippet>1837</a>            .unwrap()
+<a href=#1838 id=1838 data-nosnippet>1838</a>            .build()
+<a href=#1839 id=1839 data-nosnippet>1839</a>            .unwrap();
+<a href=#1840 id=1840 data-nosnippet>1840</a>
+<a href=#1841 id=1841 data-nosnippet>1841</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#1842 id=1842 data-nosnippet>1842</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_specs.len(), <span class="number">1</span>);
+<a href=#1843 id=1843 data-nosnippet>1843</a>        <span class="macro">assert!</span>(build_result.metadata.partition_spec_by_id(<span class="number">1</span>).is_none());
+<a href=#1844 id=1844 data-nosnippet>1844</a>    }
+<a href=#1845 id=1845 data-nosnippet>1845</a>
+<a href=#1846 id=1846 data-nosnippet>1846</a>    <span class="attr">#[test]
+<a href=#1847 id=1847 data-nosnippet>1847</a>    </span><span class="kw">fn </span>test_set_default_partition_spec() {
+<a href=#1848 id=1848 data-nosnippet>1848</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#1849 id=1849 data-nosnippet>1849</a>        <span class="kw">let </span>schema = builder.get_current_schema().unwrap().clone();
+<a href=#1850 id=1850 data-nosnippet>1850</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
+<a href=#1851 id=1851 data-nosnippet>1851</a>            .with_spec_id(<span class="number">10</span>)
+<a href=#1852 id=1852 data-nosnippet>1852</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"y_bucket[2]"</span>, Transform::Bucket(<span class="number">2</span>))
+<a href=#1853 id=1853 data-nosnippet>1853</a>            .unwrap()
+<a href=#1854 id=1854 data-nosnippet>1854</a>            .build();
+<a href=#1855 id=1855 data-nosnippet>1855</a>
+<a href=#1856 id=1856 data-nosnippet>1856</a>        <span class="kw">let </span>build_result = builder
+<a href=#1857 id=1857 data-nosnippet>1857</a>            .add_partition_spec(added_spec.clone())
 <a href=#1858 id=1858 data-nosnippet>1858</a>            .unwrap()
-<a href=#1859 id=1859 data-nosnippet>1859</a>            .build()
-<a href=#1860 id=1860 data-nosnippet>1860</a>            .unwrap();
-<a href=#1861 id=1861 data-nosnippet>1861</a>
-<a href=#1862 id=1862 data-nosnippet>1862</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(schema)
-<a href=#1863 id=1863 data-nosnippet>1863</a>            .with_spec_id(<span class="number">1</span>)
-<a href=#1864 id=1864 data-nosnippet>1864</a>            .add_unbound_field(UnboundPartitionField {
-<a href=#1865 id=1865 data-nosnippet>1865</a>                name: <span class="string">"y_bucket[2]"</span>.to_string(),
-<a href=#1866 id=1866 data-nosnippet>1866</a>                transform: Transform::Bucket(<span class="number">2</span>),
-<a href=#1867 id=1867 data-nosnippet>1867</a>                source_id: <span class="number">1</span>,
-<a href=#1868 id=1868 data-nosnippet>1868</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1001</span>),
-<a href=#1869 id=1869 data-nosnippet>1869</a>            })
-<a href=#1870 id=1870 data-nosnippet>1870</a>            .unwrap()
-<a href=#1871 id=1871 data-nosnippet>1871</a>            .build()
-<a href=#1872 id=1872 data-nosnippet>1872</a>            .unwrap();
-<a href=#1873 id=1873 data-nosnippet>1873</a>
-<a href=#1874 id=1874 data-nosnippet>1874</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
-<a href=#1875 id=1875 data-nosnippet>1875</a>        <span class="macro">assert_eq!</span>(build_result.metadata.default_spec, Arc::new(expected_spec));
-<a href=#1876 id=1876 data-nosnippet>1876</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
-<a href=#1877 id=1877 data-nosnippet>1877</a>            TableUpdate::AddSpec {
-<a href=#1878 id=1878 data-nosnippet>1878</a>                <span class="comment">// Should contain the actual ID that was used
-<a href=#1879 id=1879 data-nosnippet>1879</a>                </span>spec: added_spec.with_spec_id(<span class="number">1</span>)
-<a href=#1880 id=1880 data-nosnippet>1880</a>            },
-<a href=#1881 id=1881 data-nosnippet>1881</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>}
-<a href=#1882 id=1882 data-nosnippet>1882</a>        ]);
-<a href=#1883 id=1883 data-nosnippet>1883</a>    }
-<a href=#1884 id=1884 data-nosnippet>1884</a>
-<a href=#1885 id=1885 data-nosnippet>1885</a>    <span class="attr">#[test]
-<a href=#1886 id=1886 data-nosnippet>1886</a>    </span><span class="kw">fn </span>test_set_existing_default_partition_spec() {
-<a href=#1887 id=1887 data-nosnippet>1887</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#1888 id=1888 data-nosnippet>1888</a>        <span class="comment">// Add and set an unbound spec as current
-<a href=#1889 id=1889 data-nosnippet>1889</a>        </span><span class="kw">let </span>unbound_spec = UnboundPartitionSpec::builder().with_spec_id(<span class="number">1</span>).build();
-<a href=#1890 id=1890 data-nosnippet>1890</a>        <span class="kw">let </span>build_result = builder
-<a href=#1891 id=1891 data-nosnippet>1891</a>            .add_partition_spec(unbound_spec.clone())
-<a href=#1892 id=1892 data-nosnippet>1892</a>            .unwrap()
-<a href=#1893 id=1893 data-nosnippet>1893</a>            .set_default_partition_spec(-<span class="number">1</span>)
+<a href=#1859 id=1859 data-nosnippet>1859</a>            .set_default_partition_spec(-<span class="number">1</span>)
+<a href=#1860 id=1860 data-nosnippet>1860</a>            .unwrap()
+<a href=#1861 id=1861 data-nosnippet>1861</a>            .build()
+<a href=#1862 id=1862 data-nosnippet>1862</a>            .unwrap();
+<a href=#1863 id=1863 data-nosnippet>1863</a>
+<a href=#1864 id=1864 data-nosnippet>1864</a>        <span class="kw">let </span>expected_spec = PartitionSpec::builder(schema)
+<a href=#1865 id=1865 data-nosnippet>1865</a>            .with_spec_id(<span class="number">1</span>)
+<a href=#1866 id=1866 data-nosnippet>1866</a>            .add_unbound_field(UnboundPartitionField {
+<a href=#1867 id=1867 data-nosnippet>1867</a>                name: <span class="string">"y_bucket[2]"</span>.to_string(),
+<a href=#1868 id=1868 data-nosnippet>1868</a>                transform: Transform::Bucket(<span class="number">2</span>),
+<a href=#1869 id=1869 data-nosnippet>1869</a>                source_id: <span class="number">1</span>,
+<a href=#1870 id=1870 data-nosnippet>1870</a>                field_id: <span class="prelude-val">Some</span>(<span class="number">1001</span>),
+<a href=#1871 id=1871 data-nosnippet>1871</a>            })
+<a href=#1872 id=1872 data-nosnippet>1872</a>            .unwrap()
+<a href=#1873 id=1873 data-nosnippet>1873</a>            .build()
+<a href=#1874 id=1874 data-nosnippet>1874</a>            .unwrap();
+<a href=#1875 id=1875 data-nosnippet>1875</a>
+<a href=#1876 id=1876 data-nosnippet>1876</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
+<a href=#1877 id=1877 data-nosnippet>1877</a>        <span class="macro">assert_eq!</span>(build_result.metadata.default_spec, Arc::new(expected_spec));
+<a href=#1878 id=1878 data-nosnippet>1878</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
+<a href=#1879 id=1879 data-nosnippet>1879</a>            TableUpdate::AddSpec {
+<a href=#1880 id=1880 data-nosnippet>1880</a>                <span class="comment">// Should contain the actual ID that was used
+<a href=#1881 id=1881 data-nosnippet>1881</a>                </span>spec: added_spec.with_spec_id(<span class="number">1</span>)
+<a href=#1882 id=1882 data-nosnippet>1882</a>            },
+<a href=#1883 id=1883 data-nosnippet>1883</a>            TableUpdate::SetDefaultSpec { spec_id: -<span class="number">1 </span>}
+<a href=#1884 id=1884 data-nosnippet>1884</a>        ]);
+<a href=#1885 id=1885 data-nosnippet>1885</a>    }
+<a href=#1886 id=1886 data-nosnippet>1886</a>
+<a href=#1887 id=1887 data-nosnippet>1887</a>    <span class="attr">#[test]
+<a href=#1888 id=1888 data-nosnippet>1888</a>    </span><span class="kw">fn </span>test_set_existing_default_partition_spec() {
+<a href=#1889 id=1889 data-nosnippet>1889</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#1890 id=1890 data-nosnippet>1890</a>        <span class="comment">// Add and set an unbound spec as current
+<a href=#1891 id=1891 data-nosnippet>1891</a>        </span><span class="kw">let </span>unbound_spec = UnboundPartitionSpec::builder().with_spec_id(<span class="number">1</span>).build();
+<a href=#1892 id=1892 data-nosnippet>1892</a>        <span class="kw">let </span>build_result = builder
+<a href=#1893 id=1893 data-nosnippet>1893</a>            .add_partition_spec(unbound_spec.clone())
 <a href=#1894 id=1894 data-nosnippet>1894</a>            .unwrap()
-<a href=#1895 id=1895 data-nosnippet>1895</a>            .build()
-<a href=#1896 id=1896 data-nosnippet>1896</a>            .unwrap();
-<a href=#1897 id=1897 data-nosnippet>1897</a>
-<a href=#1898 id=1898 data-nosnippet>1898</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
-<a href=#1899 id=1899 data-nosnippet>1899</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSpec {
-<a href=#1900 id=1900 data-nosnippet>1900</a>            spec: unbound_spec.clone()
-<a href=#1901 id=1901 data-nosnippet>1901</a>        });
-<a href=#1902 id=1902 data-nosnippet>1902</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetDefaultSpec {
-<a href=#1903 id=1903 data-nosnippet>1903</a>            spec_id: -<span class="number">1
-<a href=#1904 id=1904 data-nosnippet>1904</a>        </span>});
-<a href=#1905 id=1905 data-nosnippet>1905</a>        <span class="macro">assert_eq!</span>(
-<a href=#1906 id=1906 data-nosnippet>1906</a>            build_result.metadata.default_spec,
-<a href=#1907 id=1907 data-nosnippet>1907</a>            Arc::new(
-<a href=#1908 id=1908 data-nosnippet>1908</a>                unbound_spec
-<a href=#1909 id=1909 data-nosnippet>1909</a>                    .bind(build_result.metadata.current_schema().clone())
-<a href=#1910 id=1910 data-nosnippet>1910</a>                    .unwrap()
-<a href=#1911 id=1911 data-nosnippet>1911</a>            )
-<a href=#1912 id=1912 data-nosnippet>1912</a>        );
-<a href=#1913 id=1913 data-nosnippet>1913</a>
-<a href=#1914 id=1914 data-nosnippet>1914</a>        <span class="comment">// Set old spec again
-<a href=#1915 id=1915 data-nosnippet>1915</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#1916 id=1916 data-nosnippet>1916</a>            .metadata
-<a href=#1917 id=1917 data-nosnippet>1917</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#1918 id=1918 data-nosnippet>1918</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#1919 id=1919 data-nosnippet>1919</a>            ))
-<a href=#1920 id=1920 data-nosnippet>1920</a>            .set_default_partition_spec(<span class="number">0</span>)
-<a href=#1921 id=1921 data-nosnippet>1921</a>            .unwrap()
-<a href=#1922 id=1922 data-nosnippet>1922</a>            .build()
-<a href=#1923 id=1923 data-nosnippet>1923</a>            .unwrap();
-<a href=#1924 id=1924 data-nosnippet>1924</a>
-<a href=#1925 id=1925 data-nosnippet>1925</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#1926 id=1926 data-nosnippet>1926</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::SetDefaultSpec {
-<a href=#1927 id=1927 data-nosnippet>1927</a>            spec_id: <span class="number">0
-<a href=#1928 id=1928 data-nosnippet>1928</a>        </span>});
-<a href=#1929 id=1929 data-nosnippet>1929</a>        <span class="macro">assert_eq!</span>(
-<a href=#1930 id=1930 data-nosnippet>1930</a>            build_result.metadata.default_spec,
-<a href=#1931 id=1931 data-nosnippet>1931</a>            Arc::new(
-<a href=#1932 id=1932 data-nosnippet>1932</a>                partition_spec()
-<a href=#1933 id=1933 data-nosnippet>1933</a>                    .bind(build_result.metadata.current_schema().clone())
-<a href=#1934 id=1934 data-nosnippet>1934</a>                    .unwrap()
-<a href=#1935 id=1935 data-nosnippet>1935</a>            )
-<a href=#1936 id=1936 data-nosnippet>1936</a>        );
-<a href=#1937 id=1937 data-nosnippet>1937</a>    }
-<a href=#1938 id=1938 data-nosnippet>1938</a>
-<a href=#1939 id=1939 data-nosnippet>1939</a>    <span class="attr">#[test]
-<a href=#1940 id=1940 data-nosnippet>1940</a>    </span><span class="kw">fn </span>test_add_sort_order() {
-<a href=#1941 id=1941 data-nosnippet>1941</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#1942 id=1942 data-nosnippet>1942</a>
-<a href=#1943 id=1943 data-nosnippet>1943</a>        <span class="kw">let </span>added_sort_order = SortOrder::builder()
-<a href=#1944 id=1944 data-nosnippet>1944</a>            .with_order_id(<span class="number">10</span>)
-<a href=#1945 id=1945 data-nosnippet>1945</a>            .with_fields(<span class="macro">vec!</span>[SortField {
-<a href=#1946 id=1946 data-nosnippet>1946</a>                source_id: <span class="number">1</span>,
-<a href=#1947 id=1947 data-nosnippet>1947</a>                transform: Transform::Identity,
-<a href=#1948 id=1948 data-nosnippet>1948</a>                direction: SortDirection::Ascending,
-<a href=#1949 id=1949 data-nosnippet>1949</a>                null_order: NullOrder::First,
-<a href=#1950 id=1950 data-nosnippet>1950</a>            }])
-<a href=#1951 id=1951 data-nosnippet>1951</a>            .build(<span class="kw-2">&amp;</span>schema())
-<a href=#1952 id=1952 data-nosnippet>1952</a>            .unwrap();
-<a href=#1953 id=1953 data-nosnippet>1953</a>
-<a href=#1954 id=1954 data-nosnippet>1954</a>        <span class="kw">let </span>build_result = builder
-<a href=#1955 id=1955 data-nosnippet>1955</a>            .add_sort_order(added_sort_order.clone())
-<a href=#1956 id=1956 data-nosnippet>1956</a>            .unwrap()
-<a href=#1957 id=1957 data-nosnippet>1957</a>            .build()
-<a href=#1958 id=1958 data-nosnippet>1958</a>            .unwrap();
-<a href=#1959 id=1959 data-nosnippet>1959</a>
-<a href=#1960 id=1960 data-nosnippet>1960</a>        <span class="kw">let </span>expected_sort_order = added_sort_order.with_order_id(<span class="number">2</span>);
+<a href=#1895 id=1895 data-nosnippet>1895</a>            .set_default_partition_spec(-<span class="number">1</span>)
+<a href=#1896 id=1896 data-nosnippet>1896</a>            .unwrap()
+<a href=#1897 id=1897 data-nosnippet>1897</a>            .build()
+<a href=#1898 id=1898 data-nosnippet>1898</a>            .unwrap();
+<a href=#1899 id=1899 data-nosnippet>1899</a>
+<a href=#1900 id=1900 data-nosnippet>1900</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
+<a href=#1901 id=1901 data-nosnippet>1901</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSpec {
+<a href=#1902 id=1902 data-nosnippet>1902</a>            spec: unbound_spec.clone()
+<a href=#1903 id=1903 data-nosnippet>1903</a>        });
+<a href=#1904 id=1904 data-nosnippet>1904</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetDefaultSpec {
+<a href=#1905 id=1905 data-nosnippet>1905</a>            spec_id: -<span class="number">1
+<a href=#1906 id=1906 data-nosnippet>1906</a>        </span>});
+<a href=#1907 id=1907 data-nosnippet>1907</a>        <span class="macro">assert_eq!</span>(
+<a href=#1908 id=1908 data-nosnippet>1908</a>            build_result.metadata.default_spec,
+<a href=#1909 id=1909 data-nosnippet>1909</a>            Arc::new(
+<a href=#1910 id=1910 data-nosnippet>1910</a>                unbound_spec
+<a href=#1911 id=1911 data-nosnippet>1911</a>                    .bind(build_result.metadata.current_schema().clone())
+<a href=#1912 id=1912 data-nosnippet>1912</a>                    .unwrap()
+<a href=#1913 id=1913 data-nosnippet>1913</a>            )
+<a href=#1914 id=1914 data-nosnippet>1914</a>        );
+<a href=#1915 id=1915 data-nosnippet>1915</a>
+<a href=#1916 id=1916 data-nosnippet>1916</a>        <span class="comment">// Set old spec again
+<a href=#1917 id=1917 data-nosnippet>1917</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#1918 id=1918 data-nosnippet>1918</a>            .metadata
+<a href=#1919 id=1919 data-nosnippet>1919</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#1920 id=1920 data-nosnippet>1920</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#1921 id=1921 data-nosnippet>1921</a>            ))
+<a href=#1922 id=1922 data-nosnippet>1922</a>            .set_default_partition_spec(<span class="number">0</span>)
+<a href=#1923 id=1923 data-nosnippet>1923</a>            .unwrap()
+<a href=#1924 id=1924 data-nosnippet>1924</a>            .build()
+<a href=#1925 id=1925 data-nosnippet>1925</a>            .unwrap();
+<a href=#1926 id=1926 data-nosnippet>1926</a>
+<a href=#1927 id=1927 data-nosnippet>1927</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#1928 id=1928 data-nosnippet>1928</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::SetDefaultSpec {
+<a href=#1929 id=1929 data-nosnippet>1929</a>            spec_id: <span class="number">0
+<a href=#1930 id=1930 data-nosnippet>1930</a>        </span>});
+<a href=#1931 id=1931 data-nosnippet>1931</a>        <span class="macro">assert_eq!</span>(
+<a href=#1932 id=1932 data-nosnippet>1932</a>            build_result.metadata.default_spec,
+<a href=#1933 id=1933 data-nosnippet>1933</a>            Arc::new(
+<a href=#1934 id=1934 data-nosnippet>1934</a>                partition_spec()
+<a href=#1935 id=1935 data-nosnippet>1935</a>                    .bind(build_result.metadata.current_schema().clone())
+<a href=#1936 id=1936 data-nosnippet>1936</a>                    .unwrap()
+<a href=#1937 id=1937 data-nosnippet>1937</a>            )
+<a href=#1938 id=1938 data-nosnippet>1938</a>        );
+<a href=#1939 id=1939 data-nosnippet>1939</a>    }
+<a href=#1940 id=1940 data-nosnippet>1940</a>
+<a href=#1941 id=1941 data-nosnippet>1941</a>    <span class="attr">#[test]
+<a href=#1942 id=1942 data-nosnippet>1942</a>    </span><span class="kw">fn </span>test_add_sort_order() {
+<a href=#1943 id=1943 data-nosnippet>1943</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#1944 id=1944 data-nosnippet>1944</a>
+<a href=#1945 id=1945 data-nosnippet>1945</a>        <span class="kw">let </span>added_sort_order = SortOrder::builder()
+<a href=#1946 id=1946 data-nosnippet>1946</a>            .with_order_id(<span class="number">10</span>)
+<a href=#1947 id=1947 data-nosnippet>1947</a>            .with_fields(<span class="macro">vec!</span>[SortField {
+<a href=#1948 id=1948 data-nosnippet>1948</a>                source_id: <span class="number">1</span>,
+<a href=#1949 id=1949 data-nosnippet>1949</a>                transform: Transform::Identity,
+<a href=#1950 id=1950 data-nosnippet>1950</a>                direction: SortDirection::Ascending,
+<a href=#1951 id=1951 data-nosnippet>1951</a>                null_order: NullOrder::First,
+<a href=#1952 id=1952 data-nosnippet>1952</a>            }])
+<a href=#1953 id=1953 data-nosnippet>1953</a>            .build(<span class="kw-2">&amp;</span>schema())
+<a href=#1954 id=1954 data-nosnippet>1954</a>            .unwrap();
+<a href=#1955 id=1955 data-nosnippet>1955</a>
+<a href=#1956 id=1956 data-nosnippet>1956</a>        <span class="kw">let </span>build_result = builder
+<a href=#1957 id=1957 data-nosnippet>1957</a>            .add_sort_order(added_sort_order.clone())
+<a href=#1958 id=1958 data-nosnippet>1958</a>            .unwrap()
+<a href=#1959 id=1959 data-nosnippet>1959</a>            .build()
+<a href=#1960 id=1960 data-nosnippet>1960</a>            .unwrap();
 <a href=#1961 id=1961 data-nosnippet>1961</a>
-<a href=#1962 id=1962 data-nosnippet>1962</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#1963 id=1963 data-nosnippet>1963</a>        <span class="macro">assert_eq!</span>(build_result.metadata.sort_orders.keys().max(), <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="number">2</span>));
-<a href=#1964 id=1964 data-nosnippet>1964</a>        <span class="macro">pretty_assertions::assert_eq!</span>(
-<a href=#1965 id=1965 data-nosnippet>1965</a>            build_result.metadata.sort_order_by_id(<span class="number">2</span>),
-<a href=#1966 id=1966 data-nosnippet>1966</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(expected_sort_order.clone()))
-<a href=#1967 id=1967 data-nosnippet>1967</a>        );
-<a href=#1968 id=1968 data-nosnippet>1968</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSortOrder {
-<a href=#1969 id=1969 data-nosnippet>1969</a>            sort_order: expected_sort_order
-<a href=#1970 id=1970 data-nosnippet>1970</a>        });
-<a href=#1971 id=1971 data-nosnippet>1971</a>    }
-<a href=#1972 id=1972 data-nosnippet>1972</a>
-<a href=#1973 id=1973 data-nosnippet>1973</a>    <span class="attr">#[test]
-<a href=#1974 id=1974 data-nosnippet>1974</a>    </span><span class="kw">fn </span>test_add_compatible_schema() {
-<a href=#1975 id=1975 data-nosnippet>1975</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#1976 id=1976 data-nosnippet>1976</a>
-<a href=#1977 id=1977 data-nosnippet>1977</a>        <span class="kw">let </span>added_schema = Schema::builder()
-<a href=#1978 id=1978 data-nosnippet>1978</a>            .with_schema_id(<span class="number">1</span>)
-<a href=#1979 id=1979 data-nosnippet>1979</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#1980 id=1980 data-nosnippet>1980</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1981 id=1981 data-nosnippet>1981</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1982 id=1982 data-nosnippet>1982</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1983 id=1983 data-nosnippet>1983</a>                NestedField::required(<span class="number">4</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#1984 id=1984 data-nosnippet>1984</a>            ])
-<a href=#1985 id=1985 data-nosnippet>1985</a>            .build()
-<a href=#1986 id=1986 data-nosnippet>1986</a>            .unwrap();
-<a href=#1987 id=1987 data-nosnippet>1987</a>
-<a href=#1988 id=1988 data-nosnippet>1988</a>        <span class="kw">let </span>build_result = builder
-<a href=#1989 id=1989 data-nosnippet>1989</a>            .add_current_schema(added_schema.clone())
-<a href=#1990 id=1990 data-nosnippet>1990</a>            .unwrap()
-<a href=#1991 id=1991 data-nosnippet>1991</a>            .build()
-<a href=#1992 id=1992 data-nosnippet>1992</a>            .unwrap();
-<a href=#1993 id=1993 data-nosnippet>1993</a>
-<a href=#1994 id=1994 data-nosnippet>1994</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
-<a href=#1995 id=1995 data-nosnippet>1995</a>        <span class="macro">assert_eq!</span>(build_result.metadata.schemas.keys().max(), <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="number">1</span>));
-<a href=#1996 id=1996 data-nosnippet>1996</a>        <span class="macro">pretty_assertions::assert_eq!</span>(
-<a href=#1997 id=1997 data-nosnippet>1997</a>            build_result.metadata.schema_by_id(<span class="number">1</span>),
-<a href=#1998 id=1998 data-nosnippet>1998</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(added_schema.clone()))
-<a href=#1999 id=1999 data-nosnippet>1999</a>        );
-<a href=#2000 id=2000 data-nosnippet>2000</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSchema {
-<a href=#2001 id=2001 data-nosnippet>2001</a>            schema: added_schema
-<a href=#2002 id=2002 data-nosnippet>2002</a>        });
-<a href=#2003 id=2003 data-nosnippet>2003</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetCurrentSchema {
-<a href=#2004 id=2004 data-nosnippet>2004</a>            schema_id: -<span class="number">1
-<a href=#2005 id=2005 data-nosnippet>2005</a>        </span>});
-<a href=#2006 id=2006 data-nosnippet>2006</a>    }
-<a href=#2007 id=2007 data-nosnippet>2007</a>
-<a href=#2008 id=2008 data-nosnippet>2008</a>    <span class="attr">#[test]
-<a href=#2009 id=2009 data-nosnippet>2009</a>    </span><span class="kw">fn </span>test_set_current_schema_change_is_minus_one_if_schema_was_added_in_this_change() {
-<a href=#2010 id=2010 data-nosnippet>2010</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2011 id=2011 data-nosnippet>2011</a>
-<a href=#2012 id=2012 data-nosnippet>2012</a>        <span class="kw">let </span>added_schema = Schema::builder()
-<a href=#2013 id=2013 data-nosnippet>2013</a>            .with_schema_id(<span class="number">1</span>)
-<a href=#2014 id=2014 data-nosnippet>2014</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2015 id=2015 data-nosnippet>2015</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#2016 id=2016 data-nosnippet>2016</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#2017 id=2017 data-nosnippet>2017</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#2018 id=2018 data-nosnippet>2018</a>                NestedField::required(<span class="number">4</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
-<a href=#2019 id=2019 data-nosnippet>2019</a>            ])
-<a href=#2020 id=2020 data-nosnippet>2020</a>            .build()
-<a href=#2021 id=2021 data-nosnippet>2021</a>            .unwrap();
-<a href=#2022 id=2022 data-nosnippet>2022</a>
-<a href=#2023 id=2023 data-nosnippet>2023</a>        <span class="kw">let </span>build_result = builder
-<a href=#2024 id=2024 data-nosnippet>2024</a>            .add_schema(added_schema.clone())
-<a href=#2025 id=2025 data-nosnippet>2025</a>            .unwrap()
-<a href=#2026 id=2026 data-nosnippet>2026</a>            .set_current_schema(<span class="number">1</span>)
+<a href=#1962 id=1962 data-nosnippet>1962</a>        <span class="kw">let </span>expected_sort_order = added_sort_order.with_order_id(<span class="number">2</span>);
+<a href=#1963 id=1963 data-nosnippet>1963</a>
+<a href=#1964 id=1964 data-nosnippet>1964</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#1965 id=1965 data-nosnippet>1965</a>        <span class="macro">assert_eq!</span>(build_result.metadata.sort_orders.keys().max(), <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="number">2</span>));
+<a href=#1966 id=1966 data-nosnippet>1966</a>        <span class="macro">pretty_assertions::assert_eq!</span>(
+<a href=#1967 id=1967 data-nosnippet>1967</a>            build_result.metadata.sort_order_by_id(<span class="number">2</span>),
+<a href=#1968 id=1968 data-nosnippet>1968</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(expected_sort_order.clone()))
+<a href=#1969 id=1969 data-nosnippet>1969</a>        );
+<a href=#1970 id=1970 data-nosnippet>1970</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSortOrder {
+<a href=#1971 id=1971 data-nosnippet>1971</a>            sort_order: expected_sort_order
+<a href=#1972 id=1972 data-nosnippet>1972</a>        });
+<a href=#1973 id=1973 data-nosnippet>1973</a>    }
+<a href=#1974 id=1974 data-nosnippet>1974</a>
+<a href=#1975 id=1975 data-nosnippet>1975</a>    <span class="attr">#[test]
+<a href=#1976 id=1976 data-nosnippet>1976</a>    </span><span class="kw">fn </span>test_add_compatible_schema() {
+<a href=#1977 id=1977 data-nosnippet>1977</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#1978 id=1978 data-nosnippet>1978</a>
+<a href=#1979 id=1979 data-nosnippet>1979</a>        <span class="kw">let </span>added_schema = Schema::builder()
+<a href=#1980 id=1980 data-nosnippet>1980</a>            .with_schema_id(<span class="number">1</span>)
+<a href=#1981 id=1981 data-nosnippet>1981</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#1982 id=1982 data-nosnippet>1982</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1983 id=1983 data-nosnippet>1983</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1984 id=1984 data-nosnippet>1984</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1985 id=1985 data-nosnippet>1985</a>                NestedField::required(<span class="number">4</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#1986 id=1986 data-nosnippet>1986</a>            ])
+<a href=#1987 id=1987 data-nosnippet>1987</a>            .build()
+<a href=#1988 id=1988 data-nosnippet>1988</a>            .unwrap();
+<a href=#1989 id=1989 data-nosnippet>1989</a>
+<a href=#1990 id=1990 data-nosnippet>1990</a>        <span class="kw">let </span>build_result = builder
+<a href=#1991 id=1991 data-nosnippet>1991</a>            .add_current_schema(added_schema.clone())
+<a href=#1992 id=1992 data-nosnippet>1992</a>            .unwrap()
+<a href=#1993 id=1993 data-nosnippet>1993</a>            .build()
+<a href=#1994 id=1994 data-nosnippet>1994</a>            .unwrap();
+<a href=#1995 id=1995 data-nosnippet>1995</a>
+<a href=#1996 id=1996 data-nosnippet>1996</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
+<a href=#1997 id=1997 data-nosnippet>1997</a>        <span class="macro">assert_eq!</span>(build_result.metadata.schemas.keys().max(), <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="number">1</span>));
+<a href=#1998 id=1998 data-nosnippet>1998</a>        <span class="macro">pretty_assertions::assert_eq!</span>(
+<a href=#1999 id=1999 data-nosnippet>1999</a>            build_result.metadata.schema_by_id(<span class="number">1</span>),
+<a href=#2000 id=2000 data-nosnippet>2000</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(added_schema.clone()))
+<a href=#2001 id=2001 data-nosnippet>2001</a>        );
+<a href=#2002 id=2002 data-nosnippet>2002</a>        <span class="macro">pretty_assertions::assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddSchema {
+<a href=#2003 id=2003 data-nosnippet>2003</a>            schema: added_schema
+<a href=#2004 id=2004 data-nosnippet>2004</a>        });
+<a href=#2005 id=2005 data-nosnippet>2005</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetCurrentSchema {
+<a href=#2006 id=2006 data-nosnippet>2006</a>            schema_id: -<span class="number">1
+<a href=#2007 id=2007 data-nosnippet>2007</a>        </span>});
+<a href=#2008 id=2008 data-nosnippet>2008</a>    }
+<a href=#2009 id=2009 data-nosnippet>2009</a>
+<a href=#2010 id=2010 data-nosnippet>2010</a>    <span class="attr">#[test]
+<a href=#2011 id=2011 data-nosnippet>2011</a>    </span><span class="kw">fn </span>test_set_current_schema_change_is_minus_one_if_schema_was_added_in_this_change() {
+<a href=#2012 id=2012 data-nosnippet>2012</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2013 id=2013 data-nosnippet>2013</a>
+<a href=#2014 id=2014 data-nosnippet>2014</a>        <span class="kw">let </span>added_schema = Schema::builder()
+<a href=#2015 id=2015 data-nosnippet>2015</a>            .with_schema_id(<span class="number">1</span>)
+<a href=#2016 id=2016 data-nosnippet>2016</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2017 id=2017 data-nosnippet>2017</a>                NestedField::required(<span class="number">1</span>, <span class="string">"x"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#2018 id=2018 data-nosnippet>2018</a>                NestedField::required(<span class="number">2</span>, <span class="string">"y"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#2019 id=2019 data-nosnippet>2019</a>                NestedField::required(<span class="number">3</span>, <span class="string">"z"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#2020 id=2020 data-nosnippet>2020</a>                NestedField::required(<span class="number">4</span>, <span class="string">"a"</span>, Type::Primitive(PrimitiveType::Long)).into(),
+<a href=#2021 id=2021 data-nosnippet>2021</a>            ])
+<a href=#2022 id=2022 data-nosnippet>2022</a>            .build()
+<a href=#2023 id=2023 data-nosnippet>2023</a>            .unwrap();
+<a href=#2024 id=2024 data-nosnippet>2024</a>
+<a href=#2025 id=2025 data-nosnippet>2025</a>        <span class="kw">let </span>build_result = builder
+<a href=#2026 id=2026 data-nosnippet>2026</a>            .add_schema(added_schema.clone())
 <a href=#2027 id=2027 data-nosnippet>2027</a>            .unwrap()
-<a href=#2028 id=2028 data-nosnippet>2028</a>            .build()
-<a href=#2029 id=2029 data-nosnippet>2029</a>            .unwrap();
-<a href=#2030 id=2030 data-nosnippet>2030</a>
-<a href=#2031 id=2031 data-nosnippet>2031</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
-<a href=#2032 id=2032 data-nosnippet>2032</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetCurrentSchema {
-<a href=#2033 id=2033 data-nosnippet>2033</a>            schema_id: -<span class="number">1
-<a href=#2034 id=2034 data-nosnippet>2034</a>        </span>});
-<a href=#2035 id=2035 data-nosnippet>2035</a>    }
-<a href=#2036 id=2036 data-nosnippet>2036</a>
-<a href=#2037 id=2037 data-nosnippet>2037</a>    <span class="attr">#[test]
-<a href=#2038 id=2038 data-nosnippet>2038</a>    </span><span class="kw">fn </span>test_no_metadata_log_for_create_table() {
-<a href=#2039 id=2039 data-nosnippet>2039</a>        <span class="kw">let </span>build_result = TableMetadataBuilder::new(
-<a href=#2040 id=2040 data-nosnippet>2040</a>            schema(),
-<a href=#2041 id=2041 data-nosnippet>2041</a>            partition_spec(),
-<a href=#2042 id=2042 data-nosnippet>2042</a>            sort_order(),
-<a href=#2043 id=2043 data-nosnippet>2043</a>            TEST_LOCATION.to_string(),
-<a href=#2044 id=2044 data-nosnippet>2044</a>            FormatVersion::V2,
-<a href=#2045 id=2045 data-nosnippet>2045</a>            HashMap::new(),
-<a href=#2046 id=2046 data-nosnippet>2046</a>        )
-<a href=#2047 id=2047 data-nosnippet>2047</a>        .unwrap()
-<a href=#2048 id=2048 data-nosnippet>2048</a>        .build()
-<a href=#2049 id=2049 data-nosnippet>2049</a>        .unwrap();
-<a href=#2050 id=2050 data-nosnippet>2050</a>
-<a href=#2051 id=2051 data-nosnippet>2051</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">0</span>);
-<a href=#2052 id=2052 data-nosnippet>2052</a>    }
-<a href=#2053 id=2053 data-nosnippet>2053</a>
-<a href=#2054 id=2054 data-nosnippet>2054</a>    <span class="attr">#[test]
-<a href=#2055 id=2055 data-nosnippet>2055</a>    </span><span class="kw">fn </span>test_no_metadata_log_entry_for_no_previous_location() {
-<a href=#2056 id=2056 data-nosnippet>2056</a>        <span class="comment">// Used for first commit after stage-creation of tables
-<a href=#2057 id=2057 data-nosnippet>2057</a>        </span><span class="kw">let </span>metadata = builder_without_changes(FormatVersion::V2)
-<a href=#2058 id=2058 data-nosnippet>2058</a>            .build()
-<a href=#2059 id=2059 data-nosnippet>2059</a>            .unwrap()
-<a href=#2060 id=2060 data-nosnippet>2060</a>            .metadata;
-<a href=#2061 id=2061 data-nosnippet>2061</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">1</span>);
-<a href=#2062 id=2062 data-nosnippet>2062</a>
-<a href=#2063 id=2063 data-nosnippet>2063</a>        <span class="kw">let </span>build_result = metadata
-<a href=#2064 id=2064 data-nosnippet>2064</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#2065 id=2065 data-nosnippet>2065</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#2066 id=2066 data-nosnippet>2066</a>                <span class="string">"foo"</span>.to_string(),
-<a href=#2067 id=2067 data-nosnippet>2067</a>                <span class="string">"bar"</span>.to_string(),
-<a href=#2068 id=2068 data-nosnippet>2068</a>            )]))
-<a href=#2069 id=2069 data-nosnippet>2069</a>            .unwrap()
-<a href=#2070 id=2070 data-nosnippet>2070</a>            .build()
-<a href=#2071 id=2071 data-nosnippet>2071</a>            .unwrap();
-<a href=#2072 id=2072 data-nosnippet>2072</a>
-<a href=#2073 id=2073 data-nosnippet>2073</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">1</span>);
-<a href=#2074 id=2074 data-nosnippet>2074</a>    }
-<a href=#2075 id=2075 data-nosnippet>2075</a>
-<a href=#2076 id=2076 data-nosnippet>2076</a>    <span class="attr">#[test]
-<a href=#2077 id=2077 data-nosnippet>2077</a>    </span><span class="kw">fn </span>test_from_metadata_generates_metadata_log() {
-<a href=#2078 id=2078 data-nosnippet>2078</a>        <span class="kw">let </span>metadata_path = <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>;
-<a href=#2079 id=2079 data-nosnippet>2079</a>        <span class="kw">let </span>builder = TableMetadataBuilder::new(
-<a href=#2080 id=2080 data-nosnippet>2080</a>            schema(),
-<a href=#2081 id=2081 data-nosnippet>2081</a>            partition_spec(),
-<a href=#2082 id=2082 data-nosnippet>2082</a>            sort_order(),
-<a href=#2083 id=2083 data-nosnippet>2083</a>            TEST_LOCATION.to_string(),
-<a href=#2084 id=2084 data-nosnippet>2084</a>            FormatVersion::V2,
-<a href=#2085 id=2085 data-nosnippet>2085</a>            HashMap::new(),
-<a href=#2086 id=2086 data-nosnippet>2086</a>        )
-<a href=#2087 id=2087 data-nosnippet>2087</a>        .unwrap()
-<a href=#2088 id=2088 data-nosnippet>2088</a>        .build()
+<a href=#2028 id=2028 data-nosnippet>2028</a>            .set_current_schema(<span class="number">1</span>)
+<a href=#2029 id=2029 data-nosnippet>2029</a>            .unwrap()
+<a href=#2030 id=2030 data-nosnippet>2030</a>            .build()
+<a href=#2031 id=2031 data-nosnippet>2031</a>            .unwrap();
+<a href=#2032 id=2032 data-nosnippet>2032</a>
+<a href=#2033 id=2033 data-nosnippet>2033</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">2</span>);
+<a href=#2034 id=2034 data-nosnippet>2034</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">1</span>], TableUpdate::SetCurrentSchema {
+<a href=#2035 id=2035 data-nosnippet>2035</a>            schema_id: -<span class="number">1
+<a href=#2036 id=2036 data-nosnippet>2036</a>        </span>});
+<a href=#2037 id=2037 data-nosnippet>2037</a>    }
+<a href=#2038 id=2038 data-nosnippet>2038</a>
+<a href=#2039 id=2039 data-nosnippet>2039</a>    <span class="attr">#[test]
+<a href=#2040 id=2040 data-nosnippet>2040</a>    </span><span class="kw">fn </span>test_no_metadata_log_for_create_table() {
+<a href=#2041 id=2041 data-nosnippet>2041</a>        <span class="kw">let </span>build_result = TableMetadataBuilder::new(
+<a href=#2042 id=2042 data-nosnippet>2042</a>            schema(),
+<a href=#2043 id=2043 data-nosnippet>2043</a>            partition_spec(),
+<a href=#2044 id=2044 data-nosnippet>2044</a>            sort_order(),
+<a href=#2045 id=2045 data-nosnippet>2045</a>            TEST_LOCATION.to_string(),
+<a href=#2046 id=2046 data-nosnippet>2046</a>            FormatVersion::V2,
+<a href=#2047 id=2047 data-nosnippet>2047</a>            HashMap::new(),
+<a href=#2048 id=2048 data-nosnippet>2048</a>        )
+<a href=#2049 id=2049 data-nosnippet>2049</a>        .unwrap()
+<a href=#2050 id=2050 data-nosnippet>2050</a>        .build()
+<a href=#2051 id=2051 data-nosnippet>2051</a>        .unwrap();
+<a href=#2052 id=2052 data-nosnippet>2052</a>
+<a href=#2053 id=2053 data-nosnippet>2053</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">0</span>);
+<a href=#2054 id=2054 data-nosnippet>2054</a>    }
+<a href=#2055 id=2055 data-nosnippet>2055</a>
+<a href=#2056 id=2056 data-nosnippet>2056</a>    <span class="attr">#[test]
+<a href=#2057 id=2057 data-nosnippet>2057</a>    </span><span class="kw">fn </span>test_no_metadata_log_entry_for_no_previous_location() {
+<a href=#2058 id=2058 data-nosnippet>2058</a>        <span class="comment">// Used for first commit after stage-creation of tables
+<a href=#2059 id=2059 data-nosnippet>2059</a>        </span><span class="kw">let </span>metadata = builder_without_changes(FormatVersion::V2)
+<a href=#2060 id=2060 data-nosnippet>2060</a>            .build()
+<a href=#2061 id=2061 data-nosnippet>2061</a>            .unwrap()
+<a href=#2062 id=2062 data-nosnippet>2062</a>            .metadata;
+<a href=#2063 id=2063 data-nosnippet>2063</a>        <span class="macro">assert_eq!</span>(metadata.metadata_log.len(), <span class="number">1</span>);
+<a href=#2064 id=2064 data-nosnippet>2064</a>
+<a href=#2065 id=2065 data-nosnippet>2065</a>        <span class="kw">let </span>build_result = metadata
+<a href=#2066 id=2066 data-nosnippet>2066</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#2067 id=2067 data-nosnippet>2067</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#2068 id=2068 data-nosnippet>2068</a>                <span class="string">"foo"</span>.to_string(),
+<a href=#2069 id=2069 data-nosnippet>2069</a>                <span class="string">"bar"</span>.to_string(),
+<a href=#2070 id=2070 data-nosnippet>2070</a>            )]))
+<a href=#2071 id=2071 data-nosnippet>2071</a>            .unwrap()
+<a href=#2072 id=2072 data-nosnippet>2072</a>            .build()
+<a href=#2073 id=2073 data-nosnippet>2073</a>            .unwrap();
+<a href=#2074 id=2074 data-nosnippet>2074</a>
+<a href=#2075 id=2075 data-nosnippet>2075</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">1</span>);
+<a href=#2076 id=2076 data-nosnippet>2076</a>    }
+<a href=#2077 id=2077 data-nosnippet>2077</a>
+<a href=#2078 id=2078 data-nosnippet>2078</a>    <span class="attr">#[test]
+<a href=#2079 id=2079 data-nosnippet>2079</a>    </span><span class="kw">fn </span>test_from_metadata_generates_metadata_log() {
+<a href=#2080 id=2080 data-nosnippet>2080</a>        <span class="kw">let </span>metadata_path = <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>;
+<a href=#2081 id=2081 data-nosnippet>2081</a>        <span class="kw">let </span>builder = TableMetadataBuilder::new(
+<a href=#2082 id=2082 data-nosnippet>2082</a>            schema(),
+<a href=#2083 id=2083 data-nosnippet>2083</a>            partition_spec(),
+<a href=#2084 id=2084 data-nosnippet>2084</a>            sort_order(),
+<a href=#2085 id=2085 data-nosnippet>2085</a>            TEST_LOCATION.to_string(),
+<a href=#2086 id=2086 data-nosnippet>2086</a>            FormatVersion::V2,
+<a href=#2087 id=2087 data-nosnippet>2087</a>            HashMap::new(),
+<a href=#2088 id=2088 data-nosnippet>2088</a>        )
 <a href=#2089 id=2089 data-nosnippet>2089</a>        .unwrap()
-<a href=#2090 id=2090 data-nosnippet>2090</a>        .metadata
-<a href=#2091 id=2091 data-nosnippet>2091</a>        .into_builder(<span class="prelude-val">Some</span>(metadata_path.to_string()));
-<a href=#2092 id=2092 data-nosnippet>2092</a>
-<a href=#2093 id=2093 data-nosnippet>2093</a>        <span class="kw">let </span>builder = builder
-<a href=#2094 id=2094 data-nosnippet>2094</a>            .add_default_sort_order(SortOrder::unsorted_order())
-<a href=#2095 id=2095 data-nosnippet>2095</a>            .unwrap();
-<a href=#2096 id=2096 data-nosnippet>2096</a>
-<a href=#2097 id=2097 data-nosnippet>2097</a>        <span class="kw">let </span>build_result = builder.build().unwrap();
+<a href=#2090 id=2090 data-nosnippet>2090</a>        .build()
+<a href=#2091 id=2091 data-nosnippet>2091</a>        .unwrap()
+<a href=#2092 id=2092 data-nosnippet>2092</a>        .metadata
+<a href=#2093 id=2093 data-nosnippet>2093</a>        .into_builder(<span class="prelude-val">Some</span>(metadata_path.to_string()));
+<a href=#2094 id=2094 data-nosnippet>2094</a>
+<a href=#2095 id=2095 data-nosnippet>2095</a>        <span class="kw">let </span>builder = builder
+<a href=#2096 id=2096 data-nosnippet>2096</a>            .add_default_sort_order(SortOrder::unsorted_order())
+<a href=#2097 id=2097 data-nosnippet>2097</a>            .unwrap();
 <a href=#2098 id=2098 data-nosnippet>2098</a>
-<a href=#2099 id=2099 data-nosnippet>2099</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">1</span>);
-<a href=#2100 id=2100 data-nosnippet>2100</a>        <span class="macro">assert_eq!</span>(
-<a href=#2101 id=2101 data-nosnippet>2101</a>            build_result.metadata.metadata_log[<span class="number">0</span>].metadata_file,
-<a href=#2102 id=2102 data-nosnippet>2102</a>            metadata_path
-<a href=#2103 id=2103 data-nosnippet>2103</a>        );
-<a href=#2104 id=2104 data-nosnippet>2104</a>    }
-<a href=#2105 id=2105 data-nosnippet>2105</a>
-<a href=#2106 id=2106 data-nosnippet>2106</a>    <span class="attr">#[test]
-<a href=#2107 id=2107 data-nosnippet>2107</a>    </span><span class="kw">fn </span>test_set_ref() {
-<a href=#2108 id=2108 data-nosnippet>2108</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2109 id=2109 data-nosnippet>2109</a>
-<a href=#2110 id=2110 data-nosnippet>2110</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2111 id=2111 data-nosnippet>2111</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#2112 id=2112 data-nosnippet>2112</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2113 id=2113 data-nosnippet>2113</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2114 id=2114 data-nosnippet>2114</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2115 id=2115 data-nosnippet>2115</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2116 id=2116 data-nosnippet>2116</a>            .with_summary(Summary {
-<a href=#2117 id=2117 data-nosnippet>2117</a>                operation: Operation::Append,
-<a href=#2118 id=2118 data-nosnippet>2118</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
-<a href=#2119 id=2119 data-nosnippet>2119</a>                    (
-<a href=#2120 id=2120 data-nosnippet>2120</a>                        <span class="string">"spark.app.id"</span>.to_string(),
-<a href=#2121 id=2121 data-nosnippet>2121</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
-<a href=#2122 id=2122 data-nosnippet>2122</a>                    ),
-<a href=#2123 id=2123 data-nosnippet>2123</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2124 id=2124 data-nosnippet>2124</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2125 id=2125 data-nosnippet>2125</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
-<a href=#2126 id=2126 data-nosnippet>2126</a>                ]),
-<a href=#2127 id=2127 data-nosnippet>2127</a>            })
-<a href=#2128 id=2128 data-nosnippet>2128</a>            .build();
-<a href=#2129 id=2129 data-nosnippet>2129</a>
-<a href=#2130 id=2130 data-nosnippet>2130</a>        <span class="kw">let </span>builder = builder.add_snapshot(snapshot.clone()).unwrap();
+<a href=#2099 id=2099 data-nosnippet>2099</a>        <span class="kw">let </span>build_result = builder.build().unwrap();
+<a href=#2100 id=2100 data-nosnippet>2100</a>
+<a href=#2101 id=2101 data-nosnippet>2101</a>        <span class="macro">assert_eq!</span>(build_result.metadata.metadata_log.len(), <span class="number">1</span>);
+<a href=#2102 id=2102 data-nosnippet>2102</a>        <span class="macro">assert_eq!</span>(
+<a href=#2103 id=2103 data-nosnippet>2103</a>            build_result.metadata.metadata_log[<span class="number">0</span>].metadata_file,
+<a href=#2104 id=2104 data-nosnippet>2104</a>            metadata_path
+<a href=#2105 id=2105 data-nosnippet>2105</a>        );
+<a href=#2106 id=2106 data-nosnippet>2106</a>    }
+<a href=#2107 id=2107 data-nosnippet>2107</a>
+<a href=#2108 id=2108 data-nosnippet>2108</a>    <span class="attr">#[test]
+<a href=#2109 id=2109 data-nosnippet>2109</a>    </span><span class="kw">fn </span>test_set_ref() {
+<a href=#2110 id=2110 data-nosnippet>2110</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2111 id=2111 data-nosnippet>2111</a>
+<a href=#2112 id=2112 data-nosnippet>2112</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2113 id=2113 data-nosnippet>2113</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#2114 id=2114 data-nosnippet>2114</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2115 id=2115 data-nosnippet>2115</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2116 id=2116 data-nosnippet>2116</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2117 id=2117 data-nosnippet>2117</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2118 id=2118 data-nosnippet>2118</a>            .with_summary(Summary {
+<a href=#2119 id=2119 data-nosnippet>2119</a>                operation: Operation::Append,
+<a href=#2120 id=2120 data-nosnippet>2120</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
+<a href=#2121 id=2121 data-nosnippet>2121</a>                    (
+<a href=#2122 id=2122 data-nosnippet>2122</a>                        <span class="string">"spark.app.id"</span>.to_string(),
+<a href=#2123 id=2123 data-nosnippet>2123</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
+<a href=#2124 id=2124 data-nosnippet>2124</a>                    ),
+<a href=#2125 id=2125 data-nosnippet>2125</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2126 id=2126 data-nosnippet>2126</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2127 id=2127 data-nosnippet>2127</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
+<a href=#2128 id=2128 data-nosnippet>2128</a>                ]),
+<a href=#2129 id=2129 data-nosnippet>2129</a>            })
+<a href=#2130 id=2130 data-nosnippet>2130</a>            .build();
 <a href=#2131 id=2131 data-nosnippet>2131</a>
-<a href=#2132 id=2132 data-nosnippet>2132</a>        <span class="macro">assert!</span>(
-<a href=#2133 id=2133 data-nosnippet>2133</a>            builder
-<a href=#2134 id=2134 data-nosnippet>2134</a>                .clone()
-<a href=#2135 id=2135 data-nosnippet>2135</a>                .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#2136 id=2136 data-nosnippet>2136</a>                    snapshot_id: <span class="number">10</span>,
-<a href=#2137 id=2137 data-nosnippet>2137</a>                    retention: SnapshotRetention::Branch {
-<a href=#2138 id=2138 data-nosnippet>2138</a>                        min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
-<a href=#2139 id=2139 data-nosnippet>2139</a>                        max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2140 id=2140 data-nosnippet>2140</a>                        max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2141 id=2141 data-nosnippet>2141</a>                    },
-<a href=#2142 id=2142 data-nosnippet>2142</a>                })
-<a href=#2143 id=2143 data-nosnippet>2143</a>                .unwrap_err()
-<a href=#2144 id=2144 data-nosnippet>2144</a>                .to_string()
-<a href=#2145 id=2145 data-nosnippet>2145</a>                .contains(<span class="string">"Cannot set 'main' to unknown snapshot: '10'"</span>)
-<a href=#2146 id=2146 data-nosnippet>2146</a>        );
-<a href=#2147 id=2147 data-nosnippet>2147</a>
-<a href=#2148 id=2148 data-nosnippet>2148</a>        <span class="kw">let </span>build_result = builder
-<a href=#2149 id=2149 data-nosnippet>2149</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#2150 id=2150 data-nosnippet>2150</a>                snapshot_id: <span class="number">1</span>,
-<a href=#2151 id=2151 data-nosnippet>2151</a>                retention: SnapshotRetention::Branch {
-<a href=#2152 id=2152 data-nosnippet>2152</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
-<a href=#2153 id=2153 data-nosnippet>2153</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2154 id=2154 data-nosnippet>2154</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2155 id=2155 data-nosnippet>2155</a>                },
-<a href=#2156 id=2156 data-nosnippet>2156</a>            })
-<a href=#2157 id=2157 data-nosnippet>2157</a>            .unwrap()
-<a href=#2158 id=2158 data-nosnippet>2158</a>            .build()
-<a href=#2159 id=2159 data-nosnippet>2159</a>            .unwrap();
-<a href=#2160 id=2160 data-nosnippet>2160</a>        <span class="macro">assert_eq!</span>(build_result.metadata.snapshots.len(), <span class="number">1</span>);
-<a href=#2161 id=2161 data-nosnippet>2161</a>        <span class="macro">assert_eq!</span>(
-<a href=#2162 id=2162 data-nosnippet>2162</a>            build_result.metadata.snapshot_by_id(<span class="number">1</span>),
-<a href=#2163 id=2163 data-nosnippet>2163</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(snapshot.clone()))
-<a href=#2164 id=2164 data-nosnippet>2164</a>        );
-<a href=#2165 id=2165 data-nosnippet>2165</a>        <span class="macro">assert_eq!</span>(build_result.metadata.snapshot_log, <span class="macro">vec!</span>[SnapshotLog {
-<a href=#2166 id=2166 data-nosnippet>2166</a>            snapshot_id: <span class="number">1</span>,
-<a href=#2167 id=2167 data-nosnippet>2167</a>            timestamp_ms: snapshot.timestamp_ms()
-<a href=#2168 id=2168 data-nosnippet>2168</a>        }])
-<a href=#2169 id=2169 data-nosnippet>2169</a>    }
-<a href=#2170 id=2170 data-nosnippet>2170</a>
-<a href=#2171 id=2171 data-nosnippet>2171</a>    <span class="attr">#[test]
-<a href=#2172 id=2172 data-nosnippet>2172</a>    </span><span class="kw">fn </span>test_snapshot_log_skips_intermediates() {
-<a href=#2173 id=2173 data-nosnippet>2173</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2174 id=2174 data-nosnippet>2174</a>
-<a href=#2175 id=2175 data-nosnippet>2175</a>        <span class="kw">let </span>snapshot_1 = Snapshot::builder()
-<a href=#2176 id=2176 data-nosnippet>2176</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#2177 id=2177 data-nosnippet>2177</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2178 id=2178 data-nosnippet>2178</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2179 id=2179 data-nosnippet>2179</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2180 id=2180 data-nosnippet>2180</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2181 id=2181 data-nosnippet>2181</a>            .with_summary(Summary {
-<a href=#2182 id=2182 data-nosnippet>2182</a>                operation: Operation::Append,
-<a href=#2183 id=2183 data-nosnippet>2183</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
-<a href=#2184 id=2184 data-nosnippet>2184</a>                    (
-<a href=#2185 id=2185 data-nosnippet>2185</a>                        <span class="string">"spark.app.id"</span>.to_string(),
-<a href=#2186 id=2186 data-nosnippet>2186</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
-<a href=#2187 id=2187 data-nosnippet>2187</a>                    ),
-<a href=#2188 id=2188 data-nosnippet>2188</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2189 id=2189 data-nosnippet>2189</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2190 id=2190 data-nosnippet>2190</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
-<a href=#2191 id=2191 data-nosnippet>2191</a>                ]),
-<a href=#2192 id=2192 data-nosnippet>2192</a>            })
-<a href=#2193 id=2193 data-nosnippet>2193</a>            .build();
-<a href=#2194 id=2194 data-nosnippet>2194</a>
-<a href=#2195 id=2195 data-nosnippet>2195</a>        <span class="kw">let </span>snapshot_2 = Snapshot::builder()
-<a href=#2196 id=2196 data-nosnippet>2196</a>            .with_snapshot_id(<span class="number">2</span>)
-<a href=#2197 id=2197 data-nosnippet>2197</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2198 id=2198 data-nosnippet>2198</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2199 id=2199 data-nosnippet>2199</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2200 id=2200 data-nosnippet>2200</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2201 id=2201 data-nosnippet>2201</a>            .with_summary(Summary {
-<a href=#2202 id=2202 data-nosnippet>2202</a>                operation: Operation::Append,
-<a href=#2203 id=2203 data-nosnippet>2203</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
-<a href=#2204 id=2204 data-nosnippet>2204</a>                    (
-<a href=#2205 id=2205 data-nosnippet>2205</a>                        <span class="string">"spark.app.id"</span>.to_string(),
-<a href=#2206 id=2206 data-nosnippet>2206</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
-<a href=#2207 id=2207 data-nosnippet>2207</a>                    ),
-<a href=#2208 id=2208 data-nosnippet>2208</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2209 id=2209 data-nosnippet>2209</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2210 id=2210 data-nosnippet>2210</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
-<a href=#2211 id=2211 data-nosnippet>2211</a>                ]),
-<a href=#2212 id=2212 data-nosnippet>2212</a>            })
-<a href=#2213 id=2213 data-nosnippet>2213</a>            .build();
-<a href=#2214 id=2214 data-nosnippet>2214</a>
-<a href=#2215 id=2215 data-nosnippet>2215</a>        <span class="kw">let </span>result = builder
-<a href=#2216 id=2216 data-nosnippet>2216</a>            .add_snapshot(snapshot_1)
-<a href=#2217 id=2217 data-nosnippet>2217</a>            .unwrap()
-<a href=#2218 id=2218 data-nosnippet>2218</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#2219 id=2219 data-nosnippet>2219</a>                snapshot_id: <span class="number">1</span>,
-<a href=#2220 id=2220 data-nosnippet>2220</a>                retention: SnapshotRetention::Branch {
-<a href=#2221 id=2221 data-nosnippet>2221</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
-<a href=#2222 id=2222 data-nosnippet>2222</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2223 id=2223 data-nosnippet>2223</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2224 id=2224 data-nosnippet>2224</a>                },
-<a href=#2225 id=2225 data-nosnippet>2225</a>            })
-<a href=#2226 id=2226 data-nosnippet>2226</a>            .unwrap()
-<a href=#2227 id=2227 data-nosnippet>2227</a>            .set_branch_snapshot(snapshot_2.clone(), MAIN_BRANCH)
+<a href=#2132 id=2132 data-nosnippet>2132</a>        <span class="kw">let </span>builder = builder.add_snapshot(snapshot.clone()).unwrap();
+<a href=#2133 id=2133 data-nosnippet>2133</a>
+<a href=#2134 id=2134 data-nosnippet>2134</a>        <span class="macro">assert!</span>(
+<a href=#2135 id=2135 data-nosnippet>2135</a>            builder
+<a href=#2136 id=2136 data-nosnippet>2136</a>                .clone()
+<a href=#2137 id=2137 data-nosnippet>2137</a>                .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#2138 id=2138 data-nosnippet>2138</a>                    snapshot_id: <span class="number">10</span>,
+<a href=#2139 id=2139 data-nosnippet>2139</a>                    retention: SnapshotRetention::Branch {
+<a href=#2140 id=2140 data-nosnippet>2140</a>                        min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
+<a href=#2141 id=2141 data-nosnippet>2141</a>                        max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2142 id=2142 data-nosnippet>2142</a>                        max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2143 id=2143 data-nosnippet>2143</a>                    },
+<a href=#2144 id=2144 data-nosnippet>2144</a>                })
+<a href=#2145 id=2145 data-nosnippet>2145</a>                .unwrap_err()
+<a href=#2146 id=2146 data-nosnippet>2146</a>                .to_string()
+<a href=#2147 id=2147 data-nosnippet>2147</a>                .contains(<span class="string">"Cannot set 'main' to unknown snapshot: '10'"</span>)
+<a href=#2148 id=2148 data-nosnippet>2148</a>        );
+<a href=#2149 id=2149 data-nosnippet>2149</a>
+<a href=#2150 id=2150 data-nosnippet>2150</a>        <span class="kw">let </span>build_result = builder
+<a href=#2151 id=2151 data-nosnippet>2151</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#2152 id=2152 data-nosnippet>2152</a>                snapshot_id: <span class="number">1</span>,
+<a href=#2153 id=2153 data-nosnippet>2153</a>                retention: SnapshotRetention::Branch {
+<a href=#2154 id=2154 data-nosnippet>2154</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
+<a href=#2155 id=2155 data-nosnippet>2155</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2156 id=2156 data-nosnippet>2156</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2157 id=2157 data-nosnippet>2157</a>                },
+<a href=#2158 id=2158 data-nosnippet>2158</a>            })
+<a href=#2159 id=2159 data-nosnippet>2159</a>            .unwrap()
+<a href=#2160 id=2160 data-nosnippet>2160</a>            .build()
+<a href=#2161 id=2161 data-nosnippet>2161</a>            .unwrap();
+<a href=#2162 id=2162 data-nosnippet>2162</a>        <span class="macro">assert_eq!</span>(build_result.metadata.snapshots.len(), <span class="number">1</span>);
+<a href=#2163 id=2163 data-nosnippet>2163</a>        <span class="macro">assert_eq!</span>(
+<a href=#2164 id=2164 data-nosnippet>2164</a>            build_result.metadata.snapshot_by_id(<span class="number">1</span>),
+<a href=#2165 id=2165 data-nosnippet>2165</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>Arc::new(snapshot.clone()))
+<a href=#2166 id=2166 data-nosnippet>2166</a>        );
+<a href=#2167 id=2167 data-nosnippet>2167</a>        <span class="macro">assert_eq!</span>(build_result.metadata.snapshot_log, <span class="macro">vec!</span>[SnapshotLog {
+<a href=#2168 id=2168 data-nosnippet>2168</a>            snapshot_id: <span class="number">1</span>,
+<a href=#2169 id=2169 data-nosnippet>2169</a>            timestamp_ms: snapshot.timestamp_ms()
+<a href=#2170 id=2170 data-nosnippet>2170</a>        }])
+<a href=#2171 id=2171 data-nosnippet>2171</a>    }
+<a href=#2172 id=2172 data-nosnippet>2172</a>
+<a href=#2173 id=2173 data-nosnippet>2173</a>    <span class="attr">#[test]
+<a href=#2174 id=2174 data-nosnippet>2174</a>    </span><span class="kw">fn </span>test_snapshot_log_skips_intermediates() {
+<a href=#2175 id=2175 data-nosnippet>2175</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2176 id=2176 data-nosnippet>2176</a>
+<a href=#2177 id=2177 data-nosnippet>2177</a>        <span class="kw">let </span>snapshot_1 = Snapshot::builder()
+<a href=#2178 id=2178 data-nosnippet>2178</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#2179 id=2179 data-nosnippet>2179</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2180 id=2180 data-nosnippet>2180</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2181 id=2181 data-nosnippet>2181</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2182 id=2182 data-nosnippet>2182</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2183 id=2183 data-nosnippet>2183</a>            .with_summary(Summary {
+<a href=#2184 id=2184 data-nosnippet>2184</a>                operation: Operation::Append,
+<a href=#2185 id=2185 data-nosnippet>2185</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
+<a href=#2186 id=2186 data-nosnippet>2186</a>                    (
+<a href=#2187 id=2187 data-nosnippet>2187</a>                        <span class="string">"spark.app.id"</span>.to_string(),
+<a href=#2188 id=2188 data-nosnippet>2188</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
+<a href=#2189 id=2189 data-nosnippet>2189</a>                    ),
+<a href=#2190 id=2190 data-nosnippet>2190</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2191 id=2191 data-nosnippet>2191</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2192 id=2192 data-nosnippet>2192</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
+<a href=#2193 id=2193 data-nosnippet>2193</a>                ]),
+<a href=#2194 id=2194 data-nosnippet>2194</a>            })
+<a href=#2195 id=2195 data-nosnippet>2195</a>            .build();
+<a href=#2196 id=2196 data-nosnippet>2196</a>
+<a href=#2197 id=2197 data-nosnippet>2197</a>        <span class="kw">let </span>snapshot_2 = Snapshot::builder()
+<a href=#2198 id=2198 data-nosnippet>2198</a>            .with_snapshot_id(<span class="number">2</span>)
+<a href=#2199 id=2199 data-nosnippet>2199</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2200 id=2200 data-nosnippet>2200</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2201 id=2201 data-nosnippet>2201</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2202 id=2202 data-nosnippet>2202</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2203 id=2203 data-nosnippet>2203</a>            .with_summary(Summary {
+<a href=#2204 id=2204 data-nosnippet>2204</a>                operation: Operation::Append,
+<a href=#2205 id=2205 data-nosnippet>2205</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
+<a href=#2206 id=2206 data-nosnippet>2206</a>                    (
+<a href=#2207 id=2207 data-nosnippet>2207</a>                        <span class="string">"spark.app.id"</span>.to_string(),
+<a href=#2208 id=2208 data-nosnippet>2208</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
+<a href=#2209 id=2209 data-nosnippet>2209</a>                    ),
+<a href=#2210 id=2210 data-nosnippet>2210</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2211 id=2211 data-nosnippet>2211</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2212 id=2212 data-nosnippet>2212</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
+<a href=#2213 id=2213 data-nosnippet>2213</a>                ]),
+<a href=#2214 id=2214 data-nosnippet>2214</a>            })
+<a href=#2215 id=2215 data-nosnippet>2215</a>            .build();
+<a href=#2216 id=2216 data-nosnippet>2216</a>
+<a href=#2217 id=2217 data-nosnippet>2217</a>        <span class="kw">let </span>result = builder
+<a href=#2218 id=2218 data-nosnippet>2218</a>            .add_snapshot(snapshot_1)
+<a href=#2219 id=2219 data-nosnippet>2219</a>            .unwrap()
+<a href=#2220 id=2220 data-nosnippet>2220</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#2221 id=2221 data-nosnippet>2221</a>                snapshot_id: <span class="number">1</span>,
+<a href=#2222 id=2222 data-nosnippet>2222</a>                retention: SnapshotRetention::Branch {
+<a href=#2223 id=2223 data-nosnippet>2223</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
+<a href=#2224 id=2224 data-nosnippet>2224</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2225 id=2225 data-nosnippet>2225</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2226 id=2226 data-nosnippet>2226</a>                },
+<a href=#2227 id=2227 data-nosnippet>2227</a>            })
 <a href=#2228 id=2228 data-nosnippet>2228</a>            .unwrap()
-<a href=#2229 id=2229 data-nosnippet>2229</a>            .build()
-<a href=#2230 id=2230 data-nosnippet>2230</a>            .unwrap();
-<a href=#2231 id=2231 data-nosnippet>2231</a>
-<a href=#2232 id=2232 data-nosnippet>2232</a>        <span class="macro">assert_eq!</span>(result.metadata.snapshot_log, <span class="macro">vec!</span>[SnapshotLog {
-<a href=#2233 id=2233 data-nosnippet>2233</a>            snapshot_id: <span class="number">2</span>,
-<a href=#2234 id=2234 data-nosnippet>2234</a>            timestamp_ms: snapshot_2.timestamp_ms()
-<a href=#2235 id=2235 data-nosnippet>2235</a>        }]);
-<a href=#2236 id=2236 data-nosnippet>2236</a>        <span class="macro">assert_eq!</span>(result.metadata.current_snapshot().unwrap().snapshot_id(), <span class="number">2</span>);
-<a href=#2237 id=2237 data-nosnippet>2237</a>    }
-<a href=#2238 id=2238 data-nosnippet>2238</a>
-<a href=#2239 id=2239 data-nosnippet>2239</a>    <span class="attr">#[test]
-<a href=#2240 id=2240 data-nosnippet>2240</a>    </span><span class="kw">fn </span>test_remove_main_ref_keeps_snapshot_log() {
-<a href=#2241 id=2241 data-nosnippet>2241</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2242 id=2242 data-nosnippet>2242</a>
-<a href=#2243 id=2243 data-nosnippet>2243</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2244 id=2244 data-nosnippet>2244</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#2245 id=2245 data-nosnippet>2245</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2246 id=2246 data-nosnippet>2246</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2247 id=2247 data-nosnippet>2247</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2248 id=2248 data-nosnippet>2248</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2249 id=2249 data-nosnippet>2249</a>            .with_summary(Summary {
-<a href=#2250 id=2250 data-nosnippet>2250</a>                operation: Operation::Append,
-<a href=#2251 id=2251 data-nosnippet>2251</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
-<a href=#2252 id=2252 data-nosnippet>2252</a>                    (
-<a href=#2253 id=2253 data-nosnippet>2253</a>                        <span class="string">"spark.app.id"</span>.to_string(),
-<a href=#2254 id=2254 data-nosnippet>2254</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
-<a href=#2255 id=2255 data-nosnippet>2255</a>                    ),
-<a href=#2256 id=2256 data-nosnippet>2256</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2257 id=2257 data-nosnippet>2257</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2258 id=2258 data-nosnippet>2258</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
-<a href=#2259 id=2259 data-nosnippet>2259</a>                ]),
-<a href=#2260 id=2260 data-nosnippet>2260</a>            })
-<a href=#2261 id=2261 data-nosnippet>2261</a>            .build();
-<a href=#2262 id=2262 data-nosnippet>2262</a>
-<a href=#2263 id=2263 data-nosnippet>2263</a>        <span class="kw">let </span>result = builder
-<a href=#2264 id=2264 data-nosnippet>2264</a>            .add_snapshot(snapshot.clone())
-<a href=#2265 id=2265 data-nosnippet>2265</a>            .unwrap()
-<a href=#2266 id=2266 data-nosnippet>2266</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#2267 id=2267 data-nosnippet>2267</a>                snapshot_id: <span class="number">1</span>,
-<a href=#2268 id=2268 data-nosnippet>2268</a>                retention: SnapshotRetention::Branch {
-<a href=#2269 id=2269 data-nosnippet>2269</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
-<a href=#2270 id=2270 data-nosnippet>2270</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2271 id=2271 data-nosnippet>2271</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2272 id=2272 data-nosnippet>2272</a>                },
-<a href=#2273 id=2273 data-nosnippet>2273</a>            })
-<a href=#2274 id=2274 data-nosnippet>2274</a>            .unwrap()
-<a href=#2275 id=2275 data-nosnippet>2275</a>            .build()
-<a href=#2276 id=2276 data-nosnippet>2276</a>            .unwrap();
-<a href=#2277 id=2277 data-nosnippet>2277</a>
-<a href=#2278 id=2278 data-nosnippet>2278</a>        <span class="comment">// Verify snapshot log was created
-<a href=#2279 id=2279 data-nosnippet>2279</a>        </span><span class="macro">assert_eq!</span>(result.metadata.snapshot_log.len(), <span class="number">1</span>);
-<a href=#2280 id=2280 data-nosnippet>2280</a>        <span class="macro">assert_eq!</span>(result.metadata.snapshot_log[<span class="number">0</span>].snapshot_id, <span class="number">1</span>);
-<a href=#2281 id=2281 data-nosnippet>2281</a>        <span class="macro">assert_eq!</span>(result.metadata.current_snapshot_id, <span class="prelude-val">Some</span>(<span class="number">1</span>));
-<a href=#2282 id=2282 data-nosnippet>2282</a>
-<a href=#2283 id=2283 data-nosnippet>2283</a>        <span class="comment">// Remove the main ref
-<a href=#2284 id=2284 data-nosnippet>2284</a>        </span><span class="kw">let </span>result_after_remove = result
-<a href=#2285 id=2285 data-nosnippet>2285</a>            .metadata
-<a href=#2286 id=2286 data-nosnippet>2286</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#2287 id=2287 data-nosnippet>2287</a>                <span class="string">"s3://bucket/test/location/metadata/metadata2.json"</span>.to_string(),
-<a href=#2288 id=2288 data-nosnippet>2288</a>            ))
-<a href=#2289 id=2289 data-nosnippet>2289</a>            .remove_ref(MAIN_BRANCH)
-<a href=#2290 id=2290 data-nosnippet>2290</a>            .build()
-<a href=#2291 id=2291 data-nosnippet>2291</a>            .unwrap();
-<a href=#2292 id=2292 data-nosnippet>2292</a>
-<a href=#2293 id=2293 data-nosnippet>2293</a>        <span class="comment">// Verify snapshot log is kept even after removing main ref
-<a href=#2294 id=2294 data-nosnippet>2294</a>        </span><span class="macro">assert_eq!</span>(result_after_remove.metadata.snapshot_log.len(), <span class="number">1</span>);
-<a href=#2295 id=2295 data-nosnippet>2295</a>        <span class="macro">assert_eq!</span>(result_after_remove.metadata.snapshot_log[<span class="number">0</span>].snapshot_id, <span class="number">1</span>);
-<a href=#2296 id=2296 data-nosnippet>2296</a>        <span class="macro">assert_eq!</span>(result_after_remove.metadata.current_snapshot_id, <span class="prelude-val">None</span>);
-<a href=#2297 id=2297 data-nosnippet>2297</a>        <span class="macro">assert_eq!</span>(result_after_remove.changes.len(), <span class="number">1</span>);
-<a href=#2298 id=2298 data-nosnippet>2298</a>        <span class="macro">assert_eq!</span>(
-<a href=#2299 id=2299 data-nosnippet>2299</a>            result_after_remove.changes[<span class="number">0</span>],
-<a href=#2300 id=2300 data-nosnippet>2300</a>            TableUpdate::RemoveSnapshotRef {
-<a href=#2301 id=2301 data-nosnippet>2301</a>                ref_name: MAIN_BRANCH.to_string()
-<a href=#2302 id=2302 data-nosnippet>2302</a>            }
-<a href=#2303 id=2303 data-nosnippet>2303</a>        );
-<a href=#2304 id=2304 data-nosnippet>2304</a>    }
-<a href=#2305 id=2305 data-nosnippet>2305</a>
-<a href=#2306 id=2306 data-nosnippet>2306</a>    <span class="attr">#[test]
-<a href=#2307 id=2307 data-nosnippet>2307</a>    </span><span class="kw">fn </span>test_set_branch_snapshot_creates_branch_if_not_exists() {
-<a href=#2308 id=2308 data-nosnippet>2308</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2309 id=2309 data-nosnippet>2309</a>
-<a href=#2310 id=2310 data-nosnippet>2310</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2311 id=2311 data-nosnippet>2311</a>            .with_snapshot_id(<span class="number">2</span>)
-<a href=#2312 id=2312 data-nosnippet>2312</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2313 id=2313 data-nosnippet>2313</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2314 id=2314 data-nosnippet>2314</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2315 id=2315 data-nosnippet>2315</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2316 id=2316 data-nosnippet>2316</a>            .with_summary(Summary {
-<a href=#2317 id=2317 data-nosnippet>2317</a>                operation: Operation::Append,
-<a href=#2318 id=2318 data-nosnippet>2318</a>                additional_properties: HashMap::new(),
-<a href=#2319 id=2319 data-nosnippet>2319</a>            })
-<a href=#2320 id=2320 data-nosnippet>2320</a>            .build();
-<a href=#2321 id=2321 data-nosnippet>2321</a>
-<a href=#2322 id=2322 data-nosnippet>2322</a>        <span class="kw">let </span>build_result = builder
-<a href=#2323 id=2323 data-nosnippet>2323</a>            .set_branch_snapshot(snapshot.clone(), <span class="string">"new_branch"</span>)
-<a href=#2324 id=2324 data-nosnippet>2324</a>            .unwrap()
-<a href=#2325 id=2325 data-nosnippet>2325</a>            .build()
-<a href=#2326 id=2326 data-nosnippet>2326</a>            .unwrap();
-<a href=#2327 id=2327 data-nosnippet>2327</a>
-<a href=#2328 id=2328 data-nosnippet>2328</a>        <span class="kw">let </span>reference = SnapshotReference {
-<a href=#2329 id=2329 data-nosnippet>2329</a>            snapshot_id: <span class="number">2</span>,
-<a href=#2330 id=2330 data-nosnippet>2330</a>            retention: SnapshotRetention::Branch {
-<a href=#2331 id=2331 data-nosnippet>2331</a>                min_snapshots_to_keep: <span class="prelude-val">None</span>,
-<a href=#2332 id=2332 data-nosnippet>2332</a>                max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2333 id=2333 data-nosnippet>2333</a>                max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2334 id=2334 data-nosnippet>2334</a>            },
-<a href=#2335 id=2335 data-nosnippet>2335</a>        };
-<a href=#2336 id=2336 data-nosnippet>2336</a>
-<a href=#2337 id=2337 data-nosnippet>2337</a>        <span class="macro">assert_eq!</span>(build_result.metadata.refs.len(), <span class="number">1</span>);
-<a href=#2338 id=2338 data-nosnippet>2338</a>        <span class="macro">assert_eq!</span>(
-<a href=#2339 id=2339 data-nosnippet>2339</a>            build_result.metadata.refs.get(<span class="string">"new_branch"</span>),
-<a href=#2340 id=2340 data-nosnippet>2340</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>reference)
-<a href=#2341 id=2341 data-nosnippet>2341</a>        );
-<a href=#2342 id=2342 data-nosnippet>2342</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
-<a href=#2343 id=2343 data-nosnippet>2343</a>            TableUpdate::AddSnapshot { snapshot },
-<a href=#2344 id=2344 data-nosnippet>2344</a>            TableUpdate::SetSnapshotRef {
-<a href=#2345 id=2345 data-nosnippet>2345</a>                ref_name: <span class="string">"new_branch"</span>.to_string(),
-<a href=#2346 id=2346 data-nosnippet>2346</a>                reference
-<a href=#2347 id=2347 data-nosnippet>2347</a>            }
-<a href=#2348 id=2348 data-nosnippet>2348</a>        ]);
-<a href=#2349 id=2349 data-nosnippet>2349</a>    }
-<a href=#2350 id=2350 data-nosnippet>2350</a>
-<a href=#2351 id=2351 data-nosnippet>2351</a>    <span class="attr">#[test]
-<a href=#2352 id=2352 data-nosnippet>2352</a>    </span><span class="kw">fn </span>test_cannot_add_duplicate_snapshot_id() {
-<a href=#2353 id=2353 data-nosnippet>2353</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2354 id=2354 data-nosnippet>2354</a>
-<a href=#2355 id=2355 data-nosnippet>2355</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2356 id=2356 data-nosnippet>2356</a>            .with_snapshot_id(<span class="number">2</span>)
-<a href=#2357 id=2357 data-nosnippet>2357</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2358 id=2358 data-nosnippet>2358</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2359 id=2359 data-nosnippet>2359</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2360 id=2360 data-nosnippet>2360</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
-<a href=#2361 id=2361 data-nosnippet>2361</a>            .with_summary(Summary {
-<a href=#2362 id=2362 data-nosnippet>2362</a>                operation: Operation::Append,
-<a href=#2363 id=2363 data-nosnippet>2363</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
-<a href=#2364 id=2364 data-nosnippet>2364</a>                    (
-<a href=#2365 id=2365 data-nosnippet>2365</a>                        <span class="string">"spark.app.id"</span>.to_string(),
-<a href=#2366 id=2366 data-nosnippet>2366</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
-<a href=#2367 id=2367 data-nosnippet>2367</a>                    ),
-<a href=#2368 id=2368 data-nosnippet>2368</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2369 id=2369 data-nosnippet>2369</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
-<a href=#2370 id=2370 data-nosnippet>2370</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
-<a href=#2371 id=2371 data-nosnippet>2371</a>                ]),
-<a href=#2372 id=2372 data-nosnippet>2372</a>            })
-<a href=#2373 id=2373 data-nosnippet>2373</a>            .build();
-<a href=#2374 id=2374 data-nosnippet>2374</a>
-<a href=#2375 id=2375 data-nosnippet>2375</a>        <span class="kw">let </span>builder = builder.add_snapshot(snapshot.clone()).unwrap();
-<a href=#2376 id=2376 data-nosnippet>2376</a>        builder.add_snapshot(snapshot).unwrap_err();
-<a href=#2377 id=2377 data-nosnippet>2377</a>    }
-<a href=#2378 id=2378 data-nosnippet>2378</a>
-<a href=#2379 id=2379 data-nosnippet>2379</a>    <span class="attr">#[test]
-<a href=#2380 id=2380 data-nosnippet>2380</a>    </span><span class="kw">fn </span>test_add_incompatible_current_schema_fails() {
-<a href=#2381 id=2381 data-nosnippet>2381</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2382 id=2382 data-nosnippet>2382</a>
-<a href=#2383 id=2383 data-nosnippet>2383</a>        <span class="kw">let </span>added_schema = Schema::builder()
-<a href=#2384 id=2384 data-nosnippet>2384</a>            .with_schema_id(<span class="number">1</span>)
-<a href=#2385 id=2385 data-nosnippet>2385</a>            .with_fields(<span class="macro">vec!</span>[])
-<a href=#2386 id=2386 data-nosnippet>2386</a>            .build()
-<a href=#2387 id=2387 data-nosnippet>2387</a>            .unwrap();
-<a href=#2388 id=2388 data-nosnippet>2388</a>
-<a href=#2389 id=2389 data-nosnippet>2389</a>        <span class="kw">let </span>err = builder
-<a href=#2390 id=2390 data-nosnippet>2390</a>            .add_current_schema(added_schema)
-<a href=#2391 id=2391 data-nosnippet>2391</a>            .unwrap()
-<a href=#2392 id=2392 data-nosnippet>2392</a>            .build()
-<a href=#2393 id=2393 data-nosnippet>2393</a>            .unwrap_err();
-<a href=#2394 id=2394 data-nosnippet>2394</a>
-<a href=#2395 id=2395 data-nosnippet>2395</a>        <span class="macro">assert!</span>(
-<a href=#2396 id=2396 data-nosnippet>2396</a>            err.to_string()
-<a href=#2397 id=2397 data-nosnippet>2397</a>                .contains(<span class="string">"Cannot find partition source field"</span>)
-<a href=#2398 id=2398 data-nosnippet>2398</a>        );
-<a href=#2399 id=2399 data-nosnippet>2399</a>    }
-<a href=#2400 id=2400 data-nosnippet>2400</a>
-<a href=#2401 id=2401 data-nosnippet>2401</a>    <span class="attr">#[test]
-<a href=#2402 id=2402 data-nosnippet>2402</a>    </span><span class="kw">fn </span>test_add_partition_spec_for_v1_requires_sequential_ids() {
-<a href=#2403 id=2403 data-nosnippet>2403</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V1);
-<a href=#2404 id=2404 data-nosnippet>2404</a>
-<a href=#2405 id=2405 data-nosnippet>2405</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
-<a href=#2406 id=2406 data-nosnippet>2406</a>            .with_spec_id(<span class="number">10</span>)
-<a href=#2407 id=2407 data-nosnippet>2407</a>            .add_partition_fields(<span class="macro">vec!</span>[
-<a href=#2408 id=2408 data-nosnippet>2408</a>                UnboundPartitionField {
-<a href=#2409 id=2409 data-nosnippet>2409</a>                    name: <span class="string">"y"</span>.to_string(),
-<a href=#2410 id=2410 data-nosnippet>2410</a>                    transform: Transform::Identity,
-<a href=#2411 id=2411 data-nosnippet>2411</a>                    source_id: <span class="number">2</span>,
-<a href=#2412 id=2412 data-nosnippet>2412</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
-<a href=#2413 id=2413 data-nosnippet>2413</a>                },
-<a href=#2414 id=2414 data-nosnippet>2414</a>                UnboundPartitionField {
-<a href=#2415 id=2415 data-nosnippet>2415</a>                    name: <span class="string">"z"</span>.to_string(),
-<a href=#2416 id=2416 data-nosnippet>2416</a>                    transform: Transform::Identity,
-<a href=#2417 id=2417 data-nosnippet>2417</a>                    source_id: <span class="number">3</span>,
-<a href=#2418 id=2418 data-nosnippet>2418</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1002</span>),
-<a href=#2419 id=2419 data-nosnippet>2419</a>                },
-<a href=#2420 id=2420 data-nosnippet>2420</a>            ])
-<a href=#2421 id=2421 data-nosnippet>2421</a>            .unwrap()
-<a href=#2422 id=2422 data-nosnippet>2422</a>            .build();
-<a href=#2423 id=2423 data-nosnippet>2423</a>
-<a href=#2424 id=2424 data-nosnippet>2424</a>        <span class="kw">let </span>err = builder.add_partition_spec(added_spec).unwrap_err();
-<a href=#2425 id=2425 data-nosnippet>2425</a>        <span class="macro">assert!</span>(err.to_string().contains(
-<a href=#2426 id=2426 data-nosnippet>2426</a>            <span class="string">"Cannot add partition spec with non-sequential field ids to format version 1 table"
-<a href=#2427 id=2427 data-nosnippet>2427</a>        </span>));
-<a href=#2428 id=2428 data-nosnippet>2428</a>    }
-<a href=#2429 id=2429 data-nosnippet>2429</a>
-<a href=#2430 id=2430 data-nosnippet>2430</a>    <span class="attr">#[test]
-<a href=#2431 id=2431 data-nosnippet>2431</a>    </span><span class="kw">fn </span>test_expire_metadata_log() {
-<a href=#2432 id=2432 data-nosnippet>2432</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2433 id=2433 data-nosnippet>2433</a>        <span class="kw">let </span>metadata = builder
-<a href=#2434 id=2434 data-nosnippet>2434</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#2435 id=2435 data-nosnippet>2435</a>                TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX.to_string(),
-<a href=#2436 id=2436 data-nosnippet>2436</a>                <span class="string">"2"</span>.to_string(),
-<a href=#2437 id=2437 data-nosnippet>2437</a>            )]))
-<a href=#2438 id=2438 data-nosnippet>2438</a>            .unwrap()
-<a href=#2439 id=2439 data-nosnippet>2439</a>            .build()
-<a href=#2440 id=2440 data-nosnippet>2440</a>            .unwrap();
-<a href=#2441 id=2441 data-nosnippet>2441</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">1</span>);
-<a href=#2442 id=2442 data-nosnippet>2442</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">0</span>);
-<a href=#2443 id=2443 data-nosnippet>2443</a>
-<a href=#2444 id=2444 data-nosnippet>2444</a>        <span class="kw">let </span>metadata = metadata
-<a href=#2445 id=2445 data-nosnippet>2445</a>            .metadata
-<a href=#2446 id=2446 data-nosnippet>2446</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"path2"</span>.to_string()))
-<a href=#2447 id=2447 data-nosnippet>2447</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#2448 id=2448 data-nosnippet>2448</a>                <span class="string">"change_nr"</span>.to_string(),
-<a href=#2449 id=2449 data-nosnippet>2449</a>                <span class="string">"1"</span>.to_string(),
-<a href=#2450 id=2450 data-nosnippet>2450</a>            )]))
-<a href=#2451 id=2451 data-nosnippet>2451</a>            .unwrap()
-<a href=#2452 id=2452 data-nosnippet>2452</a>            .build()
-<a href=#2453 id=2453 data-nosnippet>2453</a>            .unwrap();
-<a href=#2454 id=2454 data-nosnippet>2454</a>
-<a href=#2455 id=2455 data-nosnippet>2455</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">2</span>);
-<a href=#2456 id=2456 data-nosnippet>2456</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">0</span>);
-<a href=#2457 id=2457 data-nosnippet>2457</a>
-<a href=#2458 id=2458 data-nosnippet>2458</a>        <span class="kw">let </span>metadata = metadata
-<a href=#2459 id=2459 data-nosnippet>2459</a>            .metadata
-<a href=#2460 id=2460 data-nosnippet>2460</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"path2"</span>.to_string()))
-<a href=#2461 id=2461 data-nosnippet>2461</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#2462 id=2462 data-nosnippet>2462</a>                <span class="string">"change_nr"</span>.to_string(),
-<a href=#2463 id=2463 data-nosnippet>2463</a>                <span class="string">"2"</span>.to_string(),
-<a href=#2464 id=2464 data-nosnippet>2464</a>            )]))
-<a href=#2465 id=2465 data-nosnippet>2465</a>            .unwrap()
-<a href=#2466 id=2466 data-nosnippet>2466</a>            .build()
-<a href=#2467 id=2467 data-nosnippet>2467</a>            .unwrap();
-<a href=#2468 id=2468 data-nosnippet>2468</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">2</span>);
-<a href=#2469 id=2469 data-nosnippet>2469</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">1</span>);
-<a href=#2470 id=2470 data-nosnippet>2470</a>    }
-<a href=#2471 id=2471 data-nosnippet>2471</a>
-<a href=#2472 id=2472 data-nosnippet>2472</a>    <span class="attr">#[test]
-<a href=#2473 id=2473 data-nosnippet>2473</a>    </span><span class="kw">fn </span>test_v2_sequence_number_cannot_decrease() {
-<a href=#2474 id=2474 data-nosnippet>2474</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2475 id=2475 data-nosnippet>2475</a>
-<a href=#2476 id=2476 data-nosnippet>2476</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2477 id=2477 data-nosnippet>2477</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#2478 id=2478 data-nosnippet>2478</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2479 id=2479 data-nosnippet>2479</a>            .with_sequence_number(<span class="number">1</span>)
-<a href=#2480 id=2480 data-nosnippet>2480</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2481 id=2481 data-nosnippet>2481</a>            .with_manifest_list(<span class="string">"/snap-1"</span>)
-<a href=#2482 id=2482 data-nosnippet>2482</a>            .with_summary(Summary {
-<a href=#2483 id=2483 data-nosnippet>2483</a>                operation: Operation::Append,
-<a href=#2484 id=2484 data-nosnippet>2484</a>                additional_properties: HashMap::new(),
-<a href=#2485 id=2485 data-nosnippet>2485</a>            })
-<a href=#2486 id=2486 data-nosnippet>2486</a>            .build();
-<a href=#2487 id=2487 data-nosnippet>2487</a>
-<a href=#2488 id=2488 data-nosnippet>2488</a>        <span class="kw">let </span>builder = builder
-<a href=#2489 id=2489 data-nosnippet>2489</a>            .add_snapshot(snapshot.clone())
-<a href=#2490 id=2490 data-nosnippet>2490</a>            .unwrap()
-<a href=#2491 id=2491 data-nosnippet>2491</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#2492 id=2492 data-nosnippet>2492</a>                snapshot_id: <span class="number">1</span>,
-<a href=#2493 id=2493 data-nosnippet>2493</a>                retention: SnapshotRetention::Branch {
-<a href=#2494 id=2494 data-nosnippet>2494</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
-<a href=#2495 id=2495 data-nosnippet>2495</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#2496 id=2496 data-nosnippet>2496</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#2497 id=2497 data-nosnippet>2497</a>                },
-<a href=#2498 id=2498 data-nosnippet>2498</a>            })
-<a href=#2499 id=2499 data-nosnippet>2499</a>            .unwrap();
-<a href=#2500 id=2500 data-nosnippet>2500</a>
-<a href=#2501 id=2501 data-nosnippet>2501</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
-<a href=#2502 id=2502 data-nosnippet>2502</a>            .with_snapshot_id(<span class="number">2</span>)
-<a href=#2503 id=2503 data-nosnippet>2503</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
-<a href=#2504 id=2504 data-nosnippet>2504</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#2505 id=2505 data-nosnippet>2505</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#2506 id=2506 data-nosnippet>2506</a>            .with_manifest_list(<span class="string">"/snap-0"</span>)
-<a href=#2507 id=2507 data-nosnippet>2507</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">1</span>))
-<a href=#2508 id=2508 data-nosnippet>2508</a>            .with_summary(Summary {
-<a href=#2509 id=2509 data-nosnippet>2509</a>                operation: Operation::Append,
-<a href=#2510 id=2510 data-nosnippet>2510</a>                additional_properties: HashMap::new(),
-<a href=#2511 id=2511 data-nosnippet>2511</a>            })
-<a href=#2512 id=2512 data-nosnippet>2512</a>            .build();
-<a href=#2513 id=2513 data-nosnippet>2513</a>
-<a href=#2514 id=2514 data-nosnippet>2514</a>        <span class="kw">let </span>err = builder
-<a href=#2515 id=2515 data-nosnippet>2515</a>            .set_branch_snapshot(snapshot, MAIN_BRANCH)
-<a href=#2516 id=2516 data-nosnippet>2516</a>            .unwrap_err();
-<a href=#2517 id=2517 data-nosnippet>2517</a>        <span class="macro">assert!</span>(
-<a href=#2518 id=2518 data-nosnippet>2518</a>            err.to_string()
-<a href=#2519 id=2519 data-nosnippet>2519</a>                .contains(<span class="string">"Cannot add snapshot with sequence number"</span>)
-<a href=#2520 id=2520 data-nosnippet>2520</a>        );
-<a href=#2521 id=2521 data-nosnippet>2521</a>    }
-<a href=#2522 id=2522 data-nosnippet>2522</a>
-<a href=#2523 id=2523 data-nosnippet>2523</a>    <span class="attr">#[test]
-<a href=#2524 id=2524 data-nosnippet>2524</a>    </span><span class="kw">fn </span>test_default_spec_cannot_be_removed() {
-<a href=#2525 id=2525 data-nosnippet>2525</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2526 id=2526 data-nosnippet>2526</a>
-<a href=#2527 id=2527 data-nosnippet>2527</a>        builder.remove_partition_specs(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap_err();
-<a href=#2528 id=2528 data-nosnippet>2528</a>    }
-<a href=#2529 id=2529 data-nosnippet>2529</a>
-<a href=#2530 id=2530 data-nosnippet>2530</a>    <span class="attr">#[test]
-<a href=#2531 id=2531 data-nosnippet>2531</a>    </span><span class="kw">fn </span>test_statistics() {
-<a href=#2532 id=2532 data-nosnippet>2532</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2533 id=2533 data-nosnippet>2533</a>
-<a href=#2534 id=2534 data-nosnippet>2534</a>        <span class="kw">let </span>statistics = StatisticsFile {
-<a href=#2535 id=2535 data-nosnippet>2535</a>            snapshot_id: <span class="number">3055729675574597004</span>,
-<a href=#2536 id=2536 data-nosnippet>2536</a>            statistics_path: <span class="string">"s3://a/b/stats.puffin"</span>.to_string(),
-<a href=#2537 id=2537 data-nosnippet>2537</a>            file_size_in_bytes: <span class="number">413</span>,
-<a href=#2538 id=2538 data-nosnippet>2538</a>            file_footer_size_in_bytes: <span class="number">42</span>,
-<a href=#2539 id=2539 data-nosnippet>2539</a>            key_metadata: <span class="prelude-val">None</span>,
-<a href=#2540 id=2540 data-nosnippet>2540</a>            blob_metadata: <span class="macro">vec!</span>[BlobMetadata {
-<a href=#2541 id=2541 data-nosnippet>2541</a>                snapshot_id: <span class="number">3055729675574597004</span>,
-<a href=#2542 id=2542 data-nosnippet>2542</a>                sequence_number: <span class="number">1</span>,
-<a href=#2543 id=2543 data-nosnippet>2543</a>                fields: <span class="macro">vec!</span>[<span class="number">1</span>],
-<a href=#2544 id=2544 data-nosnippet>2544</a>                r#type: <span class="string">"ndv"</span>.to_string(),
-<a href=#2545 id=2545 data-nosnippet>2545</a>                properties: HashMap::new(),
-<a href=#2546 id=2546 data-nosnippet>2546</a>            }],
-<a href=#2547 id=2547 data-nosnippet>2547</a>        };
-<a href=#2548 id=2548 data-nosnippet>2548</a>        <span class="kw">let </span>build_result = builder.set_statistics(statistics.clone()).build().unwrap();
-<a href=#2549 id=2549 data-nosnippet>2549</a>
-<a href=#2550 id=2550 data-nosnippet>2550</a>        <span class="macro">assert_eq!</span>(
-<a href=#2551 id=2551 data-nosnippet>2551</a>            build_result.metadata.statistics,
-<a href=#2552 id=2552 data-nosnippet>2552</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="number">3055729675574597004</span>, statistics.clone())])
-<a href=#2553 id=2553 data-nosnippet>2553</a>        );
-<a href=#2554 id=2554 data-nosnippet>2554</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[TableUpdate::SetStatistics {
-<a href=#2555 id=2555 data-nosnippet>2555</a>            statistics: statistics.clone()
-<a href=#2556 id=2556 data-nosnippet>2556</a>        }]);
-<a href=#2557 id=2557 data-nosnippet>2557</a>
-<a href=#2558 id=2558 data-nosnippet>2558</a>        <span class="comment">// Remove
-<a href=#2559 id=2559 data-nosnippet>2559</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
-<a href=#2560 id=2560 data-nosnippet>2560</a>        <span class="kw">let </span>build_result = builder
-<a href=#2561 id=2561 data-nosnippet>2561</a>            .remove_statistics(statistics.snapshot_id)
-<a href=#2562 id=2562 data-nosnippet>2562</a>            .build()
-<a href=#2563 id=2563 data-nosnippet>2563</a>            .unwrap();
-<a href=#2564 id=2564 data-nosnippet>2564</a>
-<a href=#2565 id=2565 data-nosnippet>2565</a>        <span class="macro">assert_eq!</span>(build_result.metadata.statistics.len(), <span class="number">0</span>);
-<a href=#2566 id=2566 data-nosnippet>2566</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[TableUpdate::RemoveStatistics {
-<a href=#2567 id=2567 data-nosnippet>2567</a>            snapshot_id: statistics.snapshot_id
-<a href=#2568 id=2568 data-nosnippet>2568</a>        }]);
-<a href=#2569 id=2569 data-nosnippet>2569</a>
-<a href=#2570 id=2570 data-nosnippet>2570</a>        <span class="comment">// Remove again yields no changes
-<a href=#2571 id=2571 data-nosnippet>2571</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
-<a href=#2572 id=2572 data-nosnippet>2572</a>        <span class="kw">let </span>build_result = builder
-<a href=#2573 id=2573 data-nosnippet>2573</a>            .remove_statistics(statistics.snapshot_id)
-<a href=#2574 id=2574 data-nosnippet>2574</a>            .build()
-<a href=#2575 id=2575 data-nosnippet>2575</a>            .unwrap();
-<a href=#2576 id=2576 data-nosnippet>2576</a>        <span class="macro">assert_eq!</span>(build_result.metadata.statistics.len(), <span class="number">0</span>);
-<a href=#2577 id=2577 data-nosnippet>2577</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
-<a href=#2578 id=2578 data-nosnippet>2578</a>    }
-<a href=#2579 id=2579 data-nosnippet>2579</a>
-<a href=#2580 id=2580 data-nosnippet>2580</a>    <span class="attr">#[test]
-<a href=#2581 id=2581 data-nosnippet>2581</a>    </span><span class="kw">fn </span>test_add_partition_statistics() {
-<a href=#2582 id=2582 data-nosnippet>2582</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2583 id=2583 data-nosnippet>2583</a>
-<a href=#2584 id=2584 data-nosnippet>2584</a>        <span class="kw">let </span>statistics = PartitionStatisticsFile {
-<a href=#2585 id=2585 data-nosnippet>2585</a>            snapshot_id: <span class="number">3055729675574597004</span>,
-<a href=#2586 id=2586 data-nosnippet>2586</a>            statistics_path: <span class="string">"s3://a/b/partition-stats.parquet"</span>.to_string(),
-<a href=#2587 id=2587 data-nosnippet>2587</a>            file_size_in_bytes: <span class="number">43</span>,
-<a href=#2588 id=2588 data-nosnippet>2588</a>        };
-<a href=#2589 id=2589 data-nosnippet>2589</a>
-<a href=#2590 id=2590 data-nosnippet>2590</a>        <span class="kw">let </span>build_result = builder
-<a href=#2591 id=2591 data-nosnippet>2591</a>            .set_partition_statistics(statistics.clone())
-<a href=#2592 id=2592 data-nosnippet>2592</a>            .build()
-<a href=#2593 id=2593 data-nosnippet>2593</a>            .unwrap();
-<a href=#2594 id=2594 data-nosnippet>2594</a>        <span class="macro">assert_eq!</span>(
-<a href=#2595 id=2595 data-nosnippet>2595</a>            build_result.metadata.partition_statistics,
-<a href=#2596 id=2596 data-nosnippet>2596</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="number">3055729675574597004</span>, statistics.clone())])
-<a href=#2597 id=2597 data-nosnippet>2597</a>        );
-<a href=#2598 id=2598 data-nosnippet>2598</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
-<a href=#2599 id=2599 data-nosnippet>2599</a>            TableUpdate::SetPartitionStatistics {
-<a href=#2600 id=2600 data-nosnippet>2600</a>                partition_statistics: statistics.clone()
-<a href=#2601 id=2601 data-nosnippet>2601</a>            }
-<a href=#2602 id=2602 data-nosnippet>2602</a>        ]);
-<a href=#2603 id=2603 data-nosnippet>2603</a>
-<a href=#2604 id=2604 data-nosnippet>2604</a>        <span class="comment">// Remove
-<a href=#2605 id=2605 data-nosnippet>2605</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
-<a href=#2606 id=2606 data-nosnippet>2606</a>        <span class="kw">let </span>build_result = builder
-<a href=#2607 id=2607 data-nosnippet>2607</a>            .remove_partition_statistics(statistics.snapshot_id)
-<a href=#2608 id=2608 data-nosnippet>2608</a>            .build()
-<a href=#2609 id=2609 data-nosnippet>2609</a>            .unwrap();
-<a href=#2610 id=2610 data-nosnippet>2610</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_statistics.len(), <span class="number">0</span>);
-<a href=#2611 id=2611 data-nosnippet>2611</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
-<a href=#2612 id=2612 data-nosnippet>2612</a>            TableUpdate::RemovePartitionStatistics {
-<a href=#2613 id=2613 data-nosnippet>2613</a>                snapshot_id: statistics.snapshot_id
-<a href=#2614 id=2614 data-nosnippet>2614</a>            }
-<a href=#2615 id=2615 data-nosnippet>2615</a>        ]);
-<a href=#2616 id=2616 data-nosnippet>2616</a>
-<a href=#2617 id=2617 data-nosnippet>2617</a>        <span class="comment">// Remove again yields no changes
-<a href=#2618 id=2618 data-nosnippet>2618</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
-<a href=#2619 id=2619 data-nosnippet>2619</a>        <span class="kw">let </span>build_result = builder
-<a href=#2620 id=2620 data-nosnippet>2620</a>            .remove_partition_statistics(statistics.snapshot_id)
-<a href=#2621 id=2621 data-nosnippet>2621</a>            .build()
-<a href=#2622 id=2622 data-nosnippet>2622</a>            .unwrap();
-<a href=#2623 id=2623 data-nosnippet>2623</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_statistics.len(), <span class="number">0</span>);
-<a href=#2624 id=2624 data-nosnippet>2624</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
-<a href=#2625 id=2625 data-nosnippet>2625</a>    }
-<a href=#2626 id=2626 data-nosnippet>2626</a>
-<a href=#2627 id=2627 data-nosnippet>2627</a>    <span class="attr">#[test]
-<a href=#2628 id=2628 data-nosnippet>2628</a>    </span><span class="kw">fn </span>last_update_increased_for_property_only_update() {
-<a href=#2629 id=2629 data-nosnippet>2629</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2630 id=2630 data-nosnippet>2630</a>
-<a href=#2631 id=2631 data-nosnippet>2631</a>        <span class="kw">let </span>metadata = builder.build().unwrap().metadata;
-<a href=#2632 id=2632 data-nosnippet>2632</a>        <span class="kw">let </span>last_updated_ms = metadata.last_updated_ms;
-<a href=#2633 id=2633 data-nosnippet>2633</a>        sleep(std::time::Duration::from_millis(<span class="number">2</span>));
-<a href=#2634 id=2634 data-nosnippet>2634</a>
-<a href=#2635 id=2635 data-nosnippet>2635</a>        <span class="kw">let </span>build_result = metadata
-<a href=#2636 id=2636 data-nosnippet>2636</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#2637 id=2637 data-nosnippet>2637</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#2638 id=2638 data-nosnippet>2638</a>            ))
-<a href=#2639 id=2639 data-nosnippet>2639</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#2640 id=2640 data-nosnippet>2640</a>                <span class="string">"foo"</span>.to_string(),
-<a href=#2641 id=2641 data-nosnippet>2641</a>                <span class="string">"bar"</span>.to_string(),
-<a href=#2642 id=2642 data-nosnippet>2642</a>            )]))
-<a href=#2643 id=2643 data-nosnippet>2643</a>            .unwrap()
-<a href=#2644 id=2644 data-nosnippet>2644</a>            .build()
-<a href=#2645 id=2645 data-nosnippet>2645</a>            .unwrap();
-<a href=#2646 id=2646 data-nosnippet>2646</a>
-<a href=#2647 id=2647 data-nosnippet>2647</a>        <span class="macro">assert!</span>(
-<a href=#2648 id=2648 data-nosnippet>2648</a>            build_result.metadata.last_updated_ms &gt; last_updated_ms,
-<a href=#2649 id=2649 data-nosnippet>2649</a>            <span class="string">"{} &gt; {}"</span>,
-<a href=#2650 id=2650 data-nosnippet>2650</a>            build_result.metadata.last_updated_ms,
-<a href=#2651 id=2651 data-nosnippet>2651</a>            last_updated_ms
-<a href=#2652 id=2652 data-nosnippet>2652</a>        );
-<a href=#2653 id=2653 data-nosnippet>2653</a>    }
-<a href=#2654 id=2654 data-nosnippet>2654</a>
-<a href=#2655 id=2655 data-nosnippet>2655</a>    <span class="attr">#[test]
-<a href=#2656 id=2656 data-nosnippet>2656</a>    </span><span class="kw">fn </span>test_construct_default_main_branch() {
-<a href=#2657 id=2657 data-nosnippet>2657</a>        <span class="comment">// Load the table without ref
-<a href=#2658 id=2658 data-nosnippet>2658</a>        </span><span class="kw">let </span>file = File::open(<span class="macro">format!</span>(
-<a href=#2659 id=2659 data-nosnippet>2659</a>            <span class="string">"{}/testdata/table_metadata/{}"</span>,
-<a href=#2660 id=2660 data-nosnippet>2660</a>            <span class="macro">env!</span>(<span class="string">"CARGO_MANIFEST_DIR"</span>),
-<a href=#2661 id=2661 data-nosnippet>2661</a>            <span class="string">"TableMetadataV2Valid.json"
-<a href=#2662 id=2662 data-nosnippet>2662</a>        </span>))
-<a href=#2663 id=2663 data-nosnippet>2663</a>        .unwrap();
-<a href=#2664 id=2664 data-nosnippet>2664</a>        <span class="kw">let </span>reader = BufReader::new(file);
-<a href=#2665 id=2665 data-nosnippet>2665</a>        <span class="kw">let </span>resp = serde_json::from_reader::&lt;<span class="kw">_</span>, TableMetadata&gt;(reader).unwrap();
-<a href=#2666 id=2666 data-nosnippet>2666</a>
-<a href=#2667 id=2667 data-nosnippet>2667</a>        <span class="kw">let </span>table = Table::builder()
-<a href=#2668 id=2668 data-nosnippet>2668</a>            .metadata(resp)
-<a href=#2669 id=2669 data-nosnippet>2669</a>            .metadata_location(<span class="string">"s3://bucket/test/location/metadata/v1.json"</span>.to_string())
-<a href=#2670 id=2670 data-nosnippet>2670</a>            .identifier(TableIdent::from_strs([<span class="string">"ns1"</span>, <span class="string">"test1"</span>]).unwrap())
-<a href=#2671 id=2671 data-nosnippet>2671</a>            .file_io(FileIOBuilder::new(<span class="string">"memory"</span>).build().unwrap())
-<a href=#2672 id=2672 data-nosnippet>2672</a>            .build()
-<a href=#2673 id=2673 data-nosnippet>2673</a>            .unwrap();
-<a href=#2674 id=2674 data-nosnippet>2674</a>
-<a href=#2675 id=2675 data-nosnippet>2675</a>        <span class="macro">assert_eq!</span>(
-<a href=#2676 id=2676 data-nosnippet>2676</a>            table.metadata().refs.get(MAIN_BRANCH).unwrap().snapshot_id,
-<a href=#2677 id=2677 data-nosnippet>2677</a>            table.metadata().current_snapshot_id().unwrap()
-<a href=#2678 id=2678 data-nosnippet>2678</a>        );
-<a href=#2679 id=2679 data-nosnippet>2679</a>    }
-<a href=#2680 id=2680 data-nosnippet>2680</a>
-<a href=#2681 id=2681 data-nosnippet>2681</a>    <span class="attr">#[test]
-<a href=#2682 id=2682 data-nosnippet>2682</a>    </span><span class="kw">fn </span>test_active_schema_cannot_be_removed() {
-<a href=#2683 id=2683 data-nosnippet>2683</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#2684 id=2684 data-nosnippet>2684</a>        builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap_err();
-<a href=#2685 id=2685 data-nosnippet>2685</a>    }
-<a href=#2686 id=2686 data-nosnippet>2686</a>
-<a href=#2687 id=2687 data-nosnippet>2687</a>    <span class="attr">#[test]
-<a href=#2688 id=2688 data-nosnippet>2688</a>    </span><span class="kw">fn </span>test_remove_schemas() {
-<a href=#2689 id=2689 data-nosnippet>2689</a>        <span class="kw">let </span>file = File::open(<span class="macro">format!</span>(
-<a href=#2690 id=2690 data-nosnippet>2690</a>            <span class="string">"{}/testdata/table_metadata/{}"</span>,
-<a href=#2691 id=2691 data-nosnippet>2691</a>            <span class="macro">env!</span>(<span class="string">"CARGO_MANIFEST_DIR"</span>),
-<a href=#2692 id=2692 data-nosnippet>2692</a>            <span class="string">"TableMetadataV2Valid.json"
-<a href=#2693 id=2693 data-nosnippet>2693</a>        </span>))
-<a href=#2694 id=2694 data-nosnippet>2694</a>        .unwrap();
-<a href=#2695 id=2695 data-nosnippet>2695</a>        <span class="kw">let </span>reader = BufReader::new(file);
-<a href=#2696 id=2696 data-nosnippet>2696</a>        <span class="kw">let </span>resp = serde_json::from_reader::&lt;<span class="kw">_</span>, TableMetadata&gt;(reader).unwrap();
-<a href=#2697 id=2697 data-nosnippet>2697</a>
-<a href=#2698 id=2698 data-nosnippet>2698</a>        <span class="kw">let </span>table = Table::builder()
-<a href=#2699 id=2699 data-nosnippet>2699</a>            .metadata(resp)
-<a href=#2700 id=2700 data-nosnippet>2700</a>            .metadata_location(<span class="string">"s3://bucket/test/location/metadata/v1.json"</span>.to_string())
-<a href=#2701 id=2701 data-nosnippet>2701</a>            .identifier(TableIdent::from_strs([<span class="string">"ns1"</span>, <span class="string">"test1"</span>]).unwrap())
-<a href=#2702 id=2702 data-nosnippet>2702</a>            .file_io(FileIOBuilder::new(<span class="string">"memory"</span>).build().unwrap())
-<a href=#2703 id=2703 data-nosnippet>2703</a>            .build()
-<a href=#2704 id=2704 data-nosnippet>2704</a>            .unwrap();
-<a href=#2705 id=2705 data-nosnippet>2705</a>
-<a href=#2706 id=2706 data-nosnippet>2706</a>        <span class="macro">assert_eq!</span>(<span class="number">2</span>, table.metadata().schemas.len());
+<a href=#2229 id=2229 data-nosnippet>2229</a>            .set_branch_snapshot(snapshot_2.clone(), MAIN_BRANCH)
+<a href=#2230 id=2230 data-nosnippet>2230</a>            .unwrap()
+<a href=#2231 id=2231 data-nosnippet>2231</a>            .build()
+<a href=#2232 id=2232 data-nosnippet>2232</a>            .unwrap();
+<a href=#2233 id=2233 data-nosnippet>2233</a>
+<a href=#2234 id=2234 data-nosnippet>2234</a>        <span class="macro">assert_eq!</span>(result.metadata.snapshot_log, <span class="macro">vec!</span>[SnapshotLog {
+<a href=#2235 id=2235 data-nosnippet>2235</a>            snapshot_id: <span class="number">2</span>,
+<a href=#2236 id=2236 data-nosnippet>2236</a>            timestamp_ms: snapshot_2.timestamp_ms()
+<a href=#2237 id=2237 data-nosnippet>2237</a>        }]);
+<a href=#2238 id=2238 data-nosnippet>2238</a>        <span class="macro">assert_eq!</span>(result.metadata.current_snapshot().unwrap().snapshot_id(), <span class="number">2</span>);
+<a href=#2239 id=2239 data-nosnippet>2239</a>    }
+<a href=#2240 id=2240 data-nosnippet>2240</a>
+<a href=#2241 id=2241 data-nosnippet>2241</a>    <span class="attr">#[test]
+<a href=#2242 id=2242 data-nosnippet>2242</a>    </span><span class="kw">fn </span>test_remove_main_ref_keeps_snapshot_log() {
+<a href=#2243 id=2243 data-nosnippet>2243</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2244 id=2244 data-nosnippet>2244</a>
+<a href=#2245 id=2245 data-nosnippet>2245</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2246 id=2246 data-nosnippet>2246</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#2247 id=2247 data-nosnippet>2247</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2248 id=2248 data-nosnippet>2248</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2249 id=2249 data-nosnippet>2249</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2250 id=2250 data-nosnippet>2250</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2251 id=2251 data-nosnippet>2251</a>            .with_summary(Summary {
+<a href=#2252 id=2252 data-nosnippet>2252</a>                operation: Operation::Append,
+<a href=#2253 id=2253 data-nosnippet>2253</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
+<a href=#2254 id=2254 data-nosnippet>2254</a>                    (
+<a href=#2255 id=2255 data-nosnippet>2255</a>                        <span class="string">"spark.app.id"</span>.to_string(),
+<a href=#2256 id=2256 data-nosnippet>2256</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
+<a href=#2257 id=2257 data-nosnippet>2257</a>                    ),
+<a href=#2258 id=2258 data-nosnippet>2258</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2259 id=2259 data-nosnippet>2259</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2260 id=2260 data-nosnippet>2260</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
+<a href=#2261 id=2261 data-nosnippet>2261</a>                ]),
+<a href=#2262 id=2262 data-nosnippet>2262</a>            })
+<a href=#2263 id=2263 data-nosnippet>2263</a>            .build();
+<a href=#2264 id=2264 data-nosnippet>2264</a>
+<a href=#2265 id=2265 data-nosnippet>2265</a>        <span class="kw">let </span>result = builder
+<a href=#2266 id=2266 data-nosnippet>2266</a>            .add_snapshot(snapshot.clone())
+<a href=#2267 id=2267 data-nosnippet>2267</a>            .unwrap()
+<a href=#2268 id=2268 data-nosnippet>2268</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#2269 id=2269 data-nosnippet>2269</a>                snapshot_id: <span class="number">1</span>,
+<a href=#2270 id=2270 data-nosnippet>2270</a>                retention: SnapshotRetention::Branch {
+<a href=#2271 id=2271 data-nosnippet>2271</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
+<a href=#2272 id=2272 data-nosnippet>2272</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2273 id=2273 data-nosnippet>2273</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2274 id=2274 data-nosnippet>2274</a>                },
+<a href=#2275 id=2275 data-nosnippet>2275</a>            })
+<a href=#2276 id=2276 data-nosnippet>2276</a>            .unwrap()
+<a href=#2277 id=2277 data-nosnippet>2277</a>            .build()
+<a href=#2278 id=2278 data-nosnippet>2278</a>            .unwrap();
+<a href=#2279 id=2279 data-nosnippet>2279</a>
+<a href=#2280 id=2280 data-nosnippet>2280</a>        <span class="comment">// Verify snapshot log was created
+<a href=#2281 id=2281 data-nosnippet>2281</a>        </span><span class="macro">assert_eq!</span>(result.metadata.snapshot_log.len(), <span class="number">1</span>);
+<a href=#2282 id=2282 data-nosnippet>2282</a>        <span class="macro">assert_eq!</span>(result.metadata.snapshot_log[<span class="number">0</span>].snapshot_id, <span class="number">1</span>);
+<a href=#2283 id=2283 data-nosnippet>2283</a>        <span class="macro">assert_eq!</span>(result.metadata.current_snapshot_id, <span class="prelude-val">Some</span>(<span class="number">1</span>));
+<a href=#2284 id=2284 data-nosnippet>2284</a>
+<a href=#2285 id=2285 data-nosnippet>2285</a>        <span class="comment">// Remove the main ref
+<a href=#2286 id=2286 data-nosnippet>2286</a>        </span><span class="kw">let </span>result_after_remove = result
+<a href=#2287 id=2287 data-nosnippet>2287</a>            .metadata
+<a href=#2288 id=2288 data-nosnippet>2288</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#2289 id=2289 data-nosnippet>2289</a>                <span class="string">"s3://bucket/test/location/metadata/metadata2.json"</span>.to_string(),
+<a href=#2290 id=2290 data-nosnippet>2290</a>            ))
+<a href=#2291 id=2291 data-nosnippet>2291</a>            .remove_ref(MAIN_BRANCH)
+<a href=#2292 id=2292 data-nosnippet>2292</a>            .build()
+<a href=#2293 id=2293 data-nosnippet>2293</a>            .unwrap();
+<a href=#2294 id=2294 data-nosnippet>2294</a>
+<a href=#2295 id=2295 data-nosnippet>2295</a>        <span class="comment">// Verify snapshot log is kept even after removing main ref
+<a href=#2296 id=2296 data-nosnippet>2296</a>        </span><span class="macro">assert_eq!</span>(result_after_remove.metadata.snapshot_log.len(), <span class="number">1</span>);
+<a href=#2297 id=2297 data-nosnippet>2297</a>        <span class="macro">assert_eq!</span>(result_after_remove.metadata.snapshot_log[<span class="number">0</span>].snapshot_id, <span class="number">1</span>);
+<a href=#2298 id=2298 data-nosnippet>2298</a>        <span class="macro">assert_eq!</span>(result_after_remove.metadata.current_snapshot_id, <span class="prelude-val">None</span>);
+<a href=#2299 id=2299 data-nosnippet>2299</a>        <span class="macro">assert_eq!</span>(result_after_remove.changes.len(), <span class="number">1</span>);
+<a href=#2300 id=2300 data-nosnippet>2300</a>        <span class="macro">assert_eq!</span>(
+<a href=#2301 id=2301 data-nosnippet>2301</a>            result_after_remove.changes[<span class="number">0</span>],
+<a href=#2302 id=2302 data-nosnippet>2302</a>            TableUpdate::RemoveSnapshotRef {
+<a href=#2303 id=2303 data-nosnippet>2303</a>                ref_name: MAIN_BRANCH.to_string()
+<a href=#2304 id=2304 data-nosnippet>2304</a>            }
+<a href=#2305 id=2305 data-nosnippet>2305</a>        );
+<a href=#2306 id=2306 data-nosnippet>2306</a>    }
+<a href=#2307 id=2307 data-nosnippet>2307</a>
+<a href=#2308 id=2308 data-nosnippet>2308</a>    <span class="attr">#[test]
+<a href=#2309 id=2309 data-nosnippet>2309</a>    </span><span class="kw">fn </span>test_set_branch_snapshot_creates_branch_if_not_exists() {
+<a href=#2310 id=2310 data-nosnippet>2310</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2311 id=2311 data-nosnippet>2311</a>
+<a href=#2312 id=2312 data-nosnippet>2312</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2313 id=2313 data-nosnippet>2313</a>            .with_snapshot_id(<span class="number">2</span>)
+<a href=#2314 id=2314 data-nosnippet>2314</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2315 id=2315 data-nosnippet>2315</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2316 id=2316 data-nosnippet>2316</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2317 id=2317 data-nosnippet>2317</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2318 id=2318 data-nosnippet>2318</a>            .with_summary(Summary {
+<a href=#2319 id=2319 data-nosnippet>2319</a>                operation: Operation::Append,
+<a href=#2320 id=2320 data-nosnippet>2320</a>                additional_properties: HashMap::new(),
+<a href=#2321 id=2321 data-nosnippet>2321</a>            })
+<a href=#2322 id=2322 data-nosnippet>2322</a>            .build();
+<a href=#2323 id=2323 data-nosnippet>2323</a>
+<a href=#2324 id=2324 data-nosnippet>2324</a>        <span class="kw">let </span>build_result = builder
+<a href=#2325 id=2325 data-nosnippet>2325</a>            .set_branch_snapshot(snapshot.clone(), <span class="string">"new_branch"</span>)
+<a href=#2326 id=2326 data-nosnippet>2326</a>            .unwrap()
+<a href=#2327 id=2327 data-nosnippet>2327</a>            .build()
+<a href=#2328 id=2328 data-nosnippet>2328</a>            .unwrap();
+<a href=#2329 id=2329 data-nosnippet>2329</a>
+<a href=#2330 id=2330 data-nosnippet>2330</a>        <span class="kw">let </span>reference = SnapshotReference {
+<a href=#2331 id=2331 data-nosnippet>2331</a>            snapshot_id: <span class="number">2</span>,
+<a href=#2332 id=2332 data-nosnippet>2332</a>            retention: SnapshotRetention::Branch {
+<a href=#2333 id=2333 data-nosnippet>2333</a>                min_snapshots_to_keep: <span class="prelude-val">None</span>,
+<a href=#2334 id=2334 data-nosnippet>2334</a>                max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2335 id=2335 data-nosnippet>2335</a>                max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2336 id=2336 data-nosnippet>2336</a>            },
+<a href=#2337 id=2337 data-nosnippet>2337</a>        };
+<a href=#2338 id=2338 data-nosnippet>2338</a>
+<a href=#2339 id=2339 data-nosnippet>2339</a>        <span class="macro">assert_eq!</span>(build_result.metadata.refs.len(), <span class="number">1</span>);
+<a href=#2340 id=2340 data-nosnippet>2340</a>        <span class="macro">assert_eq!</span>(
+<a href=#2341 id=2341 data-nosnippet>2341</a>            build_result.metadata.refs.get(<span class="string">"new_branch"</span>),
+<a href=#2342 id=2342 data-nosnippet>2342</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>reference)
+<a href=#2343 id=2343 data-nosnippet>2343</a>        );
+<a href=#2344 id=2344 data-nosnippet>2344</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
+<a href=#2345 id=2345 data-nosnippet>2345</a>            TableUpdate::AddSnapshot { snapshot },
+<a href=#2346 id=2346 data-nosnippet>2346</a>            TableUpdate::SetSnapshotRef {
+<a href=#2347 id=2347 data-nosnippet>2347</a>                ref_name: <span class="string">"new_branch"</span>.to_string(),
+<a href=#2348 id=2348 data-nosnippet>2348</a>                reference
+<a href=#2349 id=2349 data-nosnippet>2349</a>            }
+<a href=#2350 id=2350 data-nosnippet>2350</a>        ]);
+<a href=#2351 id=2351 data-nosnippet>2351</a>    }
+<a href=#2352 id=2352 data-nosnippet>2352</a>
+<a href=#2353 id=2353 data-nosnippet>2353</a>    <span class="attr">#[test]
+<a href=#2354 id=2354 data-nosnippet>2354</a>    </span><span class="kw">fn </span>test_cannot_add_duplicate_snapshot_id() {
+<a href=#2355 id=2355 data-nosnippet>2355</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2356 id=2356 data-nosnippet>2356</a>
+<a href=#2357 id=2357 data-nosnippet>2357</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2358 id=2358 data-nosnippet>2358</a>            .with_snapshot_id(<span class="number">2</span>)
+<a href=#2359 id=2359 data-nosnippet>2359</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2360 id=2360 data-nosnippet>2360</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2361 id=2361 data-nosnippet>2361</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2362 id=2362 data-nosnippet>2362</a>            .with_manifest_list(<span class="string">"/snap-1.avro"</span>)
+<a href=#2363 id=2363 data-nosnippet>2363</a>            .with_summary(Summary {
+<a href=#2364 id=2364 data-nosnippet>2364</a>                operation: Operation::Append,
+<a href=#2365 id=2365 data-nosnippet>2365</a>                additional_properties: HashMap::from_iter(<span class="macro">vec!</span>[
+<a href=#2366 id=2366 data-nosnippet>2366</a>                    (
+<a href=#2367 id=2367 data-nosnippet>2367</a>                        <span class="string">"spark.app.id"</span>.to_string(),
+<a href=#2368 id=2368 data-nosnippet>2368</a>                        <span class="string">"local-1662532784305"</span>.to_string(),
+<a href=#2369 id=2369 data-nosnippet>2369</a>                    ),
+<a href=#2370 id=2370 data-nosnippet>2370</a>                    (<span class="string">"added-data-files"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2371 id=2371 data-nosnippet>2371</a>                    (<span class="string">"added-records"</span>.to_string(), <span class="string">"4"</span>.to_string()),
+<a href=#2372 id=2372 data-nosnippet>2372</a>                    (<span class="string">"added-files-size"</span>.to_string(), <span class="string">"6001"</span>.to_string()),
+<a href=#2373 id=2373 data-nosnippet>2373</a>                ]),
+<a href=#2374 id=2374 data-nosnippet>2374</a>            })
+<a href=#2375 id=2375 data-nosnippet>2375</a>            .build();
+<a href=#2376 id=2376 data-nosnippet>2376</a>
+<a href=#2377 id=2377 data-nosnippet>2377</a>        <span class="kw">let </span>builder = builder.add_snapshot(snapshot.clone()).unwrap();
+<a href=#2378 id=2378 data-nosnippet>2378</a>        builder.add_snapshot(snapshot).unwrap_err();
+<a href=#2379 id=2379 data-nosnippet>2379</a>    }
+<a href=#2380 id=2380 data-nosnippet>2380</a>
+<a href=#2381 id=2381 data-nosnippet>2381</a>    <span class="attr">#[test]
+<a href=#2382 id=2382 data-nosnippet>2382</a>    </span><span class="kw">fn </span>test_add_incompatible_current_schema_fails() {
+<a href=#2383 id=2383 data-nosnippet>2383</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2384 id=2384 data-nosnippet>2384</a>
+<a href=#2385 id=2385 data-nosnippet>2385</a>        <span class="kw">let </span>added_schema = Schema::builder()
+<a href=#2386 id=2386 data-nosnippet>2386</a>            .with_schema_id(<span class="number">1</span>)
+<a href=#2387 id=2387 data-nosnippet>2387</a>            .with_fields(<span class="macro">vec!</span>[])
+<a href=#2388 id=2388 data-nosnippet>2388</a>            .build()
+<a href=#2389 id=2389 data-nosnippet>2389</a>            .unwrap();
+<a href=#2390 id=2390 data-nosnippet>2390</a>
+<a href=#2391 id=2391 data-nosnippet>2391</a>        <span class="kw">let </span>err = builder
+<a href=#2392 id=2392 data-nosnippet>2392</a>            .add_current_schema(added_schema)
+<a href=#2393 id=2393 data-nosnippet>2393</a>            .unwrap()
+<a href=#2394 id=2394 data-nosnippet>2394</a>            .build()
+<a href=#2395 id=2395 data-nosnippet>2395</a>            .unwrap_err();
+<a href=#2396 id=2396 data-nosnippet>2396</a>
+<a href=#2397 id=2397 data-nosnippet>2397</a>        <span class="macro">assert!</span>(
+<a href=#2398 id=2398 data-nosnippet>2398</a>            err.to_string()
+<a href=#2399 id=2399 data-nosnippet>2399</a>                .contains(<span class="string">"Cannot find partition source field"</span>)
+<a href=#2400 id=2400 data-nosnippet>2400</a>        );
+<a href=#2401 id=2401 data-nosnippet>2401</a>    }
+<a href=#2402 id=2402 data-nosnippet>2402</a>
+<a href=#2403 id=2403 data-nosnippet>2403</a>    <span class="attr">#[test]
+<a href=#2404 id=2404 data-nosnippet>2404</a>    </span><span class="kw">fn </span>test_add_partition_spec_for_v1_requires_sequential_ids() {
+<a href=#2405 id=2405 data-nosnippet>2405</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V1);
+<a href=#2406 id=2406 data-nosnippet>2406</a>
+<a href=#2407 id=2407 data-nosnippet>2407</a>        <span class="kw">let </span>added_spec = UnboundPartitionSpec::builder()
+<a href=#2408 id=2408 data-nosnippet>2408</a>            .with_spec_id(<span class="number">10</span>)
+<a href=#2409 id=2409 data-nosnippet>2409</a>            .add_partition_fields(<span class="macro">vec!</span>[
+<a href=#2410 id=2410 data-nosnippet>2410</a>                UnboundPartitionField {
+<a href=#2411 id=2411 data-nosnippet>2411</a>                    name: <span class="string">"y"</span>.to_string(),
+<a href=#2412 id=2412 data-nosnippet>2412</a>                    transform: Transform::Identity,
+<a href=#2413 id=2413 data-nosnippet>2413</a>                    source_id: <span class="number">2</span>,
+<a href=#2414 id=2414 data-nosnippet>2414</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1000</span>),
+<a href=#2415 id=2415 data-nosnippet>2415</a>                },
+<a href=#2416 id=2416 data-nosnippet>2416</a>                UnboundPartitionField {
+<a href=#2417 id=2417 data-nosnippet>2417</a>                    name: <span class="string">"z"</span>.to_string(),
+<a href=#2418 id=2418 data-nosnippet>2418</a>                    transform: Transform::Identity,
+<a href=#2419 id=2419 data-nosnippet>2419</a>                    source_id: <span class="number">3</span>,
+<a href=#2420 id=2420 data-nosnippet>2420</a>                    field_id: <span class="prelude-val">Some</span>(<span class="number">1002</span>),
+<a href=#2421 id=2421 data-nosnippet>2421</a>                },
+<a href=#2422 id=2422 data-nosnippet>2422</a>            ])
+<a href=#2423 id=2423 data-nosnippet>2423</a>            .unwrap()
+<a href=#2424 id=2424 data-nosnippet>2424</a>            .build();
+<a href=#2425 id=2425 data-nosnippet>2425</a>
+<a href=#2426 id=2426 data-nosnippet>2426</a>        <span class="kw">let </span>err = builder.add_partition_spec(added_spec).unwrap_err();
+<a href=#2427 id=2427 data-nosnippet>2427</a>        <span class="macro">assert!</span>(err.to_string().contains(
+<a href=#2428 id=2428 data-nosnippet>2428</a>            <span class="string">"Cannot add partition spec with non-sequential field ids to format version 1 table"
+<a href=#2429 id=2429 data-nosnippet>2429</a>        </span>));
+<a href=#2430 id=2430 data-nosnippet>2430</a>    }
+<a href=#2431 id=2431 data-nosnippet>2431</a>
+<a href=#2432 id=2432 data-nosnippet>2432</a>    <span class="attr">#[test]
+<a href=#2433 id=2433 data-nosnippet>2433</a>    </span><span class="kw">fn </span>test_expire_metadata_log() {
+<a href=#2434 id=2434 data-nosnippet>2434</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2435 id=2435 data-nosnippet>2435</a>        <span class="kw">let </span>metadata = builder
+<a href=#2436 id=2436 data-nosnippet>2436</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#2437 id=2437 data-nosnippet>2437</a>                TableProperties::PROPERTY_METADATA_PREVIOUS_VERSIONS_MAX.to_string(),
+<a href=#2438 id=2438 data-nosnippet>2438</a>                <span class="string">"2"</span>.to_string(),
+<a href=#2439 id=2439 data-nosnippet>2439</a>            )]))
+<a href=#2440 id=2440 data-nosnippet>2440</a>            .unwrap()
+<a href=#2441 id=2441 data-nosnippet>2441</a>            .build()
+<a href=#2442 id=2442 data-nosnippet>2442</a>            .unwrap();
+<a href=#2443 id=2443 data-nosnippet>2443</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">1</span>);
+<a href=#2444 id=2444 data-nosnippet>2444</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">0</span>);
+<a href=#2445 id=2445 data-nosnippet>2445</a>
+<a href=#2446 id=2446 data-nosnippet>2446</a>        <span class="kw">let </span>metadata = metadata
+<a href=#2447 id=2447 data-nosnippet>2447</a>            .metadata
+<a href=#2448 id=2448 data-nosnippet>2448</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"path2"</span>.to_string()))
+<a href=#2449 id=2449 data-nosnippet>2449</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#2450 id=2450 data-nosnippet>2450</a>                <span class="string">"change_nr"</span>.to_string(),
+<a href=#2451 id=2451 data-nosnippet>2451</a>                <span class="string">"1"</span>.to_string(),
+<a href=#2452 id=2452 data-nosnippet>2452</a>            )]))
+<a href=#2453 id=2453 data-nosnippet>2453</a>            .unwrap()
+<a href=#2454 id=2454 data-nosnippet>2454</a>            .build()
+<a href=#2455 id=2455 data-nosnippet>2455</a>            .unwrap();
+<a href=#2456 id=2456 data-nosnippet>2456</a>
+<a href=#2457 id=2457 data-nosnippet>2457</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">2</span>);
+<a href=#2458 id=2458 data-nosnippet>2458</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">0</span>);
+<a href=#2459 id=2459 data-nosnippet>2459</a>
+<a href=#2460 id=2460 data-nosnippet>2460</a>        <span class="kw">let </span>metadata = metadata
+<a href=#2461 id=2461 data-nosnippet>2461</a>            .metadata
+<a href=#2462 id=2462 data-nosnippet>2462</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"path2"</span>.to_string()))
+<a href=#2463 id=2463 data-nosnippet>2463</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#2464 id=2464 data-nosnippet>2464</a>                <span class="string">"change_nr"</span>.to_string(),
+<a href=#2465 id=2465 data-nosnippet>2465</a>                <span class="string">"2"</span>.to_string(),
+<a href=#2466 id=2466 data-nosnippet>2466</a>            )]))
+<a href=#2467 id=2467 data-nosnippet>2467</a>            .unwrap()
+<a href=#2468 id=2468 data-nosnippet>2468</a>            .build()
+<a href=#2469 id=2469 data-nosnippet>2469</a>            .unwrap();
+<a href=#2470 id=2470 data-nosnippet>2470</a>        <span class="macro">assert_eq!</span>(metadata.metadata.metadata_log.len(), <span class="number">2</span>);
+<a href=#2471 id=2471 data-nosnippet>2471</a>        <span class="macro">assert_eq!</span>(metadata.expired_metadata_logs.len(), <span class="number">1</span>);
+<a href=#2472 id=2472 data-nosnippet>2472</a>    }
+<a href=#2473 id=2473 data-nosnippet>2473</a>
+<a href=#2474 id=2474 data-nosnippet>2474</a>    <span class="attr">#[test]
+<a href=#2475 id=2475 data-nosnippet>2475</a>    </span><span class="kw">fn </span>test_v2_sequence_number_cannot_decrease() {
+<a href=#2476 id=2476 data-nosnippet>2476</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2477 id=2477 data-nosnippet>2477</a>
+<a href=#2478 id=2478 data-nosnippet>2478</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2479 id=2479 data-nosnippet>2479</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#2480 id=2480 data-nosnippet>2480</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2481 id=2481 data-nosnippet>2481</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#2482 id=2482 data-nosnippet>2482</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2483 id=2483 data-nosnippet>2483</a>            .with_manifest_list(<span class="string">"/snap-1"</span>)
+<a href=#2484 id=2484 data-nosnippet>2484</a>            .with_summary(Summary {
+<a href=#2485 id=2485 data-nosnippet>2485</a>                operation: Operation::Append,
+<a href=#2486 id=2486 data-nosnippet>2486</a>                additional_properties: HashMap::new(),
+<a href=#2487 id=2487 data-nosnippet>2487</a>            })
+<a href=#2488 id=2488 data-nosnippet>2488</a>            .build();
+<a href=#2489 id=2489 data-nosnippet>2489</a>
+<a href=#2490 id=2490 data-nosnippet>2490</a>        <span class="kw">let </span>builder = builder
+<a href=#2491 id=2491 data-nosnippet>2491</a>            .add_snapshot(snapshot.clone())
+<a href=#2492 id=2492 data-nosnippet>2492</a>            .unwrap()
+<a href=#2493 id=2493 data-nosnippet>2493</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#2494 id=2494 data-nosnippet>2494</a>                snapshot_id: <span class="number">1</span>,
+<a href=#2495 id=2495 data-nosnippet>2495</a>                retention: SnapshotRetention::Branch {
+<a href=#2496 id=2496 data-nosnippet>2496</a>                    min_snapshots_to_keep: <span class="prelude-val">Some</span>(<span class="number">10</span>),
+<a href=#2497 id=2497 data-nosnippet>2497</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#2498 id=2498 data-nosnippet>2498</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#2499 id=2499 data-nosnippet>2499</a>                },
+<a href=#2500 id=2500 data-nosnippet>2500</a>            })
+<a href=#2501 id=2501 data-nosnippet>2501</a>            .unwrap();
+<a href=#2502 id=2502 data-nosnippet>2502</a>
+<a href=#2503 id=2503 data-nosnippet>2503</a>        <span class="kw">let </span>snapshot = Snapshot::builder()
+<a href=#2504 id=2504 data-nosnippet>2504</a>            .with_snapshot_id(<span class="number">2</span>)
+<a href=#2505 id=2505 data-nosnippet>2505</a>            .with_timestamp_ms(builder.metadata.last_updated_ms + <span class="number">1</span>)
+<a href=#2506 id=2506 data-nosnippet>2506</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#2507 id=2507 data-nosnippet>2507</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#2508 id=2508 data-nosnippet>2508</a>            .with_manifest_list(<span class="string">"/snap-0"</span>)
+<a href=#2509 id=2509 data-nosnippet>2509</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">1</span>))
+<a href=#2510 id=2510 data-nosnippet>2510</a>            .with_summary(Summary {
+<a href=#2511 id=2511 data-nosnippet>2511</a>                operation: Operation::Append,
+<a href=#2512 id=2512 data-nosnippet>2512</a>                additional_properties: HashMap::new(),
+<a href=#2513 id=2513 data-nosnippet>2513</a>            })
+<a href=#2514 id=2514 data-nosnippet>2514</a>            .build();
+<a href=#2515 id=2515 data-nosnippet>2515</a>
+<a href=#2516 id=2516 data-nosnippet>2516</a>        <span class="kw">let </span>err = builder
+<a href=#2517 id=2517 data-nosnippet>2517</a>            .set_branch_snapshot(snapshot, MAIN_BRANCH)
+<a href=#2518 id=2518 data-nosnippet>2518</a>            .unwrap_err();
+<a href=#2519 id=2519 data-nosnippet>2519</a>        <span class="macro">assert!</span>(
+<a href=#2520 id=2520 data-nosnippet>2520</a>            err.to_string()
+<a href=#2521 id=2521 data-nosnippet>2521</a>                .contains(<span class="string">"Cannot add snapshot with sequence number"</span>)
+<a href=#2522 id=2522 data-nosnippet>2522</a>        );
+<a href=#2523 id=2523 data-nosnippet>2523</a>    }
+<a href=#2524 id=2524 data-nosnippet>2524</a>
+<a href=#2525 id=2525 data-nosnippet>2525</a>    <span class="attr">#[test]
+<a href=#2526 id=2526 data-nosnippet>2526</a>    </span><span class="kw">fn </span>test_default_spec_cannot_be_removed() {
+<a href=#2527 id=2527 data-nosnippet>2527</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2528 id=2528 data-nosnippet>2528</a>
+<a href=#2529 id=2529 data-nosnippet>2529</a>        builder.remove_partition_specs(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap_err();
+<a href=#2530 id=2530 data-nosnippet>2530</a>    }
+<a href=#2531 id=2531 data-nosnippet>2531</a>
+<a href=#2532 id=2532 data-nosnippet>2532</a>    <span class="attr">#[test]
+<a href=#2533 id=2533 data-nosnippet>2533</a>    </span><span class="kw">fn </span>test_statistics() {
+<a href=#2534 id=2534 data-nosnippet>2534</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2535 id=2535 data-nosnippet>2535</a>
+<a href=#2536 id=2536 data-nosnippet>2536</a>        <span class="kw">let </span>statistics = StatisticsFile {
+<a href=#2537 id=2537 data-nosnippet>2537</a>            snapshot_id: <span class="number">3055729675574597004</span>,
+<a href=#2538 id=2538 data-nosnippet>2538</a>            statistics_path: <span class="string">"s3://a/b/stats.puffin"</span>.to_string(),
+<a href=#2539 id=2539 data-nosnippet>2539</a>            file_size_in_bytes: <span class="number">413</span>,
+<a href=#2540 id=2540 data-nosnippet>2540</a>            file_footer_size_in_bytes: <span class="number">42</span>,
+<a href=#2541 id=2541 data-nosnippet>2541</a>            key_metadata: <span class="prelude-val">None</span>,
+<a href=#2542 id=2542 data-nosnippet>2542</a>            blob_metadata: <span class="macro">vec!</span>[BlobMetadata {
+<a href=#2543 id=2543 data-nosnippet>2543</a>                snapshot_id: <span class="number">3055729675574597004</span>,
+<a href=#2544 id=2544 data-nosnippet>2544</a>                sequence_number: <span class="number">1</span>,
+<a href=#2545 id=2545 data-nosnippet>2545</a>                fields: <span class="macro">vec!</span>[<span class="number">1</span>],
+<a href=#2546 id=2546 data-nosnippet>2546</a>                r#type: <span class="string">"ndv"</span>.to_string(),
+<a href=#2547 id=2547 data-nosnippet>2547</a>                properties: HashMap::new(),
+<a href=#2548 id=2548 data-nosnippet>2548</a>            }],
+<a href=#2549 id=2549 data-nosnippet>2549</a>        };
+<a href=#2550 id=2550 data-nosnippet>2550</a>        <span class="kw">let </span>build_result = builder.set_statistics(statistics.clone()).build().unwrap();
+<a href=#2551 id=2551 data-nosnippet>2551</a>
+<a href=#2552 id=2552 data-nosnippet>2552</a>        <span class="macro">assert_eq!</span>(
+<a href=#2553 id=2553 data-nosnippet>2553</a>            build_result.metadata.statistics,
+<a href=#2554 id=2554 data-nosnippet>2554</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="number">3055729675574597004</span>, statistics.clone())])
+<a href=#2555 id=2555 data-nosnippet>2555</a>        );
+<a href=#2556 id=2556 data-nosnippet>2556</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[TableUpdate::SetStatistics {
+<a href=#2557 id=2557 data-nosnippet>2557</a>            statistics: statistics.clone()
+<a href=#2558 id=2558 data-nosnippet>2558</a>        }]);
+<a href=#2559 id=2559 data-nosnippet>2559</a>
+<a href=#2560 id=2560 data-nosnippet>2560</a>        <span class="comment">// Remove
+<a href=#2561 id=2561 data-nosnippet>2561</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
+<a href=#2562 id=2562 data-nosnippet>2562</a>        <span class="kw">let </span>build_result = builder
+<a href=#2563 id=2563 data-nosnippet>2563</a>            .remove_statistics(statistics.snapshot_id)
+<a href=#2564 id=2564 data-nosnippet>2564</a>            .build()
+<a href=#2565 id=2565 data-nosnippet>2565</a>            .unwrap();
+<a href=#2566 id=2566 data-nosnippet>2566</a>
+<a href=#2567 id=2567 data-nosnippet>2567</a>        <span class="macro">assert_eq!</span>(build_result.metadata.statistics.len(), <span class="number">0</span>);
+<a href=#2568 id=2568 data-nosnippet>2568</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[TableUpdate::RemoveStatistics {
+<a href=#2569 id=2569 data-nosnippet>2569</a>            snapshot_id: statistics.snapshot_id
+<a href=#2570 id=2570 data-nosnippet>2570</a>        }]);
+<a href=#2571 id=2571 data-nosnippet>2571</a>
+<a href=#2572 id=2572 data-nosnippet>2572</a>        <span class="comment">// Remove again yields no changes
+<a href=#2573 id=2573 data-nosnippet>2573</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
+<a href=#2574 id=2574 data-nosnippet>2574</a>        <span class="kw">let </span>build_result = builder
+<a href=#2575 id=2575 data-nosnippet>2575</a>            .remove_statistics(statistics.snapshot_id)
+<a href=#2576 id=2576 data-nosnippet>2576</a>            .build()
+<a href=#2577 id=2577 data-nosnippet>2577</a>            .unwrap();
+<a href=#2578 id=2578 data-nosnippet>2578</a>        <span class="macro">assert_eq!</span>(build_result.metadata.statistics.len(), <span class="number">0</span>);
+<a href=#2579 id=2579 data-nosnippet>2579</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
+<a href=#2580 id=2580 data-nosnippet>2580</a>    }
+<a href=#2581 id=2581 data-nosnippet>2581</a>
+<a href=#2582 id=2582 data-nosnippet>2582</a>    <span class="attr">#[test]
+<a href=#2583 id=2583 data-nosnippet>2583</a>    </span><span class="kw">fn </span>test_add_partition_statistics() {
+<a href=#2584 id=2584 data-nosnippet>2584</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2585 id=2585 data-nosnippet>2585</a>
+<a href=#2586 id=2586 data-nosnippet>2586</a>        <span class="kw">let </span>statistics = PartitionStatisticsFile {
+<a href=#2587 id=2587 data-nosnippet>2587</a>            snapshot_id: <span class="number">3055729675574597004</span>,
+<a href=#2588 id=2588 data-nosnippet>2588</a>            statistics_path: <span class="string">"s3://a/b/partition-stats.parquet"</span>.to_string(),
+<a href=#2589 id=2589 data-nosnippet>2589</a>            file_size_in_bytes: <span class="number">43</span>,
+<a href=#2590 id=2590 data-nosnippet>2590</a>        };
+<a href=#2591 id=2591 data-nosnippet>2591</a>
+<a href=#2592 id=2592 data-nosnippet>2592</a>        <span class="kw">let </span>build_result = builder
+<a href=#2593 id=2593 data-nosnippet>2593</a>            .set_partition_statistics(statistics.clone())
+<a href=#2594 id=2594 data-nosnippet>2594</a>            .build()
+<a href=#2595 id=2595 data-nosnippet>2595</a>            .unwrap();
+<a href=#2596 id=2596 data-nosnippet>2596</a>        <span class="macro">assert_eq!</span>(
+<a href=#2597 id=2597 data-nosnippet>2597</a>            build_result.metadata.partition_statistics,
+<a href=#2598 id=2598 data-nosnippet>2598</a>            HashMap::from_iter(<span class="macro">vec!</span>[(<span class="number">3055729675574597004</span>, statistics.clone())])
+<a href=#2599 id=2599 data-nosnippet>2599</a>        );
+<a href=#2600 id=2600 data-nosnippet>2600</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
+<a href=#2601 id=2601 data-nosnippet>2601</a>            TableUpdate::SetPartitionStatistics {
+<a href=#2602 id=2602 data-nosnippet>2602</a>                partition_statistics: statistics.clone()
+<a href=#2603 id=2603 data-nosnippet>2603</a>            }
+<a href=#2604 id=2604 data-nosnippet>2604</a>        ]);
+<a href=#2605 id=2605 data-nosnippet>2605</a>
+<a href=#2606 id=2606 data-nosnippet>2606</a>        <span class="comment">// Remove
+<a href=#2607 id=2607 data-nosnippet>2607</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
+<a href=#2608 id=2608 data-nosnippet>2608</a>        <span class="kw">let </span>build_result = builder
+<a href=#2609 id=2609 data-nosnippet>2609</a>            .remove_partition_statistics(statistics.snapshot_id)
+<a href=#2610 id=2610 data-nosnippet>2610</a>            .build()
+<a href=#2611 id=2611 data-nosnippet>2611</a>            .unwrap();
+<a href=#2612 id=2612 data-nosnippet>2612</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_statistics.len(), <span class="number">0</span>);
+<a href=#2613 id=2613 data-nosnippet>2613</a>        <span class="macro">assert_eq!</span>(build_result.changes, <span class="macro">vec!</span>[
+<a href=#2614 id=2614 data-nosnippet>2614</a>            TableUpdate::RemovePartitionStatistics {
+<a href=#2615 id=2615 data-nosnippet>2615</a>                snapshot_id: statistics.snapshot_id
+<a href=#2616 id=2616 data-nosnippet>2616</a>            }
+<a href=#2617 id=2617 data-nosnippet>2617</a>        ]);
+<a href=#2618 id=2618 data-nosnippet>2618</a>
+<a href=#2619 id=2619 data-nosnippet>2619</a>        <span class="comment">// Remove again yields no changes
+<a href=#2620 id=2620 data-nosnippet>2620</a>        </span><span class="kw">let </span>builder = build_result.metadata.into_builder(<span class="prelude-val">None</span>);
+<a href=#2621 id=2621 data-nosnippet>2621</a>        <span class="kw">let </span>build_result = builder
+<a href=#2622 id=2622 data-nosnippet>2622</a>            .remove_partition_statistics(statistics.snapshot_id)
+<a href=#2623 id=2623 data-nosnippet>2623</a>            .build()
+<a href=#2624 id=2624 data-nosnippet>2624</a>            .unwrap();
+<a href=#2625 id=2625 data-nosnippet>2625</a>        <span class="macro">assert_eq!</span>(build_result.metadata.partition_statistics.len(), <span class="number">0</span>);
+<a href=#2626 id=2626 data-nosnippet>2626</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
+<a href=#2627 id=2627 data-nosnippet>2627</a>    }
+<a href=#2628 id=2628 data-nosnippet>2628</a>
+<a href=#2629 id=2629 data-nosnippet>2629</a>    <span class="attr">#[test]
+<a href=#2630 id=2630 data-nosnippet>2630</a>    </span><span class="kw">fn </span>last_update_increased_for_property_only_update() {
+<a href=#2631 id=2631 data-nosnippet>2631</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2632 id=2632 data-nosnippet>2632</a>
+<a href=#2633 id=2633 data-nosnippet>2633</a>        <span class="kw">let </span>metadata = builder.build().unwrap().metadata;
+<a href=#2634 id=2634 data-nosnippet>2634</a>        <span class="kw">let </span>last_updated_ms = metadata.last_updated_ms;
+<a href=#2635 id=2635 data-nosnippet>2635</a>        sleep(std::time::Duration::from_millis(<span class="number">2</span>));
+<a href=#2636 id=2636 data-nosnippet>2636</a>
+<a href=#2637 id=2637 data-nosnippet>2637</a>        <span class="kw">let </span>build_result = metadata
+<a href=#2638 id=2638 data-nosnippet>2638</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#2639 id=2639 data-nosnippet>2639</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#2640 id=2640 data-nosnippet>2640</a>            ))
+<a href=#2641 id=2641 data-nosnippet>2641</a>            .set_properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#2642 id=2642 data-nosnippet>2642</a>                <span class="string">"foo"</span>.to_string(),
+<a href=#2643 id=2643 data-nosnippet>2643</a>                <span class="string">"bar"</span>.to_string(),
+<a href=#2644 id=2644 data-nosnippet>2644</a>            )]))
+<a href=#2645 id=2645 data-nosnippet>2645</a>            .unwrap()
+<a href=#2646 id=2646 data-nosnippet>2646</a>            .build()
+<a href=#2647 id=2647 data-nosnippet>2647</a>            .unwrap();
+<a href=#2648 id=2648 data-nosnippet>2648</a>
+<a href=#2649 id=2649 data-nosnippet>2649</a>        <span class="macro">assert!</span>(
+<a href=#2650 id=2650 data-nosnippet>2650</a>            build_result.metadata.last_updated_ms &gt; last_updated_ms,
+<a href=#2651 id=2651 data-nosnippet>2651</a>            <span class="string">"{} &gt; {}"</span>,
+<a href=#2652 id=2652 data-nosnippet>2652</a>            build_result.metadata.last_updated_ms,
+<a href=#2653 id=2653 data-nosnippet>2653</a>            last_updated_ms
+<a href=#2654 id=2654 data-nosnippet>2654</a>        );
+<a href=#2655 id=2655 data-nosnippet>2655</a>    }
+<a href=#2656 id=2656 data-nosnippet>2656</a>
+<a href=#2657 id=2657 data-nosnippet>2657</a>    <span class="attr">#[test]
+<a href=#2658 id=2658 data-nosnippet>2658</a>    </span><span class="kw">fn </span>test_construct_default_main_branch() {
+<a href=#2659 id=2659 data-nosnippet>2659</a>        <span class="comment">// Load the table without ref
+<a href=#2660 id=2660 data-nosnippet>2660</a>        </span><span class="kw">let </span>file = File::open(<span class="macro">format!</span>(
+<a href=#2661 id=2661 data-nosnippet>2661</a>            <span class="string">"{}/testdata/table_metadata/{}"</span>,
+<a href=#2662 id=2662 data-nosnippet>2662</a>            <span class="macro">env!</span>(<span class="string">"CARGO_MANIFEST_DIR"</span>),
+<a href=#2663 id=2663 data-nosnippet>2663</a>            <span class="string">"TableMetadataV2Valid.json"
+<a href=#2664 id=2664 data-nosnippet>2664</a>        </span>))
+<a href=#2665 id=2665 data-nosnippet>2665</a>        .unwrap();
+<a href=#2666 id=2666 data-nosnippet>2666</a>        <span class="kw">let </span>reader = BufReader::new(file);
+<a href=#2667 id=2667 data-nosnippet>2667</a>        <span class="kw">let </span>resp = serde_json::from_reader::&lt;<span class="kw">_</span>, TableMetadata&gt;(reader).unwrap();
+<a href=#2668 id=2668 data-nosnippet>2668</a>
+<a href=#2669 id=2669 data-nosnippet>2669</a>        <span class="kw">let </span>table = Table::builder()
+<a href=#2670 id=2670 data-nosnippet>2670</a>            .metadata(resp)
+<a href=#2671 id=2671 data-nosnippet>2671</a>            .metadata_location(<span class="string">"s3://bucket/test/location/metadata/v1.json"</span>.to_string())
+<a href=#2672 id=2672 data-nosnippet>2672</a>            .identifier(TableIdent::from_strs([<span class="string">"ns1"</span>, <span class="string">"test1"</span>]).unwrap())
+<a href=#2673 id=2673 data-nosnippet>2673</a>            .file_io(FileIOBuilder::new(<span class="string">"memory"</span>).build().unwrap())
+<a href=#2674 id=2674 data-nosnippet>2674</a>            .build()
+<a href=#2675 id=2675 data-nosnippet>2675</a>            .unwrap();
+<a href=#2676 id=2676 data-nosnippet>2676</a>
+<a href=#2677 id=2677 data-nosnippet>2677</a>        <span class="macro">assert_eq!</span>(
+<a href=#2678 id=2678 data-nosnippet>2678</a>            table.metadata().refs.get(MAIN_BRANCH).unwrap().snapshot_id,
+<a href=#2679 id=2679 data-nosnippet>2679</a>            table.metadata().current_snapshot_id().unwrap()
+<a href=#2680 id=2680 data-nosnippet>2680</a>        );
+<a href=#2681 id=2681 data-nosnippet>2681</a>    }
+<a href=#2682 id=2682 data-nosnippet>2682</a>
+<a href=#2683 id=2683 data-nosnippet>2683</a>    <span class="attr">#[test]
+<a href=#2684 id=2684 data-nosnippet>2684</a>    </span><span class="kw">fn </span>test_active_schema_cannot_be_removed() {
+<a href=#2685 id=2685 data-nosnippet>2685</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#2686 id=2686 data-nosnippet>2686</a>        builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap_err();
+<a href=#2687 id=2687 data-nosnippet>2687</a>    }
+<a href=#2688 id=2688 data-nosnippet>2688</a>
+<a href=#2689 id=2689 data-nosnippet>2689</a>    <span class="attr">#[test]
+<a href=#2690 id=2690 data-nosnippet>2690</a>    </span><span class="kw">fn </span>test_remove_schemas() {
+<a href=#2691 id=2691 data-nosnippet>2691</a>        <span class="kw">let </span>file = File::open(<span class="macro">format!</span>(
+<a href=#2692 id=2692 data-nosnippet>2692</a>            <span class="string">"{}/testdata/table_metadata/{}"</span>,
+<a href=#2693 id=2693 data-nosnippet>2693</a>            <span class="macro">env!</span>(<span class="string">"CARGO_MANIFEST_DIR"</span>),
+<a href=#2694 id=2694 data-nosnippet>2694</a>            <span class="string">"TableMetadataV2Valid.json"
+<a href=#2695 id=2695 data-nosnippet>2695</a>        </span>))
+<a href=#2696 id=2696 data-nosnippet>2696</a>        .unwrap();
+<a href=#2697 id=2697 data-nosnippet>2697</a>        <span class="kw">let </span>reader = BufReader::new(file);
+<a href=#2698 id=2698 data-nosnippet>2698</a>        <span class="kw">let </span>resp = serde_json::from_reader::&lt;<span class="kw">_</span>, TableMetadata&gt;(reader).unwrap();
+<a href=#2699 id=2699 data-nosnippet>2699</a>
+<a href=#2700 id=2700 data-nosnippet>2700</a>        <span class="kw">let </span>table = Table::builder()
+<a href=#2701 id=2701 data-nosnippet>2701</a>            .metadata(resp)
+<a href=#2702 id=2702 data-nosnippet>2702</a>            .metadata_location(<span class="string">"s3://bucket/test/location/metadata/v1.json"</span>.to_string())
+<a href=#2703 id=2703 data-nosnippet>2703</a>            .identifier(TableIdent::from_strs([<span class="string">"ns1"</span>, <span class="string">"test1"</span>]).unwrap())
+<a href=#2704 id=2704 data-nosnippet>2704</a>            .file_io(FileIOBuilder::new(<span class="string">"memory"</span>).build().unwrap())
+<a href=#2705 id=2705 data-nosnippet>2705</a>            .build()
+<a href=#2706 id=2706 data-nosnippet>2706</a>            .unwrap();
 <a href=#2707 id=2707 data-nosnippet>2707</a>
-<a href=#2708 id=2708 data-nosnippet>2708</a>        {
-<a href=#2709 id=2709 data-nosnippet>2709</a>            <span class="comment">// can not remove active schema
-<a href=#2710 id=2710 data-nosnippet>2710</a>            </span><span class="kw">let </span>meta_data_builder = table.metadata().clone().into_builder(<span class="prelude-val">None</span>);
-<a href=#2711 id=2711 data-nosnippet>2711</a>            meta_data_builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">1</span>]).unwrap_err();
-<a href=#2712 id=2712 data-nosnippet>2712</a>        }
-<a href=#2713 id=2713 data-nosnippet>2713</a>
-<a href=#2714 id=2714 data-nosnippet>2714</a>        <span class="kw">let </span><span class="kw-2">mut </span>meta_data_builder = table.metadata().clone().into_builder(<span class="prelude-val">None</span>);
-<a href=#2715 id=2715 data-nosnippet>2715</a>        meta_data_builder = meta_data_builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap();
-<a href=#2716 id=2716 data-nosnippet>2716</a>        <span class="kw">let </span>build_result = meta_data_builder.build().unwrap();
-<a href=#2717 id=2717 data-nosnippet>2717</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.schemas.len());
-<a href=#2718 id=2718 data-nosnippet>2718</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.current_schema_id);
-<a href=#2719 id=2719 data-nosnippet>2719</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.current_schema().schema_id());
-<a href=#2720 id=2720 data-nosnippet>2720</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.changes.len());
-<a href=#2721 id=2721 data-nosnippet>2721</a>
-<a href=#2722 id=2722 data-nosnippet>2722</a>        <span class="kw">let </span>remove_schema_ids =
-<a href=#2723 id=2723 data-nosnippet>2723</a>            <span class="kw">if let </span>TableUpdate::RemoveSchemas { schema_ids } = <span class="kw-2">&amp;</span>build_result.changes[<span class="number">0</span>] {
-<a href=#2724 id=2724 data-nosnippet>2724</a>                schema_ids
-<a href=#2725 id=2725 data-nosnippet>2725</a>            } <span class="kw">else </span>{
-<a href=#2726 id=2726 data-nosnippet>2726</a>                <span class="macro">unreachable!</span>(<span class="string">"Expected RemoveSchema change"</span>)
-<a href=#2727 id=2727 data-nosnippet>2727</a>            };
-<a href=#2728 id=2728 data-nosnippet>2728</a>        <span class="macro">assert_eq!</span>(remove_schema_ids, <span class="kw-2">&amp;</span>[<span class="number">0</span>]);
-<a href=#2729 id=2729 data-nosnippet>2729</a>    }
-<a href=#2730 id=2730 data-nosnippet>2730</a>
-<a href=#2731 id=2731 data-nosnippet>2731</a>    <span class="attr">#[test]
-<a href=#2732 id=2732 data-nosnippet>2732</a>    </span><span class="kw">fn </span>test_schema_evolution_now_correctly_validates_partition_field_name_conflicts() {
-<a href=#2733 id=2733 data-nosnippet>2733</a>        <span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#2734 id=2734 data-nosnippet>2734</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2735 id=2735 data-nosnippet>2735</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2736 id=2736 data-nosnippet>2736</a>            ])
-<a href=#2737 id=2737 data-nosnippet>2737</a>            .build()
-<a href=#2738 id=2738 data-nosnippet>2738</a>            .unwrap();
-<a href=#2739 id=2739 data-nosnippet>2739</a>
-<a href=#2740 id=2740 data-nosnippet>2740</a>        <span class="kw">let </span>partition_spec_with_bucket = UnboundPartitionSpec::builder()
-<a href=#2741 id=2741 data-nosnippet>2741</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#2742 id=2742 data-nosnippet>2742</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#2743 id=2743 data-nosnippet>2743</a>            .unwrap()
-<a href=#2744 id=2744 data-nosnippet>2744</a>            .build();
-<a href=#2745 id=2745 data-nosnippet>2745</a>
-<a href=#2746 id=2746 data-nosnippet>2746</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#2747 id=2747 data-nosnippet>2747</a>            initial_schema,
-<a href=#2748 id=2748 data-nosnippet>2748</a>            partition_spec_with_bucket,
-<a href=#2749 id=2749 data-nosnippet>2749</a>            SortOrder::unsorted_order(),
-<a href=#2750 id=2750 data-nosnippet>2750</a>            TEST_LOCATION.to_string(),
-<a href=#2751 id=2751 data-nosnippet>2751</a>            FormatVersion::V2,
-<a href=#2752 id=2752 data-nosnippet>2752</a>            HashMap::new(),
-<a href=#2753 id=2753 data-nosnippet>2753</a>        )
-<a href=#2754 id=2754 data-nosnippet>2754</a>        .unwrap()
-<a href=#2755 id=2755 data-nosnippet>2755</a>        .build()
+<a href=#2708 id=2708 data-nosnippet>2708</a>        <span class="macro">assert_eq!</span>(<span class="number">2</span>, table.metadata().schemas.len());
+<a href=#2709 id=2709 data-nosnippet>2709</a>
+<a href=#2710 id=2710 data-nosnippet>2710</a>        {
+<a href=#2711 id=2711 data-nosnippet>2711</a>            <span class="comment">// can not remove active schema
+<a href=#2712 id=2712 data-nosnippet>2712</a>            </span><span class="kw">let </span>meta_data_builder = table.metadata().clone().into_builder(<span class="prelude-val">None</span>);
+<a href=#2713 id=2713 data-nosnippet>2713</a>            meta_data_builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">1</span>]).unwrap_err();
+<a href=#2714 id=2714 data-nosnippet>2714</a>        }
+<a href=#2715 id=2715 data-nosnippet>2715</a>
+<a href=#2716 id=2716 data-nosnippet>2716</a>        <span class="kw">let </span><span class="kw-2">mut </span>meta_data_builder = table.metadata().clone().into_builder(<span class="prelude-val">None</span>);
+<a href=#2717 id=2717 data-nosnippet>2717</a>        meta_data_builder = meta_data_builder.remove_schemas(<span class="kw-2">&amp;</span>[<span class="number">0</span>]).unwrap();
+<a href=#2718 id=2718 data-nosnippet>2718</a>        <span class="kw">let </span>build_result = meta_data_builder.build().unwrap();
+<a href=#2719 id=2719 data-nosnippet>2719</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.schemas.len());
+<a href=#2720 id=2720 data-nosnippet>2720</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.current_schema_id);
+<a href=#2721 id=2721 data-nosnippet>2721</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.metadata.current_schema().schema_id());
+<a href=#2722 id=2722 data-nosnippet>2722</a>        <span class="macro">assert_eq!</span>(<span class="number">1</span>, build_result.changes.len());
+<a href=#2723 id=2723 data-nosnippet>2723</a>
+<a href=#2724 id=2724 data-nosnippet>2724</a>        <span class="kw">let </span>remove_schema_ids =
+<a href=#2725 id=2725 data-nosnippet>2725</a>            <span class="kw">if let </span>TableUpdate::RemoveSchemas { schema_ids } = <span class="kw-2">&amp;</span>build_result.changes[<span class="number">0</span>] {
+<a href=#2726 id=2726 data-nosnippet>2726</a>                schema_ids
+<a href=#2727 id=2727 data-nosnippet>2727</a>            } <span class="kw">else </span>{
+<a href=#2728 id=2728 data-nosnippet>2728</a>                <span class="macro">unreachable!</span>(<span class="string">"Expected RemoveSchema change"</span>)
+<a href=#2729 id=2729 data-nosnippet>2729</a>            };
+<a href=#2730 id=2730 data-nosnippet>2730</a>        <span class="macro">assert_eq!</span>(remove_schema_ids, <span class="kw-2">&amp;</span>[<span class="number">0</span>]);
+<a href=#2731 id=2731 data-nosnippet>2731</a>    }
+<a href=#2732 id=2732 data-nosnippet>2732</a>
+<a href=#2733 id=2733 data-nosnippet>2733</a>    <span class="attr">#[test]
+<a href=#2734 id=2734 data-nosnippet>2734</a>    </span><span class="kw">fn </span>test_schema_evolution_now_correctly_validates_partition_field_name_conflicts() {
+<a href=#2735 id=2735 data-nosnippet>2735</a>        <span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#2736 id=2736 data-nosnippet>2736</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2737 id=2737 data-nosnippet>2737</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2738 id=2738 data-nosnippet>2738</a>            ])
+<a href=#2739 id=2739 data-nosnippet>2739</a>            .build()
+<a href=#2740 id=2740 data-nosnippet>2740</a>            .unwrap();
+<a href=#2741 id=2741 data-nosnippet>2741</a>
+<a href=#2742 id=2742 data-nosnippet>2742</a>        <span class="kw">let </span>partition_spec_with_bucket = UnboundPartitionSpec::builder()
+<a href=#2743 id=2743 data-nosnippet>2743</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#2744 id=2744 data-nosnippet>2744</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#2745 id=2745 data-nosnippet>2745</a>            .unwrap()
+<a href=#2746 id=2746 data-nosnippet>2746</a>            .build();
+<a href=#2747 id=2747 data-nosnippet>2747</a>
+<a href=#2748 id=2748 data-nosnippet>2748</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#2749 id=2749 data-nosnippet>2749</a>            initial_schema,
+<a href=#2750 id=2750 data-nosnippet>2750</a>            partition_spec_with_bucket,
+<a href=#2751 id=2751 data-nosnippet>2751</a>            SortOrder::unsorted_order(),
+<a href=#2752 id=2752 data-nosnippet>2752</a>            TEST_LOCATION.to_string(),
+<a href=#2753 id=2753 data-nosnippet>2753</a>            FormatVersion::V2,
+<a href=#2754 id=2754 data-nosnippet>2754</a>            HashMap::new(),
+<a href=#2755 id=2755 data-nosnippet>2755</a>        )
 <a href=#2756 id=2756 data-nosnippet>2756</a>        .unwrap()
-<a href=#2757 id=2757 data-nosnippet>2757</a>        .metadata;
-<a href=#2758 id=2758 data-nosnippet>2758</a>
-<a href=#2759 id=2759 data-nosnippet>2759</a>        <span class="kw">let </span>partition_field_names: Vec&lt;String&gt; = metadata
-<a href=#2760 id=2760 data-nosnippet>2760</a>            .default_partition_spec()
-<a href=#2761 id=2761 data-nosnippet>2761</a>            .fields()
-<a href=#2762 id=2762 data-nosnippet>2762</a>            .iter()
-<a href=#2763 id=2763 data-nosnippet>2763</a>            .map(|f| f.name.clone())
-<a href=#2764 id=2764 data-nosnippet>2764</a>            .collect();
-<a href=#2765 id=2765 data-nosnippet>2765</a>        <span class="macro">assert!</span>(partition_field_names.contains(<span class="kw-2">&amp;</span><span class="string">"bucket_data"</span>.to_string()));
-<a href=#2766 id=2766 data-nosnippet>2766</a>
-<a href=#2767 id=2767 data-nosnippet>2767</a>        <span class="kw">let </span>evolved_schema = Schema::builder()
-<a href=#2768 id=2768 data-nosnippet>2768</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2769 id=2769 data-nosnippet>2769</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2770 id=2770 data-nosnippet>2770</a>                <span class="comment">// Adding a schema field with the same name as an existing partition field
-<a href=#2771 id=2771 data-nosnippet>2771</a>                </span>NestedField::required(<span class="number">2</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::Int)).into(),
-<a href=#2772 id=2772 data-nosnippet>2772</a>            ])
-<a href=#2773 id=2773 data-nosnippet>2773</a>            .build()
-<a href=#2774 id=2774 data-nosnippet>2774</a>            .unwrap();
-<a href=#2775 id=2775 data-nosnippet>2775</a>
-<a href=#2776 id=2776 data-nosnippet>2776</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
-<a href=#2777 id=2777 data-nosnippet>2777</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#2778 id=2778 data-nosnippet>2778</a>        ));
-<a href=#2779 id=2779 data-nosnippet>2779</a>
-<a href=#2780 id=2780 data-nosnippet>2780</a>        <span class="comment">// Try to add the evolved schema - this should now fail immediately with a clear error
-<a href=#2781 id=2781 data-nosnippet>2781</a>        </span><span class="kw">let </span>result = builder.add_current_schema(evolved_schema);
-<a href=#2782 id=2782 data-nosnippet>2782</a>
-<a href=#2783 id=2783 data-nosnippet>2783</a>        <span class="macro">assert!</span>(result.is_err());
-<a href=#2784 id=2784 data-nosnippet>2784</a>        <span class="kw">let </span>error = result.unwrap_err();
-<a href=#2785 id=2785 data-nosnippet>2785</a>        <span class="kw">let </span>error_message = error.message();
-<a href=#2786 id=2786 data-nosnippet>2786</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
-<a href=#2787 id=2787 data-nosnippet>2787</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"Schema evolution cannot introduce field names that match existing partition field names"</span>));
-<a href=#2788 id=2788 data-nosnippet>2788</a>    }
-<a href=#2789 id=2789 data-nosnippet>2789</a>
-<a href=#2790 id=2790 data-nosnippet>2790</a>    <span class="attr">#[test]
-<a href=#2791 id=2791 data-nosnippet>2791</a>    </span><span class="kw">fn </span>test_schema_evolution_should_validate_on_schema_add_not_metadata_build() {
-<a href=#2792 id=2792 data-nosnippet>2792</a>        <span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#2793 id=2793 data-nosnippet>2793</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2794 id=2794 data-nosnippet>2794</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2795 id=2795 data-nosnippet>2795</a>            ])
-<a href=#2796 id=2796 data-nosnippet>2796</a>            .build()
-<a href=#2797 id=2797 data-nosnippet>2797</a>            .unwrap();
-<a href=#2798 id=2798 data-nosnippet>2798</a>
-<a href=#2799 id=2799 data-nosnippet>2799</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#2800 id=2800 data-nosnippet>2800</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#2801 id=2801 data-nosnippet>2801</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"partition_col"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#2802 id=2802 data-nosnippet>2802</a>            .unwrap()
-<a href=#2803 id=2803 data-nosnippet>2803</a>            .build();
-<a href=#2804 id=2804 data-nosnippet>2804</a>
-<a href=#2805 id=2805 data-nosnippet>2805</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#2806 id=2806 data-nosnippet>2806</a>            initial_schema,
-<a href=#2807 id=2807 data-nosnippet>2807</a>            partition_spec,
-<a href=#2808 id=2808 data-nosnippet>2808</a>            SortOrder::unsorted_order(),
-<a href=#2809 id=2809 data-nosnippet>2809</a>            TEST_LOCATION.to_string(),
-<a href=#2810 id=2810 data-nosnippet>2810</a>            FormatVersion::V2,
-<a href=#2811 id=2811 data-nosnippet>2811</a>            HashMap::new(),
-<a href=#2812 id=2812 data-nosnippet>2812</a>        )
-<a href=#2813 id=2813 data-nosnippet>2813</a>        .unwrap()
-<a href=#2814 id=2814 data-nosnippet>2814</a>        .build()
+<a href=#2757 id=2757 data-nosnippet>2757</a>        .build()
+<a href=#2758 id=2758 data-nosnippet>2758</a>        .unwrap()
+<a href=#2759 id=2759 data-nosnippet>2759</a>        .metadata;
+<a href=#2760 id=2760 data-nosnippet>2760</a>
+<a href=#2761 id=2761 data-nosnippet>2761</a>        <span class="kw">let </span>partition_field_names: Vec&lt;String&gt; = metadata
+<a href=#2762 id=2762 data-nosnippet>2762</a>            .default_partition_spec()
+<a href=#2763 id=2763 data-nosnippet>2763</a>            .fields()
+<a href=#2764 id=2764 data-nosnippet>2764</a>            .iter()
+<a href=#2765 id=2765 data-nosnippet>2765</a>            .map(|f| f.name.clone())
+<a href=#2766 id=2766 data-nosnippet>2766</a>            .collect();
+<a href=#2767 id=2767 data-nosnippet>2767</a>        <span class="macro">assert!</span>(partition_field_names.contains(<span class="kw-2">&amp;</span><span class="string">"bucket_data"</span>.to_string()));
+<a href=#2768 id=2768 data-nosnippet>2768</a>
+<a href=#2769 id=2769 data-nosnippet>2769</a>        <span class="kw">let </span>evolved_schema = Schema::builder()
+<a href=#2770 id=2770 data-nosnippet>2770</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2771 id=2771 data-nosnippet>2771</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2772 id=2772 data-nosnippet>2772</a>                <span class="comment">// Adding a schema field with the same name as an existing partition field
+<a href=#2773 id=2773 data-nosnippet>2773</a>                </span>NestedField::required(<span class="number">2</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::Int)).into(),
+<a href=#2774 id=2774 data-nosnippet>2774</a>            ])
+<a href=#2775 id=2775 data-nosnippet>2775</a>            .build()
+<a href=#2776 id=2776 data-nosnippet>2776</a>            .unwrap();
+<a href=#2777 id=2777 data-nosnippet>2777</a>
+<a href=#2778 id=2778 data-nosnippet>2778</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
+<a href=#2779 id=2779 data-nosnippet>2779</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#2780 id=2780 data-nosnippet>2780</a>        ));
+<a href=#2781 id=2781 data-nosnippet>2781</a>
+<a href=#2782 id=2782 data-nosnippet>2782</a>        <span class="comment">// Try to add the evolved schema - this should now fail immediately with a clear error
+<a href=#2783 id=2783 data-nosnippet>2783</a>        </span><span class="kw">let </span>result = builder.add_current_schema(evolved_schema);
+<a href=#2784 id=2784 data-nosnippet>2784</a>
+<a href=#2785 id=2785 data-nosnippet>2785</a>        <span class="macro">assert!</span>(result.is_err());
+<a href=#2786 id=2786 data-nosnippet>2786</a>        <span class="kw">let </span>error = result.unwrap_err();
+<a href=#2787 id=2787 data-nosnippet>2787</a>        <span class="kw">let </span>error_message = error.message();
+<a href=#2788 id=2788 data-nosnippet>2788</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
+<a href=#2789 id=2789 data-nosnippet>2789</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"Schema evolution cannot introduce field names that match existing partition field names"</span>));
+<a href=#2790 id=2790 data-nosnippet>2790</a>    }
+<a href=#2791 id=2791 data-nosnippet>2791</a>
+<a href=#2792 id=2792 data-nosnippet>2792</a>    <span class="attr">#[test]
+<a href=#2793 id=2793 data-nosnippet>2793</a>    </span><span class="kw">fn </span>test_schema_evolution_should_validate_on_schema_add_not_metadata_build() {
+<a href=#2794 id=2794 data-nosnippet>2794</a>        <span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#2795 id=2795 data-nosnippet>2795</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2796 id=2796 data-nosnippet>2796</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2797 id=2797 data-nosnippet>2797</a>            ])
+<a href=#2798 id=2798 data-nosnippet>2798</a>            .build()
+<a href=#2799 id=2799 data-nosnippet>2799</a>            .unwrap();
+<a href=#2800 id=2800 data-nosnippet>2800</a>
+<a href=#2801 id=2801 data-nosnippet>2801</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#2802 id=2802 data-nosnippet>2802</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#2803 id=2803 data-nosnippet>2803</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"partition_col"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#2804 id=2804 data-nosnippet>2804</a>            .unwrap()
+<a href=#2805 id=2805 data-nosnippet>2805</a>            .build();
+<a href=#2806 id=2806 data-nosnippet>2806</a>
+<a href=#2807 id=2807 data-nosnippet>2807</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#2808 id=2808 data-nosnippet>2808</a>            initial_schema,
+<a href=#2809 id=2809 data-nosnippet>2809</a>            partition_spec,
+<a href=#2810 id=2810 data-nosnippet>2810</a>            SortOrder::unsorted_order(),
+<a href=#2811 id=2811 data-nosnippet>2811</a>            TEST_LOCATION.to_string(),
+<a href=#2812 id=2812 data-nosnippet>2812</a>            FormatVersion::V2,
+<a href=#2813 id=2813 data-nosnippet>2813</a>            HashMap::new(),
+<a href=#2814 id=2814 data-nosnippet>2814</a>        )
 <a href=#2815 id=2815 data-nosnippet>2815</a>        .unwrap()
-<a href=#2816 id=2816 data-nosnippet>2816</a>        .metadata;
-<a href=#2817 id=2817 data-nosnippet>2817</a>
-<a href=#2818 id=2818 data-nosnippet>2818</a>        <span class="kw">let </span>non_conflicting_schema = Schema::builder()
-<a href=#2819 id=2819 data-nosnippet>2819</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2820 id=2820 data-nosnippet>2820</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2821 id=2821 data-nosnippet>2821</a>                NestedField::required(<span class="number">2</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::Int)).into(),
-<a href=#2822 id=2822 data-nosnippet>2822</a>            ])
-<a href=#2823 id=2823 data-nosnippet>2823</a>            .build()
-<a href=#2824 id=2824 data-nosnippet>2824</a>            .unwrap();
-<a href=#2825 id=2825 data-nosnippet>2825</a>
-<a href=#2826 id=2826 data-nosnippet>2826</a>        <span class="comment">// This should succeed since there's no name conflict
-<a href=#2827 id=2827 data-nosnippet>2827</a>        </span><span class="kw">let </span>result = metadata
-<a href=#2828 id=2828 data-nosnippet>2828</a>            .clone()
-<a href=#2829 id=2829 data-nosnippet>2829</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
-<a href=#2830 id=2830 data-nosnippet>2830</a>            .add_current_schema(non_conflicting_schema)
-<a href=#2831 id=2831 data-nosnippet>2831</a>            .unwrap()
-<a href=#2832 id=2832 data-nosnippet>2832</a>            .build();
-<a href=#2833 id=2833 data-nosnippet>2833</a>
-<a href=#2834 id=2834 data-nosnippet>2834</a>        <span class="macro">assert!</span>(result.is_ok());
-<a href=#2835 id=2835 data-nosnippet>2835</a>    }
-<a href=#2836 id=2836 data-nosnippet>2836</a>
-<a href=#2837 id=2837 data-nosnippet>2837</a>    <span class="attr">#[test]
-<a href=#2838 id=2838 data-nosnippet>2838</a>    </span><span class="kw">fn </span>test_partition_spec_evolution_validates_schema_field_name_conflicts() {
-<a href=#2839 id=2839 data-nosnippet>2839</a>        <span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#2840 id=2840 data-nosnippet>2840</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2841 id=2841 data-nosnippet>2841</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2842 id=2842 data-nosnippet>2842</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
-<a href=#2843 id=2843 data-nosnippet>2843</a>                    .into(),
-<a href=#2844 id=2844 data-nosnippet>2844</a>            ])
-<a href=#2845 id=2845 data-nosnippet>2845</a>            .build()
-<a href=#2846 id=2846 data-nosnippet>2846</a>            .unwrap();
-<a href=#2847 id=2847 data-nosnippet>2847</a>
-<a href=#2848 id=2848 data-nosnippet>2848</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#2849 id=2849 data-nosnippet>2849</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#2850 id=2850 data-nosnippet>2850</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"data_bucket"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#2851 id=2851 data-nosnippet>2851</a>            .unwrap()
-<a href=#2852 id=2852 data-nosnippet>2852</a>            .build();
-<a href=#2853 id=2853 data-nosnippet>2853</a>
-<a href=#2854 id=2854 data-nosnippet>2854</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#2855 id=2855 data-nosnippet>2855</a>            initial_schema,
-<a href=#2856 id=2856 data-nosnippet>2856</a>            partition_spec,
-<a href=#2857 id=2857 data-nosnippet>2857</a>            SortOrder::unsorted_order(),
-<a href=#2858 id=2858 data-nosnippet>2858</a>            TEST_LOCATION.to_string(),
-<a href=#2859 id=2859 data-nosnippet>2859</a>            FormatVersion::V2,
-<a href=#2860 id=2860 data-nosnippet>2860</a>            HashMap::new(),
-<a href=#2861 id=2861 data-nosnippet>2861</a>        )
-<a href=#2862 id=2862 data-nosnippet>2862</a>        .unwrap()
-<a href=#2863 id=2863 data-nosnippet>2863</a>        .build()
+<a href=#2816 id=2816 data-nosnippet>2816</a>        .build()
+<a href=#2817 id=2817 data-nosnippet>2817</a>        .unwrap()
+<a href=#2818 id=2818 data-nosnippet>2818</a>        .metadata;
+<a href=#2819 id=2819 data-nosnippet>2819</a>
+<a href=#2820 id=2820 data-nosnippet>2820</a>        <span class="kw">let </span>non_conflicting_schema = Schema::builder()
+<a href=#2821 id=2821 data-nosnippet>2821</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2822 id=2822 data-nosnippet>2822</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2823 id=2823 data-nosnippet>2823</a>                NestedField::required(<span class="number">2</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::Int)).into(),
+<a href=#2824 id=2824 data-nosnippet>2824</a>            ])
+<a href=#2825 id=2825 data-nosnippet>2825</a>            .build()
+<a href=#2826 id=2826 data-nosnippet>2826</a>            .unwrap();
+<a href=#2827 id=2827 data-nosnippet>2827</a>
+<a href=#2828 id=2828 data-nosnippet>2828</a>        <span class="comment">// This should succeed since there's no name conflict
+<a href=#2829 id=2829 data-nosnippet>2829</a>        </span><span class="kw">let </span>result = metadata
+<a href=#2830 id=2830 data-nosnippet>2830</a>            .clone()
+<a href=#2831 id=2831 data-nosnippet>2831</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
+<a href=#2832 id=2832 data-nosnippet>2832</a>            .add_current_schema(non_conflicting_schema)
+<a href=#2833 id=2833 data-nosnippet>2833</a>            .unwrap()
+<a href=#2834 id=2834 data-nosnippet>2834</a>            .build();
+<a href=#2835 id=2835 data-nosnippet>2835</a>
+<a href=#2836 id=2836 data-nosnippet>2836</a>        <span class="macro">assert!</span>(result.is_ok());
+<a href=#2837 id=2837 data-nosnippet>2837</a>    }
+<a href=#2838 id=2838 data-nosnippet>2838</a>
+<a href=#2839 id=2839 data-nosnippet>2839</a>    <span class="attr">#[test]
+<a href=#2840 id=2840 data-nosnippet>2840</a>    </span><span class="kw">fn </span>test_partition_spec_evolution_validates_schema_field_name_conflicts() {
+<a href=#2841 id=2841 data-nosnippet>2841</a>        <span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#2842 id=2842 data-nosnippet>2842</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2843 id=2843 data-nosnippet>2843</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2844 id=2844 data-nosnippet>2844</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2845 id=2845 data-nosnippet>2845</a>                    .into(),
+<a href=#2846 id=2846 data-nosnippet>2846</a>            ])
+<a href=#2847 id=2847 data-nosnippet>2847</a>            .build()
+<a href=#2848 id=2848 data-nosnippet>2848</a>            .unwrap();
+<a href=#2849 id=2849 data-nosnippet>2849</a>
+<a href=#2850 id=2850 data-nosnippet>2850</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#2851 id=2851 data-nosnippet>2851</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#2852 id=2852 data-nosnippet>2852</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"data_bucket"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#2853 id=2853 data-nosnippet>2853</a>            .unwrap()
+<a href=#2854 id=2854 data-nosnippet>2854</a>            .build();
+<a href=#2855 id=2855 data-nosnippet>2855</a>
+<a href=#2856 id=2856 data-nosnippet>2856</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#2857 id=2857 data-nosnippet>2857</a>            initial_schema,
+<a href=#2858 id=2858 data-nosnippet>2858</a>            partition_spec,
+<a href=#2859 id=2859 data-nosnippet>2859</a>            SortOrder::unsorted_order(),
+<a href=#2860 id=2860 data-nosnippet>2860</a>            TEST_LOCATION.to_string(),
+<a href=#2861 id=2861 data-nosnippet>2861</a>            FormatVersion::V2,
+<a href=#2862 id=2862 data-nosnippet>2862</a>            HashMap::new(),
+<a href=#2863 id=2863 data-nosnippet>2863</a>        )
 <a href=#2864 id=2864 data-nosnippet>2864</a>        .unwrap()
-<a href=#2865 id=2865 data-nosnippet>2865</a>        .metadata;
-<a href=#2866 id=2866 data-nosnippet>2866</a>
-<a href=#2867 id=2867 data-nosnippet>2867</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
-<a href=#2868 id=2868 data-nosnippet>2868</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#2869 id=2869 data-nosnippet>2869</a>        ));
-<a href=#2870 id=2870 data-nosnippet>2870</a>
-<a href=#2871 id=2871 data-nosnippet>2871</a>        <span class="kw">let </span>conflicting_partition_spec = UnboundPartitionSpec::builder()
-<a href=#2872 id=2872 data-nosnippet>2872</a>            .with_spec_id(<span class="number">1</span>)
-<a href=#2873 id=2873 data-nosnippet>2873</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"existing_field"</span>, Transform::Bucket(<span class="number">8</span>))
-<a href=#2874 id=2874 data-nosnippet>2874</a>            .unwrap()
-<a href=#2875 id=2875 data-nosnippet>2875</a>            .build();
-<a href=#2876 id=2876 data-nosnippet>2876</a>
-<a href=#2877 id=2877 data-nosnippet>2877</a>        <span class="kw">let </span>result = builder.add_partition_spec(conflicting_partition_spec);
+<a href=#2865 id=2865 data-nosnippet>2865</a>        .build()
+<a href=#2866 id=2866 data-nosnippet>2866</a>        .unwrap()
+<a href=#2867 id=2867 data-nosnippet>2867</a>        .metadata;
+<a href=#2868 id=2868 data-nosnippet>2868</a>
+<a href=#2869 id=2869 data-nosnippet>2869</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
+<a href=#2870 id=2870 data-nosnippet>2870</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#2871 id=2871 data-nosnippet>2871</a>        ));
+<a href=#2872 id=2872 data-nosnippet>2872</a>
+<a href=#2873 id=2873 data-nosnippet>2873</a>        <span class="kw">let </span>conflicting_partition_spec = UnboundPartitionSpec::builder()
+<a href=#2874 id=2874 data-nosnippet>2874</a>            .with_spec_id(<span class="number">1</span>)
+<a href=#2875 id=2875 data-nosnippet>2875</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"existing_field"</span>, Transform::Bucket(<span class="number">8</span>))
+<a href=#2876 id=2876 data-nosnippet>2876</a>            .unwrap()
+<a href=#2877 id=2877 data-nosnippet>2877</a>            .build();
 <a href=#2878 id=2878 data-nosnippet>2878</a>
-<a href=#2879 id=2879 data-nosnippet>2879</a>        <span class="macro">assert!</span>(result.is_err());
-<a href=#2880 id=2880 data-nosnippet>2880</a>        <span class="kw">let </span>error = result.unwrap_err();
-<a href=#2881 id=2881 data-nosnippet>2881</a>        <span class="kw">let </span>error_message = error.message();
-<a href=#2882 id=2882 data-nosnippet>2882</a>        <span class="comment">// The error comes from our multi-version validation
-<a href=#2883 id=2883 data-nosnippet>2883</a>        </span><span class="macro">assert!</span>(error_message.contains(
-<a href=#2884 id=2884 data-nosnippet>2884</a>            <span class="string">"Cannot create partition with name 'existing_field' that conflicts with schema field"
-<a href=#2885 id=2885 data-nosnippet>2885</a>        </span>));
-<a href=#2886 id=2886 data-nosnippet>2886</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"and is not an identity transform"</span>));
-<a href=#2887 id=2887 data-nosnippet>2887</a>    }
-<a href=#2888 id=2888 data-nosnippet>2888</a>
-<a href=#2889 id=2889 data-nosnippet>2889</a>    <span class="attr">#[test]
-<a href=#2890 id=2890 data-nosnippet>2890</a>    </span><span class="kw">fn </span>test_schema_evolution_validates_against_all_historical_schemas() {
-<a href=#2891 id=2891 data-nosnippet>2891</a>        <span class="comment">// Create a table with an initial schema that has a field "existing_field"
-<a href=#2892 id=2892 data-nosnippet>2892</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#2893 id=2893 data-nosnippet>2893</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2894 id=2894 data-nosnippet>2894</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2895 id=2895 data-nosnippet>2895</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
-<a href=#2896 id=2896 data-nosnippet>2896</a>                    .into(),
-<a href=#2897 id=2897 data-nosnippet>2897</a>            ])
-<a href=#2898 id=2898 data-nosnippet>2898</a>            .build()
-<a href=#2899 id=2899 data-nosnippet>2899</a>            .unwrap();
-<a href=#2900 id=2900 data-nosnippet>2900</a>
-<a href=#2901 id=2901 data-nosnippet>2901</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#2902 id=2902 data-nosnippet>2902</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#2903 id=2903 data-nosnippet>2903</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#2904 id=2904 data-nosnippet>2904</a>            .unwrap()
-<a href=#2905 id=2905 data-nosnippet>2905</a>            .build();
-<a href=#2906 id=2906 data-nosnippet>2906</a>
-<a href=#2907 id=2907 data-nosnippet>2907</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#2908 id=2908 data-nosnippet>2908</a>            initial_schema,
-<a href=#2909 id=2909 data-nosnippet>2909</a>            partition_spec,
-<a href=#2910 id=2910 data-nosnippet>2910</a>            SortOrder::unsorted_order(),
-<a href=#2911 id=2911 data-nosnippet>2911</a>            TEST_LOCATION.to_string(),
-<a href=#2912 id=2912 data-nosnippet>2912</a>            FormatVersion::V2,
-<a href=#2913 id=2913 data-nosnippet>2913</a>            HashMap::new(),
-<a href=#2914 id=2914 data-nosnippet>2914</a>        )
-<a href=#2915 id=2915 data-nosnippet>2915</a>        .unwrap()
-<a href=#2916 id=2916 data-nosnippet>2916</a>        .build()
+<a href=#2879 id=2879 data-nosnippet>2879</a>        <span class="kw">let </span>result = builder.add_partition_spec(conflicting_partition_spec);
+<a href=#2880 id=2880 data-nosnippet>2880</a>
+<a href=#2881 id=2881 data-nosnippet>2881</a>        <span class="macro">assert!</span>(result.is_err());
+<a href=#2882 id=2882 data-nosnippet>2882</a>        <span class="kw">let </span>error = result.unwrap_err();
+<a href=#2883 id=2883 data-nosnippet>2883</a>        <span class="kw">let </span>error_message = error.message();
+<a href=#2884 id=2884 data-nosnippet>2884</a>        <span class="comment">// The error comes from our multi-version validation
+<a href=#2885 id=2885 data-nosnippet>2885</a>        </span><span class="macro">assert!</span>(error_message.contains(
+<a href=#2886 id=2886 data-nosnippet>2886</a>            <span class="string">"Cannot create partition with name 'existing_field' that conflicts with schema field"
+<a href=#2887 id=2887 data-nosnippet>2887</a>        </span>));
+<a href=#2888 id=2888 data-nosnippet>2888</a>        <span class="macro">assert!</span>(error_message.contains(<span class="string">"and is not an identity transform"</span>));
+<a href=#2889 id=2889 data-nosnippet>2889</a>    }
+<a href=#2890 id=2890 data-nosnippet>2890</a>
+<a href=#2891 id=2891 data-nosnippet>2891</a>    <span class="attr">#[test]
+<a href=#2892 id=2892 data-nosnippet>2892</a>    </span><span class="kw">fn </span>test_schema_evolution_validates_against_all_historical_schemas() {
+<a href=#2893 id=2893 data-nosnippet>2893</a>        <span class="comment">// Create a table with an initial schema that has a field "existing_field"
+<a href=#2894 id=2894 data-nosnippet>2894</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#2895 id=2895 data-nosnippet>2895</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2896 id=2896 data-nosnippet>2896</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2897 id=2897 data-nosnippet>2897</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2898 id=2898 data-nosnippet>2898</a>                    .into(),
+<a href=#2899 id=2899 data-nosnippet>2899</a>            ])
+<a href=#2900 id=2900 data-nosnippet>2900</a>            .build()
+<a href=#2901 id=2901 data-nosnippet>2901</a>            .unwrap();
+<a href=#2902 id=2902 data-nosnippet>2902</a>
+<a href=#2903 id=2903 data-nosnippet>2903</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#2904 id=2904 data-nosnippet>2904</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#2905 id=2905 data-nosnippet>2905</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#2906 id=2906 data-nosnippet>2906</a>            .unwrap()
+<a href=#2907 id=2907 data-nosnippet>2907</a>            .build();
+<a href=#2908 id=2908 data-nosnippet>2908</a>
+<a href=#2909 id=2909 data-nosnippet>2909</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#2910 id=2910 data-nosnippet>2910</a>            initial_schema,
+<a href=#2911 id=2911 data-nosnippet>2911</a>            partition_spec,
+<a href=#2912 id=2912 data-nosnippet>2912</a>            SortOrder::unsorted_order(),
+<a href=#2913 id=2913 data-nosnippet>2913</a>            TEST_LOCATION.to_string(),
+<a href=#2914 id=2914 data-nosnippet>2914</a>            FormatVersion::V2,
+<a href=#2915 id=2915 data-nosnippet>2915</a>            HashMap::new(),
+<a href=#2916 id=2916 data-nosnippet>2916</a>        )
 <a href=#2917 id=2917 data-nosnippet>2917</a>        .unwrap()
-<a href=#2918 id=2918 data-nosnippet>2918</a>        .metadata;
-<a href=#2919 id=2919 data-nosnippet>2919</a>
-<a href=#2920 id=2920 data-nosnippet>2920</a>        <span class="comment">// Add a second schema that removes the existing_field but keeps the data field
-<a href=#2921 id=2921 data-nosnippet>2921</a>        </span><span class="kw">let </span>second_schema = Schema::builder()
-<a href=#2922 id=2922 data-nosnippet>2922</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2923 id=2923 data-nosnippet>2923</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2924 id=2924 data-nosnippet>2924</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
-<a href=#2925 id=2925 data-nosnippet>2925</a>                    .into(),
-<a href=#2926 id=2926 data-nosnippet>2926</a>            ])
-<a href=#2927 id=2927 data-nosnippet>2927</a>            .build()
-<a href=#2928 id=2928 data-nosnippet>2928</a>            .unwrap();
-<a href=#2929 id=2929 data-nosnippet>2929</a>
-<a href=#2930 id=2930 data-nosnippet>2930</a>        <span class="kw">let </span>metadata = metadata
-<a href=#2931 id=2931 data-nosnippet>2931</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
-<a href=#2932 id=2932 data-nosnippet>2932</a>            .add_current_schema(second_schema)
-<a href=#2933 id=2933 data-nosnippet>2933</a>            .unwrap()
-<a href=#2934 id=2934 data-nosnippet>2934</a>            .build()
+<a href=#2918 id=2918 data-nosnippet>2918</a>        .build()
+<a href=#2919 id=2919 data-nosnippet>2919</a>        .unwrap()
+<a href=#2920 id=2920 data-nosnippet>2920</a>        .metadata;
+<a href=#2921 id=2921 data-nosnippet>2921</a>
+<a href=#2922 id=2922 data-nosnippet>2922</a>        <span class="comment">// Add a second schema that removes the existing_field but keeps the data field
+<a href=#2923 id=2923 data-nosnippet>2923</a>        </span><span class="kw">let </span>second_schema = Schema::builder()
+<a href=#2924 id=2924 data-nosnippet>2924</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2925 id=2925 data-nosnippet>2925</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2926 id=2926 data-nosnippet>2926</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
+<a href=#2927 id=2927 data-nosnippet>2927</a>                    .into(),
+<a href=#2928 id=2928 data-nosnippet>2928</a>            ])
+<a href=#2929 id=2929 data-nosnippet>2929</a>            .build()
+<a href=#2930 id=2930 data-nosnippet>2930</a>            .unwrap();
+<a href=#2931 id=2931 data-nosnippet>2931</a>
+<a href=#2932 id=2932 data-nosnippet>2932</a>        <span class="kw">let </span>metadata = metadata
+<a href=#2933 id=2933 data-nosnippet>2933</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
+<a href=#2934 id=2934 data-nosnippet>2934</a>            .add_current_schema(second_schema)
 <a href=#2935 id=2935 data-nosnippet>2935</a>            .unwrap()
-<a href=#2936 id=2936 data-nosnippet>2936</a>            .metadata;
-<a href=#2937 id=2937 data-nosnippet>2937</a>
-<a href=#2938 id=2938 data-nosnippet>2938</a>        <span class="comment">// Now try to add a third schema that reintroduces "existing_field"
-<a href=#2939 id=2939 data-nosnippet>2939</a>        // This should succeed because "existing_field" exists in a historical schema,
-<a href=#2940 id=2940 data-nosnippet>2940</a>        // even though there's a partition field named "bucket_data"
-<a href=#2941 id=2941 data-nosnippet>2941</a>        </span><span class="kw">let </span>third_schema = Schema::builder()
-<a href=#2942 id=2942 data-nosnippet>2942</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2943 id=2943 data-nosnippet>2943</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2944 id=2944 data-nosnippet>2944</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
-<a href=#2945 id=2945 data-nosnippet>2945</a>                    .into(),
-<a href=#2946 id=2946 data-nosnippet>2946</a>                NestedField::required(<span class="number">4</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2936 id=2936 data-nosnippet>2936</a>            .build()
+<a href=#2937 id=2937 data-nosnippet>2937</a>            .unwrap()
+<a href=#2938 id=2938 data-nosnippet>2938</a>            .metadata;
+<a href=#2939 id=2939 data-nosnippet>2939</a>
+<a href=#2940 id=2940 data-nosnippet>2940</a>        <span class="comment">// Now try to add a third schema that reintroduces "existing_field"
+<a href=#2941 id=2941 data-nosnippet>2941</a>        // This should succeed because "existing_field" exists in a historical schema,
+<a href=#2942 id=2942 data-nosnippet>2942</a>        // even though there's a partition field named "bucket_data"
+<a href=#2943 id=2943 data-nosnippet>2943</a>        </span><span class="kw">let </span>third_schema = Schema::builder()
+<a href=#2944 id=2944 data-nosnippet>2944</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2945 id=2945 data-nosnippet>2945</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2946 id=2946 data-nosnippet>2946</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
 <a href=#2947 id=2947 data-nosnippet>2947</a>                    .into(),
-<a href=#2948 id=2948 data-nosnippet>2948</a>            ])
-<a href=#2949 id=2949 data-nosnippet>2949</a>            .build()
-<a href=#2950 id=2950 data-nosnippet>2950</a>            .unwrap();
-<a href=#2951 id=2951 data-nosnippet>2951</a>
-<a href=#2952 id=2952 data-nosnippet>2952</a>        <span class="kw">let </span>builder = metadata
-<a href=#2953 id=2953 data-nosnippet>2953</a>            .clone()
-<a href=#2954 id=2954 data-nosnippet>2954</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
-<a href=#2955 id=2955 data-nosnippet>2955</a>
-<a href=#2956 id=2956 data-nosnippet>2956</a>        <span class="comment">// This should succeed because "existing_field" exists in a historical schema
-<a href=#2957 id=2957 data-nosnippet>2957</a>        </span><span class="kw">let </span>result = builder.add_current_schema(third_schema);
-<a href=#2958 id=2958 data-nosnippet>2958</a>        <span class="macro">assert!</span>(result.is_ok());
-<a href=#2959 id=2959 data-nosnippet>2959</a>
-<a href=#2960 id=2960 data-nosnippet>2960</a>        <span class="comment">// However, trying to add a schema field that conflicts with the partition field
-<a href=#2961 id=2961 data-nosnippet>2961</a>        // and doesn't exist in any historical schema should fail
-<a href=#2962 id=2962 data-nosnippet>2962</a>        </span><span class="kw">let </span>conflicting_schema = Schema::builder()
-<a href=#2963 id=2963 data-nosnippet>2963</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2964 id=2964 data-nosnippet>2964</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2965 id=2965 data-nosnippet>2965</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
-<a href=#2966 id=2966 data-nosnippet>2966</a>                    .into(),
-<a href=#2967 id=2967 data-nosnippet>2967</a>                NestedField::required(<span class="number">4</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2948 id=2948 data-nosnippet>2948</a>                NestedField::required(<span class="number">4</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2949 id=2949 data-nosnippet>2949</a>                    .into(),
+<a href=#2950 id=2950 data-nosnippet>2950</a>            ])
+<a href=#2951 id=2951 data-nosnippet>2951</a>            .build()
+<a href=#2952 id=2952 data-nosnippet>2952</a>            .unwrap();
+<a href=#2953 id=2953 data-nosnippet>2953</a>
+<a href=#2954 id=2954 data-nosnippet>2954</a>        <span class="kw">let </span>builder = metadata
+<a href=#2955 id=2955 data-nosnippet>2955</a>            .clone()
+<a href=#2956 id=2956 data-nosnippet>2956</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
+<a href=#2957 id=2957 data-nosnippet>2957</a>
+<a href=#2958 id=2958 data-nosnippet>2958</a>        <span class="comment">// This should succeed because "existing_field" exists in a historical schema
+<a href=#2959 id=2959 data-nosnippet>2959</a>        </span><span class="kw">let </span>result = builder.add_current_schema(third_schema);
+<a href=#2960 id=2960 data-nosnippet>2960</a>        <span class="macro">assert!</span>(result.is_ok());
+<a href=#2961 id=2961 data-nosnippet>2961</a>
+<a href=#2962 id=2962 data-nosnippet>2962</a>        <span class="comment">// However, trying to add a schema field that conflicts with the partition field
+<a href=#2963 id=2963 data-nosnippet>2963</a>        // and doesn't exist in any historical schema should fail
+<a href=#2964 id=2964 data-nosnippet>2964</a>        </span><span class="kw">let </span>conflicting_schema = Schema::builder()
+<a href=#2965 id=2965 data-nosnippet>2965</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2966 id=2966 data-nosnippet>2966</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2967 id=2967 data-nosnippet>2967</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
 <a href=#2968 id=2968 data-nosnippet>2968</a>                    .into(),
-<a href=#2969 id=2969 data-nosnippet>2969</a>                NestedField::required(<span class="number">5</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::String))
-<a href=#2970 id=2970 data-nosnippet>2970</a>                    .into(), <span class="comment">// conflicts with partition field
-<a href=#2971 id=2971 data-nosnippet>2971</a>            </span>])
-<a href=#2972 id=2972 data-nosnippet>2972</a>            .build()
-<a href=#2973 id=2973 data-nosnippet>2973</a>            .unwrap();
-<a href=#2974 id=2974 data-nosnippet>2974</a>
-<a href=#2975 id=2975 data-nosnippet>2975</a>        <span class="kw">let </span>builder2 = metadata.into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
-<a href=#2976 id=2976 data-nosnippet>2976</a>        <span class="kw">let </span>result2 = builder2.add_current_schema(conflicting_schema);
-<a href=#2977 id=2977 data-nosnippet>2977</a>
-<a href=#2978 id=2978 data-nosnippet>2978</a>        <span class="comment">// This should fail because "bucket_data" conflicts with partition field name
-<a href=#2979 id=2979 data-nosnippet>2979</a>        // and doesn't exist in any historical schema
-<a href=#2980 id=2980 data-nosnippet>2980</a>        </span><span class="macro">assert!</span>(result2.is_err());
-<a href=#2981 id=2981 data-nosnippet>2981</a>        <span class="kw">let </span>error = result2.unwrap_err();
-<a href=#2982 id=2982 data-nosnippet>2982</a>        <span class="macro">assert!</span>(error.message().contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
-<a href=#2983 id=2983 data-nosnippet>2983</a>    }
-<a href=#2984 id=2984 data-nosnippet>2984</a>
-<a href=#2985 id=2985 data-nosnippet>2985</a>    <span class="attr">#[test]
-<a href=#2986 id=2986 data-nosnippet>2986</a>    </span><span class="kw">fn </span>test_schema_evolution_allows_existing_partition_field_if_exists_in_historical_schema() {
-<a href=#2987 id=2987 data-nosnippet>2987</a>        <span class="comment">// Create initial schema with a field
-<a href=#2988 id=2988 data-nosnippet>2988</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#2989 id=2989 data-nosnippet>2989</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#2990 id=2990 data-nosnippet>2990</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#2991 id=2991 data-nosnippet>2991</a>                NestedField::required(<span class="number">2</span>, <span class="string">"partition_data"</span>, Type::Primitive(PrimitiveType::Int))
-<a href=#2992 id=2992 data-nosnippet>2992</a>                    .into(),
-<a href=#2993 id=2993 data-nosnippet>2993</a>            ])
-<a href=#2994 id=2994 data-nosnippet>2994</a>            .build()
-<a href=#2995 id=2995 data-nosnippet>2995</a>            .unwrap();
-<a href=#2996 id=2996 data-nosnippet>2996</a>
-<a href=#2997 id=2997 data-nosnippet>2997</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#2998 id=2998 data-nosnippet>2998</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#2999 id=2999 data-nosnippet>2999</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"partition_data"</span>, Transform::Identity)
-<a href=#3000 id=3000 data-nosnippet>3000</a>            .unwrap()
-<a href=#3001 id=3001 data-nosnippet>3001</a>            .build();
-<a href=#3002 id=3002 data-nosnippet>3002</a>
-<a href=#3003 id=3003 data-nosnippet>3003</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#3004 id=3004 data-nosnippet>3004</a>            initial_schema,
-<a href=#3005 id=3005 data-nosnippet>3005</a>            partition_spec,
-<a href=#3006 id=3006 data-nosnippet>3006</a>            SortOrder::unsorted_order(),
-<a href=#3007 id=3007 data-nosnippet>3007</a>            TEST_LOCATION.to_string(),
-<a href=#3008 id=3008 data-nosnippet>3008</a>            FormatVersion::V2,
-<a href=#3009 id=3009 data-nosnippet>3009</a>            HashMap::new(),
-<a href=#3010 id=3010 data-nosnippet>3010</a>        )
-<a href=#3011 id=3011 data-nosnippet>3011</a>        .unwrap()
-<a href=#3012 id=3012 data-nosnippet>3012</a>        .build()
+<a href=#2969 id=2969 data-nosnippet>2969</a>                NestedField::required(<span class="number">4</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2970 id=2970 data-nosnippet>2970</a>                    .into(),
+<a href=#2971 id=2971 data-nosnippet>2971</a>                NestedField::required(<span class="number">5</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::String))
+<a href=#2972 id=2972 data-nosnippet>2972</a>                    .into(), <span class="comment">// conflicts with partition field
+<a href=#2973 id=2973 data-nosnippet>2973</a>            </span>])
+<a href=#2974 id=2974 data-nosnippet>2974</a>            .build()
+<a href=#2975 id=2975 data-nosnippet>2975</a>            .unwrap();
+<a href=#2976 id=2976 data-nosnippet>2976</a>
+<a href=#2977 id=2977 data-nosnippet>2977</a>        <span class="kw">let </span>builder2 = metadata.into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
+<a href=#2978 id=2978 data-nosnippet>2978</a>        <span class="kw">let </span>result2 = builder2.add_current_schema(conflicting_schema);
+<a href=#2979 id=2979 data-nosnippet>2979</a>
+<a href=#2980 id=2980 data-nosnippet>2980</a>        <span class="comment">// This should fail because "bucket_data" conflicts with partition field name
+<a href=#2981 id=2981 data-nosnippet>2981</a>        // and doesn't exist in any historical schema
+<a href=#2982 id=2982 data-nosnippet>2982</a>        </span><span class="macro">assert!</span>(result2.is_err());
+<a href=#2983 id=2983 data-nosnippet>2983</a>        <span class="kw">let </span>error = result2.unwrap_err();
+<a href=#2984 id=2984 data-nosnippet>2984</a>        <span class="macro">assert!</span>(error.message().contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
+<a href=#2985 id=2985 data-nosnippet>2985</a>    }
+<a href=#2986 id=2986 data-nosnippet>2986</a>
+<a href=#2987 id=2987 data-nosnippet>2987</a>    <span class="attr">#[test]
+<a href=#2988 id=2988 data-nosnippet>2988</a>    </span><span class="kw">fn </span>test_schema_evolution_allows_existing_partition_field_if_exists_in_historical_schema() {
+<a href=#2989 id=2989 data-nosnippet>2989</a>        <span class="comment">// Create initial schema with a field
+<a href=#2990 id=2990 data-nosnippet>2990</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#2991 id=2991 data-nosnippet>2991</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#2992 id=2992 data-nosnippet>2992</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#2993 id=2993 data-nosnippet>2993</a>                NestedField::required(<span class="number">2</span>, <span class="string">"partition_data"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#2994 id=2994 data-nosnippet>2994</a>                    .into(),
+<a href=#2995 id=2995 data-nosnippet>2995</a>            ])
+<a href=#2996 id=2996 data-nosnippet>2996</a>            .build()
+<a href=#2997 id=2997 data-nosnippet>2997</a>            .unwrap();
+<a href=#2998 id=2998 data-nosnippet>2998</a>
+<a href=#2999 id=2999 data-nosnippet>2999</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#3000 id=3000 data-nosnippet>3000</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#3001 id=3001 data-nosnippet>3001</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"partition_data"</span>, Transform::Identity)
+<a href=#3002 id=3002 data-nosnippet>3002</a>            .unwrap()
+<a href=#3003 id=3003 data-nosnippet>3003</a>            .build();
+<a href=#3004 id=3004 data-nosnippet>3004</a>
+<a href=#3005 id=3005 data-nosnippet>3005</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#3006 id=3006 data-nosnippet>3006</a>            initial_schema,
+<a href=#3007 id=3007 data-nosnippet>3007</a>            partition_spec,
+<a href=#3008 id=3008 data-nosnippet>3008</a>            SortOrder::unsorted_order(),
+<a href=#3009 id=3009 data-nosnippet>3009</a>            TEST_LOCATION.to_string(),
+<a href=#3010 id=3010 data-nosnippet>3010</a>            FormatVersion::V2,
+<a href=#3011 id=3011 data-nosnippet>3011</a>            HashMap::new(),
+<a href=#3012 id=3012 data-nosnippet>3012</a>        )
 <a href=#3013 id=3013 data-nosnippet>3013</a>        .unwrap()
-<a href=#3014 id=3014 data-nosnippet>3014</a>        .metadata;
-<a href=#3015 id=3015 data-nosnippet>3015</a>
-<a href=#3016 id=3016 data-nosnippet>3016</a>        <span class="comment">// Add a new schema that still contains the partition_data field
-<a href=#3017 id=3017 data-nosnippet>3017</a>        </span><span class="kw">let </span>evolved_schema = Schema::builder()
-<a href=#3018 id=3018 data-nosnippet>3018</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#3019 id=3019 data-nosnippet>3019</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#3020 id=3020 data-nosnippet>3020</a>                NestedField::required(<span class="number">2</span>, <span class="string">"partition_data"</span>, Type::Primitive(PrimitiveType::Int))
-<a href=#3021 id=3021 data-nosnippet>3021</a>                    .into(),
-<a href=#3022 id=3022 data-nosnippet>3022</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
+<a href=#3014 id=3014 data-nosnippet>3014</a>        .build()
+<a href=#3015 id=3015 data-nosnippet>3015</a>        .unwrap()
+<a href=#3016 id=3016 data-nosnippet>3016</a>        .metadata;
+<a href=#3017 id=3017 data-nosnippet>3017</a>
+<a href=#3018 id=3018 data-nosnippet>3018</a>        <span class="comment">// Add a new schema that still contains the partition_data field
+<a href=#3019 id=3019 data-nosnippet>3019</a>        </span><span class="kw">let </span>evolved_schema = Schema::builder()
+<a href=#3020 id=3020 data-nosnippet>3020</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#3021 id=3021 data-nosnippet>3021</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#3022 id=3022 data-nosnippet>3022</a>                NestedField::required(<span class="number">2</span>, <span class="string">"partition_data"</span>, Type::Primitive(PrimitiveType::Int))
 <a href=#3023 id=3023 data-nosnippet>3023</a>                    .into(),
-<a href=#3024 id=3024 data-nosnippet>3024</a>            ])
-<a href=#3025 id=3025 data-nosnippet>3025</a>            .build()
-<a href=#3026 id=3026 data-nosnippet>3026</a>            .unwrap();
-<a href=#3027 id=3027 data-nosnippet>3027</a>
-<a href=#3028 id=3028 data-nosnippet>3028</a>        <span class="comment">// This should succeed because partition_data exists in historical schemas
-<a href=#3029 id=3029 data-nosnippet>3029</a>        </span><span class="kw">let </span>result = metadata
-<a href=#3030 id=3030 data-nosnippet>3030</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
-<a href=#3031 id=3031 data-nosnippet>3031</a>            .add_current_schema(evolved_schema);
-<a href=#3032 id=3032 data-nosnippet>3032</a>
-<a href=#3033 id=3033 data-nosnippet>3033</a>        <span class="macro">assert!</span>(result.is_ok());
-<a href=#3034 id=3034 data-nosnippet>3034</a>    }
-<a href=#3035 id=3035 data-nosnippet>3035</a>
-<a href=#3036 id=3036 data-nosnippet>3036</a>    <span class="attr">#[test]
-<a href=#3037 id=3037 data-nosnippet>3037</a>    </span><span class="kw">fn </span>test_schema_evolution_prevents_new_field_conflicting_with_partition_field() {
-<a href=#3038 id=3038 data-nosnippet>3038</a>        <span class="comment">// Create initial schema WITHOUT the conflicting field
-<a href=#3039 id=3039 data-nosnippet>3039</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#3040 id=3040 data-nosnippet>3040</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#3041 id=3041 data-nosnippet>3041</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#3042 id=3042 data-nosnippet>3042</a>            ])
-<a href=#3043 id=3043 data-nosnippet>3043</a>            .build()
-<a href=#3044 id=3044 data-nosnippet>3044</a>            .unwrap();
-<a href=#3045 id=3045 data-nosnippet>3045</a>
-<a href=#3046 id=3046 data-nosnippet>3046</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#3047 id=3047 data-nosnippet>3047</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#3048 id=3048 data-nosnippet>3048</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#3049 id=3049 data-nosnippet>3049</a>            .unwrap()
-<a href=#3050 id=3050 data-nosnippet>3050</a>            .build();
-<a href=#3051 id=3051 data-nosnippet>3051</a>
-<a href=#3052 id=3052 data-nosnippet>3052</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#3053 id=3053 data-nosnippet>3053</a>            initial_schema,
-<a href=#3054 id=3054 data-nosnippet>3054</a>            partition_spec,
-<a href=#3055 id=3055 data-nosnippet>3055</a>            SortOrder::unsorted_order(),
-<a href=#3056 id=3056 data-nosnippet>3056</a>            TEST_LOCATION.to_string(),
-<a href=#3057 id=3057 data-nosnippet>3057</a>            FormatVersion::V2,
-<a href=#3058 id=3058 data-nosnippet>3058</a>            HashMap::new(),
-<a href=#3059 id=3059 data-nosnippet>3059</a>        )
-<a href=#3060 id=3060 data-nosnippet>3060</a>        .unwrap()
-<a href=#3061 id=3061 data-nosnippet>3061</a>        .build()
+<a href=#3024 id=3024 data-nosnippet>3024</a>                NestedField::required(<span class="number">3</span>, <span class="string">"new_field"</span>, Type::Primitive(PrimitiveType::String))
+<a href=#3025 id=3025 data-nosnippet>3025</a>                    .into(),
+<a href=#3026 id=3026 data-nosnippet>3026</a>            ])
+<a href=#3027 id=3027 data-nosnippet>3027</a>            .build()
+<a href=#3028 id=3028 data-nosnippet>3028</a>            .unwrap();
+<a href=#3029 id=3029 data-nosnippet>3029</a>
+<a href=#3030 id=3030 data-nosnippet>3030</a>        <span class="comment">// This should succeed because partition_data exists in historical schemas
+<a href=#3031 id=3031 data-nosnippet>3031</a>        </span><span class="kw">let </span>result = metadata
+<a href=#3032 id=3032 data-nosnippet>3032</a>            .into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()))
+<a href=#3033 id=3033 data-nosnippet>3033</a>            .add_current_schema(evolved_schema);
+<a href=#3034 id=3034 data-nosnippet>3034</a>
+<a href=#3035 id=3035 data-nosnippet>3035</a>        <span class="macro">assert!</span>(result.is_ok());
+<a href=#3036 id=3036 data-nosnippet>3036</a>    }
+<a href=#3037 id=3037 data-nosnippet>3037</a>
+<a href=#3038 id=3038 data-nosnippet>3038</a>    <span class="attr">#[test]
+<a href=#3039 id=3039 data-nosnippet>3039</a>    </span><span class="kw">fn </span>test_schema_evolution_prevents_new_field_conflicting_with_partition_field() {
+<a href=#3040 id=3040 data-nosnippet>3040</a>        <span class="comment">// Create initial schema WITHOUT the conflicting field
+<a href=#3041 id=3041 data-nosnippet>3041</a>        </span><span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#3042 id=3042 data-nosnippet>3042</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#3043 id=3043 data-nosnippet>3043</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#3044 id=3044 data-nosnippet>3044</a>            ])
+<a href=#3045 id=3045 data-nosnippet>3045</a>            .build()
+<a href=#3046 id=3046 data-nosnippet>3046</a>            .unwrap();
+<a href=#3047 id=3047 data-nosnippet>3047</a>
+<a href=#3048 id=3048 data-nosnippet>3048</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#3049 id=3049 data-nosnippet>3049</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#3050 id=3050 data-nosnippet>3050</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"bucket_data"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#3051 id=3051 data-nosnippet>3051</a>            .unwrap()
+<a href=#3052 id=3052 data-nosnippet>3052</a>            .build();
+<a href=#3053 id=3053 data-nosnippet>3053</a>
+<a href=#3054 id=3054 data-nosnippet>3054</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#3055 id=3055 data-nosnippet>3055</a>            initial_schema,
+<a href=#3056 id=3056 data-nosnippet>3056</a>            partition_spec,
+<a href=#3057 id=3057 data-nosnippet>3057</a>            SortOrder::unsorted_order(),
+<a href=#3058 id=3058 data-nosnippet>3058</a>            TEST_LOCATION.to_string(),
+<a href=#3059 id=3059 data-nosnippet>3059</a>            FormatVersion::V2,
+<a href=#3060 id=3060 data-nosnippet>3060</a>            HashMap::new(),
+<a href=#3061 id=3061 data-nosnippet>3061</a>        )
 <a href=#3062 id=3062 data-nosnippet>3062</a>        .unwrap()
-<a href=#3063 id=3063 data-nosnippet>3063</a>        .metadata;
-<a href=#3064 id=3064 data-nosnippet>3064</a>
-<a href=#3065 id=3065 data-nosnippet>3065</a>        <span class="comment">// Try to add a schema with a field that conflicts with partition field name
-<a href=#3066 id=3066 data-nosnippet>3066</a>        </span><span class="kw">let </span>conflicting_schema = Schema::builder()
-<a href=#3067 id=3067 data-nosnippet>3067</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#3068 id=3068 data-nosnippet>3068</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#3069 id=3069 data-nosnippet>3069</a>                <span class="comment">// This field name conflicts with the partition field "bucket_data"
-<a href=#3070 id=3070 data-nosnippet>3070</a>                </span>NestedField::required(<span class="number">2</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::Int)).into(),
-<a href=#3071 id=3071 data-nosnippet>3071</a>            ])
-<a href=#3072 id=3072 data-nosnippet>3072</a>            .build()
-<a href=#3073 id=3073 data-nosnippet>3073</a>            .unwrap();
-<a href=#3074 id=3074 data-nosnippet>3074</a>
-<a href=#3075 id=3075 data-nosnippet>3075</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
-<a href=#3076 id=3076 data-nosnippet>3076</a>        <span class="kw">let </span>result = builder.add_current_schema(conflicting_schema);
-<a href=#3077 id=3077 data-nosnippet>3077</a>
-<a href=#3078 id=3078 data-nosnippet>3078</a>        <span class="comment">// This should fail because "bucket_data" conflicts with partition field name
-<a href=#3079 id=3079 data-nosnippet>3079</a>        // and doesn't exist in any historical schema
-<a href=#3080 id=3080 data-nosnippet>3080</a>        </span><span class="macro">assert!</span>(result.is_err());
-<a href=#3081 id=3081 data-nosnippet>3081</a>        <span class="kw">let </span>error = result.unwrap_err();
-<a href=#3082 id=3082 data-nosnippet>3082</a>        <span class="macro">assert!</span>(error.message().contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
-<a href=#3083 id=3083 data-nosnippet>3083</a>    }
-<a href=#3084 id=3084 data-nosnippet>3084</a>
-<a href=#3085 id=3085 data-nosnippet>3085</a>    <span class="attr">#[test]
-<a href=#3086 id=3086 data-nosnippet>3086</a>    </span><span class="kw">fn </span>test_partition_spec_evolution_allows_non_conflicting_names() {
-<a href=#3087 id=3087 data-nosnippet>3087</a>        <span class="kw">let </span>initial_schema = Schema::builder()
-<a href=#3088 id=3088 data-nosnippet>3088</a>            .with_fields(<span class="macro">vec!</span>[
-<a href=#3089 id=3089 data-nosnippet>3089</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
-<a href=#3090 id=3090 data-nosnippet>3090</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
-<a href=#3091 id=3091 data-nosnippet>3091</a>                    .into(),
-<a href=#3092 id=3092 data-nosnippet>3092</a>            ])
-<a href=#3093 id=3093 data-nosnippet>3093</a>            .build()
-<a href=#3094 id=3094 data-nosnippet>3094</a>            .unwrap();
-<a href=#3095 id=3095 data-nosnippet>3095</a>
-<a href=#3096 id=3096 data-nosnippet>3096</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
-<a href=#3097 id=3097 data-nosnippet>3097</a>            .with_spec_id(<span class="number">0</span>)
-<a href=#3098 id=3098 data-nosnippet>3098</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"data_bucket"</span>, Transform::Bucket(<span class="number">16</span>))
-<a href=#3099 id=3099 data-nosnippet>3099</a>            .unwrap()
-<a href=#3100 id=3100 data-nosnippet>3100</a>            .build();
-<a href=#3101 id=3101 data-nosnippet>3101</a>
-<a href=#3102 id=3102 data-nosnippet>3102</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
-<a href=#3103 id=3103 data-nosnippet>3103</a>            initial_schema,
-<a href=#3104 id=3104 data-nosnippet>3104</a>            partition_spec,
-<a href=#3105 id=3105 data-nosnippet>3105</a>            SortOrder::unsorted_order(),
-<a href=#3106 id=3106 data-nosnippet>3106</a>            TEST_LOCATION.to_string(),
-<a href=#3107 id=3107 data-nosnippet>3107</a>            FormatVersion::V2,
-<a href=#3108 id=3108 data-nosnippet>3108</a>            HashMap::new(),
-<a href=#3109 id=3109 data-nosnippet>3109</a>        )
-<a href=#3110 id=3110 data-nosnippet>3110</a>        .unwrap()
-<a href=#3111 id=3111 data-nosnippet>3111</a>        .build()
+<a href=#3063 id=3063 data-nosnippet>3063</a>        .build()
+<a href=#3064 id=3064 data-nosnippet>3064</a>        .unwrap()
+<a href=#3065 id=3065 data-nosnippet>3065</a>        .metadata;
+<a href=#3066 id=3066 data-nosnippet>3066</a>
+<a href=#3067 id=3067 data-nosnippet>3067</a>        <span class="comment">// Try to add a schema with a field that conflicts with partition field name
+<a href=#3068 id=3068 data-nosnippet>3068</a>        </span><span class="kw">let </span>conflicting_schema = Schema::builder()
+<a href=#3069 id=3069 data-nosnippet>3069</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#3070 id=3070 data-nosnippet>3070</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#3071 id=3071 data-nosnippet>3071</a>                <span class="comment">// This field name conflicts with the partition field "bucket_data"
+<a href=#3072 id=3072 data-nosnippet>3072</a>                </span>NestedField::required(<span class="number">2</span>, <span class="string">"bucket_data"</span>, Type::Primitive(PrimitiveType::Int)).into(),
+<a href=#3073 id=3073 data-nosnippet>3073</a>            ])
+<a href=#3074 id=3074 data-nosnippet>3074</a>            .build()
+<a href=#3075 id=3075 data-nosnippet>3075</a>            .unwrap();
+<a href=#3076 id=3076 data-nosnippet>3076</a>
+<a href=#3077 id=3077 data-nosnippet>3077</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(<span class="string">"test_location"</span>.to_string()));
+<a href=#3078 id=3078 data-nosnippet>3078</a>        <span class="kw">let </span>result = builder.add_current_schema(conflicting_schema);
+<a href=#3079 id=3079 data-nosnippet>3079</a>
+<a href=#3080 id=3080 data-nosnippet>3080</a>        <span class="comment">// This should fail because "bucket_data" conflicts with partition field name
+<a href=#3081 id=3081 data-nosnippet>3081</a>        // and doesn't exist in any historical schema
+<a href=#3082 id=3082 data-nosnippet>3082</a>        </span><span class="macro">assert!</span>(result.is_err());
+<a href=#3083 id=3083 data-nosnippet>3083</a>        <span class="kw">let </span>error = result.unwrap_err();
+<a href=#3084 id=3084 data-nosnippet>3084</a>        <span class="macro">assert!</span>(error.message().contains(<span class="string">"Cannot add schema field 'bucket_data' because it conflicts with existing partition field name"</span>));
+<a href=#3085 id=3085 data-nosnippet>3085</a>    }
+<a href=#3086 id=3086 data-nosnippet>3086</a>
+<a href=#3087 id=3087 data-nosnippet>3087</a>    <span class="attr">#[test]
+<a href=#3088 id=3088 data-nosnippet>3088</a>    </span><span class="kw">fn </span>test_partition_spec_evolution_allows_non_conflicting_names() {
+<a href=#3089 id=3089 data-nosnippet>3089</a>        <span class="kw">let </span>initial_schema = Schema::builder()
+<a href=#3090 id=3090 data-nosnippet>3090</a>            .with_fields(<span class="macro">vec!</span>[
+<a href=#3091 id=3091 data-nosnippet>3091</a>                NestedField::required(<span class="number">1</span>, <span class="string">"data"</span>, Type::Primitive(PrimitiveType::String)).into(),
+<a href=#3092 id=3092 data-nosnippet>3092</a>                NestedField::required(<span class="number">2</span>, <span class="string">"existing_field"</span>, Type::Primitive(PrimitiveType::Int))
+<a href=#3093 id=3093 data-nosnippet>3093</a>                    .into(),
+<a href=#3094 id=3094 data-nosnippet>3094</a>            ])
+<a href=#3095 id=3095 data-nosnippet>3095</a>            .build()
+<a href=#3096 id=3096 data-nosnippet>3096</a>            .unwrap();
+<a href=#3097 id=3097 data-nosnippet>3097</a>
+<a href=#3098 id=3098 data-nosnippet>3098</a>        <span class="kw">let </span>partition_spec = UnboundPartitionSpec::builder()
+<a href=#3099 id=3099 data-nosnippet>3099</a>            .with_spec_id(<span class="number">0</span>)
+<a href=#3100 id=3100 data-nosnippet>3100</a>            .add_partition_field(<span class="number">1</span>, <span class="string">"data_bucket"</span>, Transform::Bucket(<span class="number">16</span>))
+<a href=#3101 id=3101 data-nosnippet>3101</a>            .unwrap()
+<a href=#3102 id=3102 data-nosnippet>3102</a>            .build();
+<a href=#3103 id=3103 data-nosnippet>3103</a>
+<a href=#3104 id=3104 data-nosnippet>3104</a>        <span class="kw">let </span>metadata = TableMetadataBuilder::new(
+<a href=#3105 id=3105 data-nosnippet>3105</a>            initial_schema,
+<a href=#3106 id=3106 data-nosnippet>3106</a>            partition_spec,
+<a href=#3107 id=3107 data-nosnippet>3107</a>            SortOrder::unsorted_order(),
+<a href=#3108 id=3108 data-nosnippet>3108</a>            TEST_LOCATION.to_string(),
+<a href=#3109 id=3109 data-nosnippet>3109</a>            FormatVersion::V2,
+<a href=#3110 id=3110 data-nosnippet>3110</a>            HashMap::new(),
+<a href=#3111 id=3111 data-nosnippet>3111</a>        )
 <a href=#3112 id=3112 data-nosnippet>3112</a>        .unwrap()
-<a href=#3113 id=3113 data-nosnippet>3113</a>        .metadata;
-<a href=#3114 id=3114 data-nosnippet>3114</a>
-<a href=#3115 id=3115 data-nosnippet>3115</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
-<a href=#3116 id=3116 data-nosnippet>3116</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#3117 id=3117 data-nosnippet>3117</a>        ));
-<a href=#3118 id=3118 data-nosnippet>3118</a>
-<a href=#3119 id=3119 data-nosnippet>3119</a>        <span class="comment">// Try to add a partition spec with a field name that does NOT conflict with existing schema fields
-<a href=#3120 id=3120 data-nosnippet>3120</a>        </span><span class="kw">let </span>non_conflicting_partition_spec = UnboundPartitionSpec::builder()
-<a href=#3121 id=3121 data-nosnippet>3121</a>            .with_spec_id(<span class="number">1</span>)
-<a href=#3122 id=3122 data-nosnippet>3122</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"new_partition_field"</span>, Transform::Bucket(<span class="number">8</span>))
-<a href=#3123 id=3123 data-nosnippet>3123</a>            .unwrap()
-<a href=#3124 id=3124 data-nosnippet>3124</a>            .build();
-<a href=#3125 id=3125 data-nosnippet>3125</a>
-<a href=#3126 id=3126 data-nosnippet>3126</a>        <span class="kw">let </span>result = builder.add_partition_spec(non_conflicting_partition_spec);
+<a href=#3113 id=3113 data-nosnippet>3113</a>        .build()
+<a href=#3114 id=3114 data-nosnippet>3114</a>        .unwrap()
+<a href=#3115 id=3115 data-nosnippet>3115</a>        .metadata;
+<a href=#3116 id=3116 data-nosnippet>3116</a>
+<a href=#3117 id=3117 data-nosnippet>3117</a>        <span class="kw">let </span>builder = metadata.into_builder(<span class="prelude-val">Some</span>(
+<a href=#3118 id=3118 data-nosnippet>3118</a>            <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#3119 id=3119 data-nosnippet>3119</a>        ));
+<a href=#3120 id=3120 data-nosnippet>3120</a>
+<a href=#3121 id=3121 data-nosnippet>3121</a>        <span class="comment">// Try to add a partition spec with a field name that does NOT conflict with existing schema fields
+<a href=#3122 id=3122 data-nosnippet>3122</a>        </span><span class="kw">let </span>non_conflicting_partition_spec = UnboundPartitionSpec::builder()
+<a href=#3123 id=3123 data-nosnippet>3123</a>            .with_spec_id(<span class="number">1</span>)
+<a href=#3124 id=3124 data-nosnippet>3124</a>            .add_partition_field(<span class="number">2</span>, <span class="string">"new_partition_field"</span>, Transform::Bucket(<span class="number">8</span>))
+<a href=#3125 id=3125 data-nosnippet>3125</a>            .unwrap()
+<a href=#3126 id=3126 data-nosnippet>3126</a>            .build();
 <a href=#3127 id=3127 data-nosnippet>3127</a>
-<a href=#3128 id=3128 data-nosnippet>3128</a>        <span class="macro">assert!</span>(result.is_ok());
-<a href=#3129 id=3129 data-nosnippet>3129</a>    }
-<a href=#3130 id=3130 data-nosnippet>3130</a>
-<a href=#3131 id=3131 data-nosnippet>3131</a>    <span class="attr">#[test]
-<a href=#3132 id=3132 data-nosnippet>3132</a>    </span><span class="kw">fn </span>test_row_lineage_addition() {
-<a href=#3133 id=3133 data-nosnippet>3133</a>        <span class="kw">let </span>new_rows = <span class="number">30</span>;
-<a href=#3134 id=3134 data-nosnippet>3134</a>        <span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
-<a href=#3135 id=3135 data-nosnippet>3135</a>            .build()
-<a href=#3136 id=3136 data-nosnippet>3136</a>            .unwrap()
-<a href=#3137 id=3137 data-nosnippet>3137</a>            .metadata;
-<a href=#3138 id=3138 data-nosnippet>3138</a>        <span class="kw">let </span>add_rows = Snapshot::builder()
-<a href=#3139 id=3139 data-nosnippet>3139</a>            .with_snapshot_id(<span class="number">0</span>)
-<a href=#3140 id=3140 data-nosnippet>3140</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
-<a href=#3141 id=3141 data-nosnippet>3141</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#3142 id=3142 data-nosnippet>3142</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3143 id=3143 data-nosnippet>3143</a>            .with_manifest_list(<span class="string">"foo"</span>)
-<a href=#3144 id=3144 data-nosnippet>3144</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
-<a href=#3145 id=3145 data-nosnippet>3145</a>            .with_summary(Summary {
-<a href=#3146 id=3146 data-nosnippet>3146</a>                operation: Operation::Append,
-<a href=#3147 id=3147 data-nosnippet>3147</a>                additional_properties: HashMap::new(),
-<a href=#3148 id=3148 data-nosnippet>3148</a>            })
-<a href=#3149 id=3149 data-nosnippet>3149</a>            .with_row_range(base.next_row_id(), new_rows)
-<a href=#3150 id=3150 data-nosnippet>3150</a>            .build();
-<a href=#3151 id=3151 data-nosnippet>3151</a>
-<a href=#3152 id=3152 data-nosnippet>3152</a>        <span class="kw">let </span>first_addition = base
-<a href=#3153 id=3153 data-nosnippet>3153</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3154 id=3154 data-nosnippet>3154</a>            .add_snapshot(add_rows.clone())
-<a href=#3155 id=3155 data-nosnippet>3155</a>            .unwrap()
-<a href=#3156 id=3156 data-nosnippet>3156</a>            .build()
+<a href=#3128 id=3128 data-nosnippet>3128</a>        <span class="kw">let </span>result = builder.add_partition_spec(non_conflicting_partition_spec);
+<a href=#3129 id=3129 data-nosnippet>3129</a>
+<a href=#3130 id=3130 data-nosnippet>3130</a>        <span class="macro">assert!</span>(result.is_ok());
+<a href=#3131 id=3131 data-nosnippet>3131</a>    }
+<a href=#3132 id=3132 data-nosnippet>3132</a>
+<a href=#3133 id=3133 data-nosnippet>3133</a>    <span class="attr">#[test]
+<a href=#3134 id=3134 data-nosnippet>3134</a>    </span><span class="kw">fn </span>test_row_lineage_addition() {
+<a href=#3135 id=3135 data-nosnippet>3135</a>        <span class="kw">let </span>new_rows = <span class="number">30</span>;
+<a href=#3136 id=3136 data-nosnippet>3136</a>        <span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
+<a href=#3137 id=3137 data-nosnippet>3137</a>            .build()
+<a href=#3138 id=3138 data-nosnippet>3138</a>            .unwrap()
+<a href=#3139 id=3139 data-nosnippet>3139</a>            .metadata;
+<a href=#3140 id=3140 data-nosnippet>3140</a>        <span class="kw">let </span>add_rows = Snapshot::builder()
+<a href=#3141 id=3141 data-nosnippet>3141</a>            .with_snapshot_id(<span class="number">0</span>)
+<a href=#3142 id=3142 data-nosnippet>3142</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
+<a href=#3143 id=3143 data-nosnippet>3143</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#3144 id=3144 data-nosnippet>3144</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3145 id=3145 data-nosnippet>3145</a>            .with_manifest_list(<span class="string">"foo"</span>)
+<a href=#3146 id=3146 data-nosnippet>3146</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
+<a href=#3147 id=3147 data-nosnippet>3147</a>            .with_summary(Summary {
+<a href=#3148 id=3148 data-nosnippet>3148</a>                operation: Operation::Append,
+<a href=#3149 id=3149 data-nosnippet>3149</a>                additional_properties: HashMap::new(),
+<a href=#3150 id=3150 data-nosnippet>3150</a>            })
+<a href=#3151 id=3151 data-nosnippet>3151</a>            .with_row_range(base.next_row_id(), new_rows)
+<a href=#3152 id=3152 data-nosnippet>3152</a>            .build();
+<a href=#3153 id=3153 data-nosnippet>3153</a>
+<a href=#3154 id=3154 data-nosnippet>3154</a>        <span class="kw">let </span>first_addition = base
+<a href=#3155 id=3155 data-nosnippet>3155</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3156 id=3156 data-nosnippet>3156</a>            .add_snapshot(add_rows.clone())
 <a href=#3157 id=3157 data-nosnippet>3157</a>            .unwrap()
-<a href=#3158 id=3158 data-nosnippet>3158</a>            .metadata;
-<a href=#3159 id=3159 data-nosnippet>3159</a>
-<a href=#3160 id=3160 data-nosnippet>3160</a>        <span class="macro">assert_eq!</span>(first_addition.next_row_id(), new_rows);
+<a href=#3158 id=3158 data-nosnippet>3158</a>            .build()
+<a href=#3159 id=3159 data-nosnippet>3159</a>            .unwrap()
+<a href=#3160 id=3160 data-nosnippet>3160</a>            .metadata;
 <a href=#3161 id=3161 data-nosnippet>3161</a>
-<a href=#3162 id=3162 data-nosnippet>3162</a>        <span class="kw">let </span>add_more_rows = Snapshot::builder()
-<a href=#3163 id=3163 data-nosnippet>3163</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#3164 id=3164 data-nosnippet>3164</a>            .with_timestamp_ms(first_addition.last_updated_ms + <span class="number">1</span>)
-<a href=#3165 id=3165 data-nosnippet>3165</a>            .with_sequence_number(<span class="number">1</span>)
-<a href=#3166 id=3166 data-nosnippet>3166</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3167 id=3167 data-nosnippet>3167</a>            .with_manifest_list(<span class="string">"foo"</span>)
-<a href=#3168 id=3168 data-nosnippet>3168</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">0</span>))
-<a href=#3169 id=3169 data-nosnippet>3169</a>            .with_summary(Summary {
-<a href=#3170 id=3170 data-nosnippet>3170</a>                operation: Operation::Append,
-<a href=#3171 id=3171 data-nosnippet>3171</a>                additional_properties: HashMap::new(),
-<a href=#3172 id=3172 data-nosnippet>3172</a>            })
-<a href=#3173 id=3173 data-nosnippet>3173</a>            .with_row_range(first_addition.next_row_id(), new_rows)
-<a href=#3174 id=3174 data-nosnippet>3174</a>            .build();
-<a href=#3175 id=3175 data-nosnippet>3175</a>
-<a href=#3176 id=3176 data-nosnippet>3176</a>        <span class="kw">let </span>second_addition = first_addition
-<a href=#3177 id=3177 data-nosnippet>3177</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3178 id=3178 data-nosnippet>3178</a>            .add_snapshot(add_more_rows)
-<a href=#3179 id=3179 data-nosnippet>3179</a>            .unwrap()
-<a href=#3180 id=3180 data-nosnippet>3180</a>            .build()
+<a href=#3162 id=3162 data-nosnippet>3162</a>        <span class="macro">assert_eq!</span>(first_addition.next_row_id(), new_rows);
+<a href=#3163 id=3163 data-nosnippet>3163</a>
+<a href=#3164 id=3164 data-nosnippet>3164</a>        <span class="kw">let </span>add_more_rows = Snapshot::builder()
+<a href=#3165 id=3165 data-nosnippet>3165</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#3166 id=3166 data-nosnippet>3166</a>            .with_timestamp_ms(first_addition.last_updated_ms + <span class="number">1</span>)
+<a href=#3167 id=3167 data-nosnippet>3167</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#3168 id=3168 data-nosnippet>3168</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3169 id=3169 data-nosnippet>3169</a>            .with_manifest_list(<span class="string">"foo"</span>)
+<a href=#3170 id=3170 data-nosnippet>3170</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">0</span>))
+<a href=#3171 id=3171 data-nosnippet>3171</a>            .with_summary(Summary {
+<a href=#3172 id=3172 data-nosnippet>3172</a>                operation: Operation::Append,
+<a href=#3173 id=3173 data-nosnippet>3173</a>                additional_properties: HashMap::new(),
+<a href=#3174 id=3174 data-nosnippet>3174</a>            })
+<a href=#3175 id=3175 data-nosnippet>3175</a>            .with_row_range(first_addition.next_row_id(), new_rows)
+<a href=#3176 id=3176 data-nosnippet>3176</a>            .build();
+<a href=#3177 id=3177 data-nosnippet>3177</a>
+<a href=#3178 id=3178 data-nosnippet>3178</a>        <span class="kw">let </span>second_addition = first_addition
+<a href=#3179 id=3179 data-nosnippet>3179</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3180 id=3180 data-nosnippet>3180</a>            .add_snapshot(add_more_rows)
 <a href=#3181 id=3181 data-nosnippet>3181</a>            .unwrap()
-<a href=#3182 id=3182 data-nosnippet>3182</a>            .metadata;
-<a href=#3183 id=3183 data-nosnippet>3183</a>        <span class="macro">assert_eq!</span>(second_addition.next_row_id(), new_rows * <span class="number">2</span>);
-<a href=#3184 id=3184 data-nosnippet>3184</a>    }
-<a href=#3185 id=3185 data-nosnippet>3185</a>
-<a href=#3186 id=3186 data-nosnippet>3186</a>    <span class="attr">#[test]
-<a href=#3187 id=3187 data-nosnippet>3187</a>    </span><span class="kw">fn </span>test_row_lineage_invalid_snapshot() {
-<a href=#3188 id=3188 data-nosnippet>3188</a>        <span class="kw">let </span>new_rows = <span class="number">30</span>;
-<a href=#3189 id=3189 data-nosnippet>3189</a>        <span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
-<a href=#3190 id=3190 data-nosnippet>3190</a>            .build()
-<a href=#3191 id=3191 data-nosnippet>3191</a>            .unwrap()
-<a href=#3192 id=3192 data-nosnippet>3192</a>            .metadata;
-<a href=#3193 id=3193 data-nosnippet>3193</a>
-<a href=#3194 id=3194 data-nosnippet>3194</a>        <span class="comment">// add rows to check TableMetadata validation; Snapshot rejects negative next-row-id
-<a href=#3195 id=3195 data-nosnippet>3195</a>        </span><span class="kw">let </span>add_rows = Snapshot::builder()
-<a href=#3196 id=3196 data-nosnippet>3196</a>            .with_snapshot_id(<span class="number">0</span>)
-<a href=#3197 id=3197 data-nosnippet>3197</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
-<a href=#3198 id=3198 data-nosnippet>3198</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#3199 id=3199 data-nosnippet>3199</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3200 id=3200 data-nosnippet>3200</a>            .with_manifest_list(<span class="string">"foo"</span>)
-<a href=#3201 id=3201 data-nosnippet>3201</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
-<a href=#3202 id=3202 data-nosnippet>3202</a>            .with_summary(Summary {
-<a href=#3203 id=3203 data-nosnippet>3203</a>                operation: Operation::Append,
-<a href=#3204 id=3204 data-nosnippet>3204</a>                additional_properties: HashMap::new(),
-<a href=#3205 id=3205 data-nosnippet>3205</a>            })
-<a href=#3206 id=3206 data-nosnippet>3206</a>            .with_row_range(base.next_row_id(), new_rows)
-<a href=#3207 id=3207 data-nosnippet>3207</a>            .build();
-<a href=#3208 id=3208 data-nosnippet>3208</a>
-<a href=#3209 id=3209 data-nosnippet>3209</a>        <span class="kw">let </span>added = base
-<a href=#3210 id=3210 data-nosnippet>3210</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3211 id=3211 data-nosnippet>3211</a>            .add_snapshot(add_rows)
-<a href=#3212 id=3212 data-nosnippet>3212</a>            .unwrap()
-<a href=#3213 id=3213 data-nosnippet>3213</a>            .build()
+<a href=#3182 id=3182 data-nosnippet>3182</a>            .build()
+<a href=#3183 id=3183 data-nosnippet>3183</a>            .unwrap()
+<a href=#3184 id=3184 data-nosnippet>3184</a>            .metadata;
+<a href=#3185 id=3185 data-nosnippet>3185</a>        <span class="macro">assert_eq!</span>(second_addition.next_row_id(), new_rows * <span class="number">2</span>);
+<a href=#3186 id=3186 data-nosnippet>3186</a>    }
+<a href=#3187 id=3187 data-nosnippet>3187</a>
+<a href=#3188 id=3188 data-nosnippet>3188</a>    <span class="attr">#[test]
+<a href=#3189 id=3189 data-nosnippet>3189</a>    </span><span class="kw">fn </span>test_row_lineage_invalid_snapshot() {
+<a href=#3190 id=3190 data-nosnippet>3190</a>        <span class="kw">let </span>new_rows = <span class="number">30</span>;
+<a href=#3191 id=3191 data-nosnippet>3191</a>        <span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
+<a href=#3192 id=3192 data-nosnippet>3192</a>            .build()
+<a href=#3193 id=3193 data-nosnippet>3193</a>            .unwrap()
+<a href=#3194 id=3194 data-nosnippet>3194</a>            .metadata;
+<a href=#3195 id=3195 data-nosnippet>3195</a>
+<a href=#3196 id=3196 data-nosnippet>3196</a>        <span class="comment">// add rows to check TableMetadata validation; Snapshot rejects negative next-row-id
+<a href=#3197 id=3197 data-nosnippet>3197</a>        </span><span class="kw">let </span>add_rows = Snapshot::builder()
+<a href=#3198 id=3198 data-nosnippet>3198</a>            .with_snapshot_id(<span class="number">0</span>)
+<a href=#3199 id=3199 data-nosnippet>3199</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
+<a href=#3200 id=3200 data-nosnippet>3200</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#3201 id=3201 data-nosnippet>3201</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3202 id=3202 data-nosnippet>3202</a>            .with_manifest_list(<span class="string">"foo"</span>)
+<a href=#3203 id=3203 data-nosnippet>3203</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
+<a href=#3204 id=3204 data-nosnippet>3204</a>            .with_summary(Summary {
+<a href=#3205 id=3205 data-nosnippet>3205</a>                operation: Operation::Append,
+<a href=#3206 id=3206 data-nosnippet>3206</a>                additional_properties: HashMap::new(),
+<a href=#3207 id=3207 data-nosnippet>3207</a>            })
+<a href=#3208 id=3208 data-nosnippet>3208</a>            .with_row_range(base.next_row_id(), new_rows)
+<a href=#3209 id=3209 data-nosnippet>3209</a>            .build();
+<a href=#3210 id=3210 data-nosnippet>3210</a>
+<a href=#3211 id=3211 data-nosnippet>3211</a>        <span class="kw">let </span>added = base
+<a href=#3212 id=3212 data-nosnippet>3212</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3213 id=3213 data-nosnippet>3213</a>            .add_snapshot(add_rows)
 <a href=#3214 id=3214 data-nosnippet>3214</a>            .unwrap()
-<a href=#3215 id=3215 data-nosnippet>3215</a>            .metadata;
-<a href=#3216 id=3216 data-nosnippet>3216</a>
-<a href=#3217 id=3217 data-nosnippet>3217</a>        <span class="kw">let </span>invalid_new_rows = Snapshot::builder()
-<a href=#3218 id=3218 data-nosnippet>3218</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#3219 id=3219 data-nosnippet>3219</a>            .with_timestamp_ms(added.last_updated_ms + <span class="number">1</span>)
-<a href=#3220 id=3220 data-nosnippet>3220</a>            .with_sequence_number(<span class="number">1</span>)
-<a href=#3221 id=3221 data-nosnippet>3221</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3222 id=3222 data-nosnippet>3222</a>            .with_manifest_list(<span class="string">"foo"</span>)
-<a href=#3223 id=3223 data-nosnippet>3223</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">0</span>))
-<a href=#3224 id=3224 data-nosnippet>3224</a>            .with_summary(Summary {
-<a href=#3225 id=3225 data-nosnippet>3225</a>                operation: Operation::Append,
-<a href=#3226 id=3226 data-nosnippet>3226</a>                additional_properties: HashMap::new(),
-<a href=#3227 id=3227 data-nosnippet>3227</a>            })
-<a href=#3228 id=3228 data-nosnippet>3228</a>            <span class="comment">// first_row_id is behind table next_row_id
-<a href=#3229 id=3229 data-nosnippet>3229</a>            </span>.with_row_range(added.next_row_id() - <span class="number">1</span>, <span class="number">10</span>)
-<a href=#3230 id=3230 data-nosnippet>3230</a>            .build();
-<a href=#3231 id=3231 data-nosnippet>3231</a>
-<a href=#3232 id=3232 data-nosnippet>3232</a>        <span class="kw">let </span>err = added
-<a href=#3233 id=3233 data-nosnippet>3233</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3234 id=3234 data-nosnippet>3234</a>            .add_snapshot(invalid_new_rows)
-<a href=#3235 id=3235 data-nosnippet>3235</a>            .unwrap_err();
-<a href=#3236 id=3236 data-nosnippet>3236</a>        <span class="macro">assert!</span>(
-<a href=#3237 id=3237 data-nosnippet>3237</a>            err.to_string().contains(
-<a href=#3238 id=3238 data-nosnippet>3238</a>                <span class="string">"Cannot add a snapshot, first-row-id is behind table next-row-id: 29 &lt; 30"
-<a href=#3239 id=3239 data-nosnippet>3239</a>            </span>)
-<a href=#3240 id=3240 data-nosnippet>3240</a>        );
-<a href=#3241 id=3241 data-nosnippet>3241</a>    }
-<a href=#3242 id=3242 data-nosnippet>3242</a>
-<a href=#3243 id=3243 data-nosnippet>3243</a>    <span class="attr">#[test]
-<a href=#3244 id=3244 data-nosnippet>3244</a>    </span><span class="kw">fn </span>test_row_lineage_append_branch() {
-<a href=#3245 id=3245 data-nosnippet>3245</a>        <span class="comment">// Appends to a branch should still change last-row-id even if not on main, these changes
-<a href=#3246 id=3246 data-nosnippet>3246</a>        // should also affect commits to main
-<a href=#3247 id=3247 data-nosnippet>3247</a>
-<a href=#3248 id=3248 data-nosnippet>3248</a>        </span><span class="kw">let </span>branch = <span class="string">"some_branch"</span>;
+<a href=#3215 id=3215 data-nosnippet>3215</a>            .build()
+<a href=#3216 id=3216 data-nosnippet>3216</a>            .unwrap()
+<a href=#3217 id=3217 data-nosnippet>3217</a>            .metadata;
+<a href=#3218 id=3218 data-nosnippet>3218</a>
+<a href=#3219 id=3219 data-nosnippet>3219</a>        <span class="kw">let </span>invalid_new_rows = Snapshot::builder()
+<a href=#3220 id=3220 data-nosnippet>3220</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#3221 id=3221 data-nosnippet>3221</a>            .with_timestamp_ms(added.last_updated_ms + <span class="number">1</span>)
+<a href=#3222 id=3222 data-nosnippet>3222</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#3223 id=3223 data-nosnippet>3223</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3224 id=3224 data-nosnippet>3224</a>            .with_manifest_list(<span class="string">"foo"</span>)
+<a href=#3225 id=3225 data-nosnippet>3225</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(<span class="number">0</span>))
+<a href=#3226 id=3226 data-nosnippet>3226</a>            .with_summary(Summary {
+<a href=#3227 id=3227 data-nosnippet>3227</a>                operation: Operation::Append,
+<a href=#3228 id=3228 data-nosnippet>3228</a>                additional_properties: HashMap::new(),
+<a href=#3229 id=3229 data-nosnippet>3229</a>            })
+<a href=#3230 id=3230 data-nosnippet>3230</a>            <span class="comment">// first_row_id is behind table next_row_id
+<a href=#3231 id=3231 data-nosnippet>3231</a>            </span>.with_row_range(added.next_row_id() - <span class="number">1</span>, <span class="number">10</span>)
+<a href=#3232 id=3232 data-nosnippet>3232</a>            .build();
+<a href=#3233 id=3233 data-nosnippet>3233</a>
+<a href=#3234 id=3234 data-nosnippet>3234</a>        <span class="kw">let </span>err = added
+<a href=#3235 id=3235 data-nosnippet>3235</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3236 id=3236 data-nosnippet>3236</a>            .add_snapshot(invalid_new_rows)
+<a href=#3237 id=3237 data-nosnippet>3237</a>            .unwrap_err();
+<a href=#3238 id=3238 data-nosnippet>3238</a>        <span class="macro">assert!</span>(
+<a href=#3239 id=3239 data-nosnippet>3239</a>            err.to_string().contains(
+<a href=#3240 id=3240 data-nosnippet>3240</a>                <span class="string">"Cannot add a snapshot, first-row-id is behind table next-row-id: 29 &lt; 30"
+<a href=#3241 id=3241 data-nosnippet>3241</a>            </span>)
+<a href=#3242 id=3242 data-nosnippet>3242</a>        );
+<a href=#3243 id=3243 data-nosnippet>3243</a>    }
+<a href=#3244 id=3244 data-nosnippet>3244</a>
+<a href=#3245 id=3245 data-nosnippet>3245</a>    <span class="attr">#[test]
+<a href=#3246 id=3246 data-nosnippet>3246</a>    </span><span class="kw">fn </span>test_row_lineage_append_branch() {
+<a href=#3247 id=3247 data-nosnippet>3247</a>        <span class="comment">// Appends to a branch should still change last-row-id even if not on main, these changes
+<a href=#3248 id=3248 data-nosnippet>3248</a>        // should also affect commits to main
 <a href=#3249 id=3249 data-nosnippet>3249</a>
-<a href=#3250 id=3250 data-nosnippet>3250</a>        <span class="comment">// Start with V3 metadata to support row lineage
-<a href=#3251 id=3251 data-nosnippet>3251</a>        </span><span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
-<a href=#3252 id=3252 data-nosnippet>3252</a>            .build()
-<a href=#3253 id=3253 data-nosnippet>3253</a>            .unwrap()
-<a href=#3254 id=3254 data-nosnippet>3254</a>            .metadata;
-<a href=#3255 id=3255 data-nosnippet>3255</a>
-<a href=#3256 id=3256 data-nosnippet>3256</a>        <span class="comment">// Initial next_row_id should be 0
-<a href=#3257 id=3257 data-nosnippet>3257</a>        </span><span class="macro">assert_eq!</span>(base.next_row_id(), <span class="number">0</span>);
-<a href=#3258 id=3258 data-nosnippet>3258</a>
-<a href=#3259 id=3259 data-nosnippet>3259</a>        <span class="comment">// Write to Branch - append 30 rows
-<a href=#3260 id=3260 data-nosnippet>3260</a>        </span><span class="kw">let </span>branch_snapshot_1 = Snapshot::builder()
-<a href=#3261 id=3261 data-nosnippet>3261</a>            .with_snapshot_id(<span class="number">1</span>)
-<a href=#3262 id=3262 data-nosnippet>3262</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
-<a href=#3263 id=3263 data-nosnippet>3263</a>            .with_sequence_number(<span class="number">0</span>)
-<a href=#3264 id=3264 data-nosnippet>3264</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3265 id=3265 data-nosnippet>3265</a>            .with_manifest_list(<span class="string">"foo"</span>)
-<a href=#3266 id=3266 data-nosnippet>3266</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
-<a href=#3267 id=3267 data-nosnippet>3267</a>            .with_summary(Summary {
-<a href=#3268 id=3268 data-nosnippet>3268</a>                operation: Operation::Append,
-<a href=#3269 id=3269 data-nosnippet>3269</a>                additional_properties: HashMap::new(),
-<a href=#3270 id=3270 data-nosnippet>3270</a>            })
-<a href=#3271 id=3271 data-nosnippet>3271</a>            .with_row_range(base.next_row_id(), <span class="number">30</span>)
-<a href=#3272 id=3272 data-nosnippet>3272</a>            .build();
-<a href=#3273 id=3273 data-nosnippet>3273</a>
-<a href=#3274 id=3274 data-nosnippet>3274</a>        <span class="kw">let </span>table_after_branch_1 = base
-<a href=#3275 id=3275 data-nosnippet>3275</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3276 id=3276 data-nosnippet>3276</a>            .set_branch_snapshot(branch_snapshot_1.clone(), branch)
-<a href=#3277 id=3277 data-nosnippet>3277</a>            .unwrap()
-<a href=#3278 id=3278 data-nosnippet>3278</a>            .build()
+<a href=#3250 id=3250 data-nosnippet>3250</a>        </span><span class="kw">let </span>branch = <span class="string">"some_branch"</span>;
+<a href=#3251 id=3251 data-nosnippet>3251</a>
+<a href=#3252 id=3252 data-nosnippet>3252</a>        <span class="comment">// Start with V3 metadata to support row lineage
+<a href=#3253 id=3253 data-nosnippet>3253</a>        </span><span class="kw">let </span>base = builder_without_changes(FormatVersion::V3)
+<a href=#3254 id=3254 data-nosnippet>3254</a>            .build()
+<a href=#3255 id=3255 data-nosnippet>3255</a>            .unwrap()
+<a href=#3256 id=3256 data-nosnippet>3256</a>            .metadata;
+<a href=#3257 id=3257 data-nosnippet>3257</a>
+<a href=#3258 id=3258 data-nosnippet>3258</a>        <span class="comment">// Initial next_row_id should be 0
+<a href=#3259 id=3259 data-nosnippet>3259</a>        </span><span class="macro">assert_eq!</span>(base.next_row_id(), <span class="number">0</span>);
+<a href=#3260 id=3260 data-nosnippet>3260</a>
+<a href=#3261 id=3261 data-nosnippet>3261</a>        <span class="comment">// Write to Branch - append 30 rows
+<a href=#3262 id=3262 data-nosnippet>3262</a>        </span><span class="kw">let </span>branch_snapshot_1 = Snapshot::builder()
+<a href=#3263 id=3263 data-nosnippet>3263</a>            .with_snapshot_id(<span class="number">1</span>)
+<a href=#3264 id=3264 data-nosnippet>3264</a>            .with_timestamp_ms(base.last_updated_ms + <span class="number">1</span>)
+<a href=#3265 id=3265 data-nosnippet>3265</a>            .with_sequence_number(<span class="number">0</span>)
+<a href=#3266 id=3266 data-nosnippet>3266</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3267 id=3267 data-nosnippet>3267</a>            .with_manifest_list(<span class="string">"foo"</span>)
+<a href=#3268 id=3268 data-nosnippet>3268</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
+<a href=#3269 id=3269 data-nosnippet>3269</a>            .with_summary(Summary {
+<a href=#3270 id=3270 data-nosnippet>3270</a>                operation: Operation::Append,
+<a href=#3271 id=3271 data-nosnippet>3271</a>                additional_properties: HashMap::new(),
+<a href=#3272 id=3272 data-nosnippet>3272</a>            })
+<a href=#3273 id=3273 data-nosnippet>3273</a>            .with_row_range(base.next_row_id(), <span class="number">30</span>)
+<a href=#3274 id=3274 data-nosnippet>3274</a>            .build();
+<a href=#3275 id=3275 data-nosnippet>3275</a>
+<a href=#3276 id=3276 data-nosnippet>3276</a>        <span class="kw">let </span>table_after_branch_1 = base
+<a href=#3277 id=3277 data-nosnippet>3277</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3278 id=3278 data-nosnippet>3278</a>            .set_branch_snapshot(branch_snapshot_1.clone(), branch)
 <a href=#3279 id=3279 data-nosnippet>3279</a>            .unwrap()
-<a href=#3280 id=3280 data-nosnippet>3280</a>            .metadata;
-<a href=#3281 id=3281 data-nosnippet>3281</a>
-<a href=#3282 id=3282 data-nosnippet>3282</a>        <span class="comment">// Current snapshot should be null (no main branch snapshot yet)
-<a href=#3283 id=3283 data-nosnippet>3283</a>        </span><span class="macro">assert!</span>(table_after_branch_1.current_snapshot().is_none());
-<a href=#3284 id=3284 data-nosnippet>3284</a>
-<a href=#3285 id=3285 data-nosnippet>3285</a>        <span class="comment">// Branch snapshot should have first_row_id = 0
-<a href=#3286 id=3286 data-nosnippet>3286</a>        </span><span class="kw">let </span>branch_ref = table_after_branch_1.refs.get(branch).unwrap();
-<a href=#3287 id=3287 data-nosnippet>3287</a>        <span class="kw">let </span>branch_snap_1 = table_after_branch_1
-<a href=#3288 id=3288 data-nosnippet>3288</a>            .snapshots
-<a href=#3289 id=3289 data-nosnippet>3289</a>            .get(<span class="kw-2">&amp;</span>branch_ref.snapshot_id)
-<a href=#3290 id=3290 data-nosnippet>3290</a>            .unwrap();
-<a href=#3291 id=3291 data-nosnippet>3291</a>        <span class="macro">assert_eq!</span>(branch_snap_1.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">0</span>));
-<a href=#3292 id=3292 data-nosnippet>3292</a>
-<a href=#3293 id=3293 data-nosnippet>3293</a>        <span class="comment">// Next row id should be 30
-<a href=#3294 id=3294 data-nosnippet>3294</a>        </span><span class="macro">assert_eq!</span>(table_after_branch_1.next_row_id(), <span class="number">30</span>);
-<a href=#3295 id=3295 data-nosnippet>3295</a>
-<a href=#3296 id=3296 data-nosnippet>3296</a>        <span class="comment">// Write to Main - append 28 rows
-<a href=#3297 id=3297 data-nosnippet>3297</a>        </span><span class="kw">let </span>main_snapshot = Snapshot::builder()
-<a href=#3298 id=3298 data-nosnippet>3298</a>            .with_snapshot_id(<span class="number">2</span>)
-<a href=#3299 id=3299 data-nosnippet>3299</a>            .with_timestamp_ms(table_after_branch_1.last_updated_ms + <span class="number">1</span>)
-<a href=#3300 id=3300 data-nosnippet>3300</a>            .with_sequence_number(<span class="number">1</span>)
-<a href=#3301 id=3301 data-nosnippet>3301</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3302 id=3302 data-nosnippet>3302</a>            .with_manifest_list(<span class="string">"bar"</span>)
-<a href=#3303 id=3303 data-nosnippet>3303</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
-<a href=#3304 id=3304 data-nosnippet>3304</a>            .with_summary(Summary {
-<a href=#3305 id=3305 data-nosnippet>3305</a>                operation: Operation::Append,
-<a href=#3306 id=3306 data-nosnippet>3306</a>                additional_properties: HashMap::new(),
-<a href=#3307 id=3307 data-nosnippet>3307</a>            })
-<a href=#3308 id=3308 data-nosnippet>3308</a>            .with_row_range(table_after_branch_1.next_row_id(), <span class="number">28</span>)
-<a href=#3309 id=3309 data-nosnippet>3309</a>            .build();
-<a href=#3310 id=3310 data-nosnippet>3310</a>
-<a href=#3311 id=3311 data-nosnippet>3311</a>        <span class="kw">let </span>table_after_main = table_after_branch_1
-<a href=#3312 id=3312 data-nosnippet>3312</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3313 id=3313 data-nosnippet>3313</a>            .add_snapshot(main_snapshot.clone())
-<a href=#3314 id=3314 data-nosnippet>3314</a>            .unwrap()
-<a href=#3315 id=3315 data-nosnippet>3315</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
-<a href=#3316 id=3316 data-nosnippet>3316</a>                snapshot_id: main_snapshot.snapshot_id(),
-<a href=#3317 id=3317 data-nosnippet>3317</a>                retention: SnapshotRetention::Branch {
-<a href=#3318 id=3318 data-nosnippet>3318</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
-<a href=#3319 id=3319 data-nosnippet>3319</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
-<a href=#3320 id=3320 data-nosnippet>3320</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
-<a href=#3321 id=3321 data-nosnippet>3321</a>                },
-<a href=#3322 id=3322 data-nosnippet>3322</a>            })
-<a href=#3323 id=3323 data-nosnippet>3323</a>            .unwrap()
-<a href=#3324 id=3324 data-nosnippet>3324</a>            .build()
+<a href=#3280 id=3280 data-nosnippet>3280</a>            .build()
+<a href=#3281 id=3281 data-nosnippet>3281</a>            .unwrap()
+<a href=#3282 id=3282 data-nosnippet>3282</a>            .metadata;
+<a href=#3283 id=3283 data-nosnippet>3283</a>
+<a href=#3284 id=3284 data-nosnippet>3284</a>        <span class="comment">// Current snapshot should be null (no main branch snapshot yet)
+<a href=#3285 id=3285 data-nosnippet>3285</a>        </span><span class="macro">assert!</span>(table_after_branch_1.current_snapshot().is_none());
+<a href=#3286 id=3286 data-nosnippet>3286</a>
+<a href=#3287 id=3287 data-nosnippet>3287</a>        <span class="comment">// Branch snapshot should have first_row_id = 0
+<a href=#3288 id=3288 data-nosnippet>3288</a>        </span><span class="kw">let </span>branch_ref = table_after_branch_1.refs.get(branch).unwrap();
+<a href=#3289 id=3289 data-nosnippet>3289</a>        <span class="kw">let </span>branch_snap_1 = table_after_branch_1
+<a href=#3290 id=3290 data-nosnippet>3290</a>            .snapshots
+<a href=#3291 id=3291 data-nosnippet>3291</a>            .get(<span class="kw-2">&amp;</span>branch_ref.snapshot_id)
+<a href=#3292 id=3292 data-nosnippet>3292</a>            .unwrap();
+<a href=#3293 id=3293 data-nosnippet>3293</a>        <span class="macro">assert_eq!</span>(branch_snap_1.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">0</span>));
+<a href=#3294 id=3294 data-nosnippet>3294</a>
+<a href=#3295 id=3295 data-nosnippet>3295</a>        <span class="comment">// Next row id should be 30
+<a href=#3296 id=3296 data-nosnippet>3296</a>        </span><span class="macro">assert_eq!</span>(table_after_branch_1.next_row_id(), <span class="number">30</span>);
+<a href=#3297 id=3297 data-nosnippet>3297</a>
+<a href=#3298 id=3298 data-nosnippet>3298</a>        <span class="comment">// Write to Main - append 28 rows
+<a href=#3299 id=3299 data-nosnippet>3299</a>        </span><span class="kw">let </span>main_snapshot = Snapshot::builder()
+<a href=#3300 id=3300 data-nosnippet>3300</a>            .with_snapshot_id(<span class="number">2</span>)
+<a href=#3301 id=3301 data-nosnippet>3301</a>            .with_timestamp_ms(table_after_branch_1.last_updated_ms + <span class="number">1</span>)
+<a href=#3302 id=3302 data-nosnippet>3302</a>            .with_sequence_number(<span class="number">1</span>)
+<a href=#3303 id=3303 data-nosnippet>3303</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3304 id=3304 data-nosnippet>3304</a>            .with_manifest_list(<span class="string">"bar"</span>)
+<a href=#3305 id=3305 data-nosnippet>3305</a>            .with_parent_snapshot_id(<span class="prelude-val">None</span>)
+<a href=#3306 id=3306 data-nosnippet>3306</a>            .with_summary(Summary {
+<a href=#3307 id=3307 data-nosnippet>3307</a>                operation: Operation::Append,
+<a href=#3308 id=3308 data-nosnippet>3308</a>                additional_properties: HashMap::new(),
+<a href=#3309 id=3309 data-nosnippet>3309</a>            })
+<a href=#3310 id=3310 data-nosnippet>3310</a>            .with_row_range(table_after_branch_1.next_row_id(), <span class="number">28</span>)
+<a href=#3311 id=3311 data-nosnippet>3311</a>            .build();
+<a href=#3312 id=3312 data-nosnippet>3312</a>
+<a href=#3313 id=3313 data-nosnippet>3313</a>        <span class="kw">let </span>table_after_main = table_after_branch_1
+<a href=#3314 id=3314 data-nosnippet>3314</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3315 id=3315 data-nosnippet>3315</a>            .add_snapshot(main_snapshot.clone())
+<a href=#3316 id=3316 data-nosnippet>3316</a>            .unwrap()
+<a href=#3317 id=3317 data-nosnippet>3317</a>            .set_ref(MAIN_BRANCH, SnapshotReference {
+<a href=#3318 id=3318 data-nosnippet>3318</a>                snapshot_id: main_snapshot.snapshot_id(),
+<a href=#3319 id=3319 data-nosnippet>3319</a>                retention: SnapshotRetention::Branch {
+<a href=#3320 id=3320 data-nosnippet>3320</a>                    min_snapshots_to_keep: <span class="prelude-val">None</span>,
+<a href=#3321 id=3321 data-nosnippet>3321</a>                    max_snapshot_age_ms: <span class="prelude-val">None</span>,
+<a href=#3322 id=3322 data-nosnippet>3322</a>                    max_ref_age_ms: <span class="prelude-val">None</span>,
+<a href=#3323 id=3323 data-nosnippet>3323</a>                },
+<a href=#3324 id=3324 data-nosnippet>3324</a>            })
 <a href=#3325 id=3325 data-nosnippet>3325</a>            .unwrap()
-<a href=#3326 id=3326 data-nosnippet>3326</a>            .metadata;
-<a href=#3327 id=3327 data-nosnippet>3327</a>
-<a href=#3328 id=3328 data-nosnippet>3328</a>        <span class="comment">// Main snapshot should have first_row_id = 30
-<a href=#3329 id=3329 data-nosnippet>3329</a>        </span><span class="kw">let </span>current_snapshot = table_after_main.current_snapshot().unwrap();
-<a href=#3330 id=3330 data-nosnippet>3330</a>        <span class="macro">assert_eq!</span>(current_snapshot.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">30</span>));
-<a href=#3331 id=3331 data-nosnippet>3331</a>
-<a href=#3332 id=3332 data-nosnippet>3332</a>        <span class="comment">// Next row id should be 58 (30 + 28)
-<a href=#3333 id=3333 data-nosnippet>3333</a>        </span><span class="macro">assert_eq!</span>(table_after_main.next_row_id(), <span class="number">58</span>);
-<a href=#3334 id=3334 data-nosnippet>3334</a>
-<a href=#3335 id=3335 data-nosnippet>3335</a>        <span class="comment">// Write again to branch - append 21 rows
-<a href=#3336 id=3336 data-nosnippet>3336</a>        </span><span class="kw">let </span>branch_snapshot_2 = Snapshot::builder()
-<a href=#3337 id=3337 data-nosnippet>3337</a>            .with_snapshot_id(<span class="number">3</span>)
-<a href=#3338 id=3338 data-nosnippet>3338</a>            .with_timestamp_ms(table_after_main.last_updated_ms + <span class="number">1</span>)
-<a href=#3339 id=3339 data-nosnippet>3339</a>            .with_sequence_number(<span class="number">2</span>)
-<a href=#3340 id=3340 data-nosnippet>3340</a>            .with_schema_id(<span class="number">0</span>)
-<a href=#3341 id=3341 data-nosnippet>3341</a>            .with_manifest_list(<span class="string">"baz"</span>)
-<a href=#3342 id=3342 data-nosnippet>3342</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(branch_snapshot_1.snapshot_id()))
-<a href=#3343 id=3343 data-nosnippet>3343</a>            .with_summary(Summary {
-<a href=#3344 id=3344 data-nosnippet>3344</a>                operation: Operation::Append,
-<a href=#3345 id=3345 data-nosnippet>3345</a>                additional_properties: HashMap::new(),
-<a href=#3346 id=3346 data-nosnippet>3346</a>            })
-<a href=#3347 id=3347 data-nosnippet>3347</a>            .with_row_range(table_after_main.next_row_id(), <span class="number">21</span>)
-<a href=#3348 id=3348 data-nosnippet>3348</a>            .build();
-<a href=#3349 id=3349 data-nosnippet>3349</a>
-<a href=#3350 id=3350 data-nosnippet>3350</a>        <span class="kw">let </span>table_after_branch_2 = table_after_main
-<a href=#3351 id=3351 data-nosnippet>3351</a>            .into_builder(<span class="prelude-val">None</span>)
-<a href=#3352 id=3352 data-nosnippet>3352</a>            .set_branch_snapshot(branch_snapshot_2.clone(), branch)
-<a href=#3353 id=3353 data-nosnippet>3353</a>            .unwrap()
-<a href=#3354 id=3354 data-nosnippet>3354</a>            .build()
+<a href=#3326 id=3326 data-nosnippet>3326</a>            .build()
+<a href=#3327 id=3327 data-nosnippet>3327</a>            .unwrap()
+<a href=#3328 id=3328 data-nosnippet>3328</a>            .metadata;
+<a href=#3329 id=3329 data-nosnippet>3329</a>
+<a href=#3330 id=3330 data-nosnippet>3330</a>        <span class="comment">// Main snapshot should have first_row_id = 30
+<a href=#3331 id=3331 data-nosnippet>3331</a>        </span><span class="kw">let </span>current_snapshot = table_after_main.current_snapshot().unwrap();
+<a href=#3332 id=3332 data-nosnippet>3332</a>        <span class="macro">assert_eq!</span>(current_snapshot.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">30</span>));
+<a href=#3333 id=3333 data-nosnippet>3333</a>
+<a href=#3334 id=3334 data-nosnippet>3334</a>        <span class="comment">// Next row id should be 58 (30 + 28)
+<a href=#3335 id=3335 data-nosnippet>3335</a>        </span><span class="macro">assert_eq!</span>(table_after_main.next_row_id(), <span class="number">58</span>);
+<a href=#3336 id=3336 data-nosnippet>3336</a>
+<a href=#3337 id=3337 data-nosnippet>3337</a>        <span class="comment">// Write again to branch - append 21 rows
+<a href=#3338 id=3338 data-nosnippet>3338</a>        </span><span class="kw">let </span>branch_snapshot_2 = Snapshot::builder()
+<a href=#3339 id=3339 data-nosnippet>3339</a>            .with_snapshot_id(<span class="number">3</span>)
+<a href=#3340 id=3340 data-nosnippet>3340</a>            .with_timestamp_ms(table_after_main.last_updated_ms + <span class="number">1</span>)
+<a href=#3341 id=3341 data-nosnippet>3341</a>            .with_sequence_number(<span class="number">2</span>)
+<a href=#3342 id=3342 data-nosnippet>3342</a>            .with_schema_id(<span class="number">0</span>)
+<a href=#3343 id=3343 data-nosnippet>3343</a>            .with_manifest_list(<span class="string">"baz"</span>)
+<a href=#3344 id=3344 data-nosnippet>3344</a>            .with_parent_snapshot_id(<span class="prelude-val">Some</span>(branch_snapshot_1.snapshot_id()))
+<a href=#3345 id=3345 data-nosnippet>3345</a>            .with_summary(Summary {
+<a href=#3346 id=3346 data-nosnippet>3346</a>                operation: Operation::Append,
+<a href=#3347 id=3347 data-nosnippet>3347</a>                additional_properties: HashMap::new(),
+<a href=#3348 id=3348 data-nosnippet>3348</a>            })
+<a href=#3349 id=3349 data-nosnippet>3349</a>            .with_row_range(table_after_main.next_row_id(), <span class="number">21</span>)
+<a href=#3350 id=3350 data-nosnippet>3350</a>            .build();
+<a href=#3351 id=3351 data-nosnippet>3351</a>
+<a href=#3352 id=3352 data-nosnippet>3352</a>        <span class="kw">let </span>table_after_branch_2 = table_after_main
+<a href=#3353 id=3353 data-nosnippet>3353</a>            .into_builder(<span class="prelude-val">None</span>)
+<a href=#3354 id=3354 data-nosnippet>3354</a>            .set_branch_snapshot(branch_snapshot_2.clone(), branch)
 <a href=#3355 id=3355 data-nosnippet>3355</a>            .unwrap()
-<a href=#3356 id=3356 data-nosnippet>3356</a>            .metadata;
-<a href=#3357 id=3357 data-nosnippet>3357</a>
-<a href=#3358 id=3358 data-nosnippet>3358</a>        <span class="comment">// Branch snapshot should have first_row_id = 58 (30 + 28)
-<a href=#3359 id=3359 data-nosnippet>3359</a>        </span><span class="kw">let </span>branch_ref_2 = table_after_branch_2.refs.get(branch).unwrap();
-<a href=#3360 id=3360 data-nosnippet>3360</a>        <span class="kw">let </span>branch_snap_2 = table_after_branch_2
-<a href=#3361 id=3361 data-nosnippet>3361</a>            .snapshots
-<a href=#3362 id=3362 data-nosnippet>3362</a>            .get(<span class="kw-2">&amp;</span>branch_ref_2.snapshot_id)
-<a href=#3363 id=3363 data-nosnippet>3363</a>            .unwrap();
-<a href=#3364 id=3364 data-nosnippet>3364</a>        <span class="macro">assert_eq!</span>(branch_snap_2.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">58</span>));
-<a href=#3365 id=3365 data-nosnippet>3365</a>
-<a href=#3366 id=3366 data-nosnippet>3366</a>        <span class="comment">// Next row id should be 79 (30 + 28 + 21)
-<a href=#3367 id=3367 data-nosnippet>3367</a>        </span><span class="macro">assert_eq!</span>(table_after_branch_2.next_row_id(), <span class="number">79</span>);
-<a href=#3368 id=3368 data-nosnippet>3368</a>    }
-<a href=#3369 id=3369 data-nosnippet>3369</a>
-<a href=#3370 id=3370 data-nosnippet>3370</a>    <span class="attr">#[test]
-<a href=#3371 id=3371 data-nosnippet>3371</a>    </span><span class="kw">fn </span>test_encryption_keys() {
-<a href=#3372 id=3372 data-nosnippet>3372</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
-<a href=#3373 id=3373 data-nosnippet>3373</a>
-<a href=#3374 id=3374 data-nosnippet>3374</a>        <span class="comment">// Create test encryption keys
-<a href=#3375 id=3375 data-nosnippet>3375</a>        </span><span class="kw">let </span>encryption_key_1 = EncryptedKey::builder()
-<a href=#3376 id=3376 data-nosnippet>3376</a>            .key_id(<span class="string">"key-1"</span>)
-<a href=#3377 id=3377 data-nosnippet>3377</a>            .encrypted_key_metadata(<span class="macro">vec!</span>[<span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span>, <span class="number">4</span>])
-<a href=#3378 id=3378 data-nosnippet>3378</a>            .encrypted_by_id(<span class="string">"encryption-service-1"</span>)
-<a href=#3379 id=3379 data-nosnippet>3379</a>            .properties(HashMap::from_iter(<span class="macro">vec!</span>[(
-<a href=#3380 id=3380 data-nosnippet>3380</a>                <span class="string">"algorithm"</span>.to_string(),
-<a href=#3381 id=3381 data-nosnippet>3381</a>                <span class="string">"AES-256"</span>.to_string(),
-<a href=#3382 id=3382 data-nosnippet>3382</a>            )]))
-<a href=#3383 id=3383 data-nosnippet>3383</a>            .build();
-<a href=#3384 id=3384 data-nosnippet>3384</a>
-<a href=#3385 id=3385 data-nosnippet>3385</a>        <span class="kw">let </span>encryption_key_2 = EncryptedKey::builder()
-<a href=#3386 id=3386 data-nosnippet>3386</a>            .key_id(<span class="string">"key-2"</span>)
-<a href=#3387 id=3387 data-nosnippet>3387</a>            .encrypted_key_metadata(<span class="macro">vec!</span>[<span class="number">5</span>, <span class="number">6</span>, <span class="number">7</span>, <span class="number">8</span>])
-<a href=#3388 id=3388 data-nosnippet>3388</a>            .encrypted_by_id(<span class="string">"encryption-service-2"</span>)
-<a href=#3389 id=3389 data-nosnippet>3389</a>            .properties(HashMap::new())
-<a href=#3390 id=3390 data-nosnippet>3390</a>            .build();
-<a href=#3391 id=3391 data-nosnippet>3391</a>
-<a href=#3392 id=3392 data-nosnippet>3392</a>        <span class="comment">// Add first encryption key
-<a href=#3393 id=3393 data-nosnippet>3393</a>        </span><span class="kw">let </span>build_result = builder
-<a href=#3394 id=3394 data-nosnippet>3394</a>            .add_encryption_key(encryption_key_1.clone())
-<a href=#3395 id=3395 data-nosnippet>3395</a>            .build()
-<a href=#3396 id=3396 data-nosnippet>3396</a>            .unwrap();
-<a href=#3397 id=3397 data-nosnippet>3397</a>
-<a href=#3398 id=3398 data-nosnippet>3398</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#3399 id=3399 data-nosnippet>3399</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
-<a href=#3400 id=3400 data-nosnippet>3400</a>        <span class="macro">assert_eq!</span>(
-<a href=#3401 id=3401 data-nosnippet>3401</a>            build_result.metadata.encryption_key(<span class="string">"key-1"</span>),
-<a href=#3402 id=3402 data-nosnippet>3402</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_1)
-<a href=#3403 id=3403 data-nosnippet>3403</a>        );
-<a href=#3404 id=3404 data-nosnippet>3404</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddEncryptionKey {
-<a href=#3405 id=3405 data-nosnippet>3405</a>            encryption_key: encryption_key_1.clone()
-<a href=#3406 id=3406 data-nosnippet>3406</a>        });
-<a href=#3407 id=3407 data-nosnippet>3407</a>
-<a href=#3408 id=3408 data-nosnippet>3408</a>        <span class="comment">// Add second encryption key
-<a href=#3409 id=3409 data-nosnippet>3409</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#3410 id=3410 data-nosnippet>3410</a>            .metadata
-<a href=#3411 id=3411 data-nosnippet>3411</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#3412 id=3412 data-nosnippet>3412</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
-<a href=#3413 id=3413 data-nosnippet>3413</a>            ))
-<a href=#3414 id=3414 data-nosnippet>3414</a>            .add_encryption_key(encryption_key_2.clone())
-<a href=#3415 id=3415 data-nosnippet>3415</a>            .build()
-<a href=#3416 id=3416 data-nosnippet>3416</a>            .unwrap();
-<a href=#3417 id=3417 data-nosnippet>3417</a>
-<a href=#3418 id=3418 data-nosnippet>3418</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#3419 id=3419 data-nosnippet>3419</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">2</span>);
-<a href=#3420 id=3420 data-nosnippet>3420</a>        <span class="macro">assert_eq!</span>(
-<a href=#3421 id=3421 data-nosnippet>3421</a>            build_result.metadata.encryption_key(<span class="string">"key-1"</span>),
-<a href=#3422 id=3422 data-nosnippet>3422</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_1)
-<a href=#3423 id=3423 data-nosnippet>3423</a>        );
-<a href=#3424 id=3424 data-nosnippet>3424</a>        <span class="macro">assert_eq!</span>(
-<a href=#3425 id=3425 data-nosnippet>3425</a>            build_result.metadata.encryption_key(<span class="string">"key-2"</span>),
-<a href=#3426 id=3426 data-nosnippet>3426</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_2)
-<a href=#3427 id=3427 data-nosnippet>3427</a>        );
-<a href=#3428 id=3428 data-nosnippet>3428</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddEncryptionKey {
-<a href=#3429 id=3429 data-nosnippet>3429</a>            encryption_key: encryption_key_2.clone()
-<a href=#3430 id=3430 data-nosnippet>3430</a>        });
-<a href=#3431 id=3431 data-nosnippet>3431</a>
-<a href=#3432 id=3432 data-nosnippet>3432</a>        <span class="comment">// Try to add duplicate key - should not create a change
-<a href=#3433 id=3433 data-nosnippet>3433</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#3434 id=3434 data-nosnippet>3434</a>            .metadata
-<a href=#3435 id=3435 data-nosnippet>3435</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#3436 id=3436 data-nosnippet>3436</a>                <span class="string">"s3://bucket/test/location/metadata/metadata2.json"</span>.to_string(),
-<a href=#3437 id=3437 data-nosnippet>3437</a>            ))
-<a href=#3438 id=3438 data-nosnippet>3438</a>            .add_encryption_key(encryption_key_1.clone())
-<a href=#3439 id=3439 data-nosnippet>3439</a>            .build()
-<a href=#3440 id=3440 data-nosnippet>3440</a>            .unwrap();
-<a href=#3441 id=3441 data-nosnippet>3441</a>
-<a href=#3442 id=3442 data-nosnippet>3442</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
-<a href=#3443 id=3443 data-nosnippet>3443</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">2</span>);
-<a href=#3444 id=3444 data-nosnippet>3444</a>
-<a href=#3445 id=3445 data-nosnippet>3445</a>        <span class="comment">// Remove first encryption key
-<a href=#3446 id=3446 data-nosnippet>3446</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#3447 id=3447 data-nosnippet>3447</a>            .metadata
-<a href=#3448 id=3448 data-nosnippet>3448</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#3449 id=3449 data-nosnippet>3449</a>                <span class="string">"s3://bucket/test/location/metadata/metadata3.json"</span>.to_string(),
-<a href=#3450 id=3450 data-nosnippet>3450</a>            ))
-<a href=#3451 id=3451 data-nosnippet>3451</a>            .remove_encryption_key(<span class="string">"key-1"</span>)
-<a href=#3452 id=3452 data-nosnippet>3452</a>            .build()
-<a href=#3453 id=3453 data-nosnippet>3453</a>            .unwrap();
-<a href=#3454 id=3454 data-nosnippet>3454</a>
-<a href=#3455 id=3455 data-nosnippet>3455</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#3456 id=3456 data-nosnippet>3456</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
-<a href=#3457 id=3457 data-nosnippet>3457</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_key(<span class="string">"key-1"</span>), <span class="prelude-val">None</span>);
-<a href=#3458 id=3458 data-nosnippet>3458</a>        <span class="macro">assert_eq!</span>(
-<a href=#3459 id=3459 data-nosnippet>3459</a>            build_result.metadata.encryption_key(<span class="string">"key-2"</span>),
-<a href=#3460 id=3460 data-nosnippet>3460</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_2)
-<a href=#3461 id=3461 data-nosnippet>3461</a>        );
-<a href=#3462 id=3462 data-nosnippet>3462</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::RemoveEncryptionKey {
-<a href=#3463 id=3463 data-nosnippet>3463</a>            key_id: <span class="string">"key-1"</span>.to_string()
-<a href=#3464 id=3464 data-nosnippet>3464</a>        });
-<a href=#3465 id=3465 data-nosnippet>3465</a>
-<a href=#3466 id=3466 data-nosnippet>3466</a>        <span class="comment">// Try to remove non-existent key - should not create a change
-<a href=#3467 id=3467 data-nosnippet>3467</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#3468 id=3468 data-nosnippet>3468</a>            .metadata
-<a href=#3469 id=3469 data-nosnippet>3469</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#3470 id=3470 data-nosnippet>3470</a>                <span class="string">"s3://bucket/test/location/metadata/metadata4.json"</span>.to_string(),
-<a href=#3471 id=3471 data-nosnippet>3471</a>            ))
-<a href=#3472 id=3472 data-nosnippet>3472</a>            .remove_encryption_key(<span class="string">"non-existent-key"</span>)
-<a href=#3473 id=3473 data-nosnippet>3473</a>            .build()
-<a href=#3474 id=3474 data-nosnippet>3474</a>            .unwrap();
-<a href=#3475 id=3475 data-nosnippet>3475</a>
-<a href=#3476 id=3476 data-nosnippet>3476</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
-<a href=#3477 id=3477 data-nosnippet>3477</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
-<a href=#3478 id=3478 data-nosnippet>3478</a>
-<a href=#3479 id=3479 data-nosnippet>3479</a>        <span class="comment">// Test encryption_keys_iter()
-<a href=#3480 id=3480 data-nosnippet>3480</a>        </span><span class="kw">let </span>keys = build_result
-<a href=#3481 id=3481 data-nosnippet>3481</a>            .metadata
-<a href=#3482 id=3482 data-nosnippet>3482</a>            .encryption_keys_iter()
-<a href=#3483 id=3483 data-nosnippet>3483</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
-<a href=#3484 id=3484 data-nosnippet>3484</a>        <span class="macro">assert_eq!</span>(keys.len(), <span class="number">1</span>);
-<a href=#3485 id=3485 data-nosnippet>3485</a>        <span class="macro">assert_eq!</span>(keys[<span class="number">0</span>], <span class="kw-2">&amp;</span>encryption_key_2);
-<a href=#3486 id=3486 data-nosnippet>3486</a>
-<a href=#3487 id=3487 data-nosnippet>3487</a>        <span class="comment">// Remove last encryption key
-<a href=#3488 id=3488 data-nosnippet>3488</a>        </span><span class="kw">let </span>build_result = build_result
-<a href=#3489 id=3489 data-nosnippet>3489</a>            .metadata
-<a href=#3490 id=3490 data-nosnippet>3490</a>            .into_builder(<span class="prelude-val">Some</span>(
-<a href=#3491 id=3491 data-nosnippet>3491</a>                <span class="string">"s3://bucket/test/location/metadata/metadata5.json"</span>.to_string(),
-<a href=#3492 id=3492 data-nosnippet>3492</a>            ))
-<a href=#3493 id=3493 data-nosnippet>3493</a>            .remove_encryption_key(<span class="string">"key-2"</span>)
-<a href=#3494 id=3494 data-nosnippet>3494</a>            .build()
-<a href=#3495 id=3495 data-nosnippet>3495</a>            .unwrap();
-<a href=#3496 id=3496 data-nosnippet>3496</a>
-<a href=#3497 id=3497 data-nosnippet>3497</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
-<a href=#3498 id=3498 data-nosnippet>3498</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">0</span>);
-<a href=#3499 id=3499 data-nosnippet>3499</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_key(<span class="string">"key-2"</span>), <span class="prelude-val">None</span>);
-<a href=#3500 id=3500 data-nosnippet>3500</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::RemoveEncryptionKey {
-<a href=#3501 id=3501 data-nosnippet>3501</a>            key_id: <span class="string">"key-2"</span>.to_string()
-<a href=#3502 id=3502 data-nosnippet>3502</a>        });
-<a href=#3503 id=3503 data-nosnippet>3503</a>
-<a href=#3504 id=3504 data-nosnippet>3504</a>        <span class="comment">// Verify empty encryption_keys_iter()
-<a href=#3505 id=3505 data-nosnippet>3505</a>        </span><span class="kw">let </span>keys = build_result.metadata.encryption_keys_iter();
-<a href=#3506 id=3506 data-nosnippet>3506</a>        <span class="macro">assert_eq!</span>(keys.len(), <span class="number">0</span>);
-<a href=#3507 id=3507 data-nosnippet>3507</a>    }
-<a href=#3508 id=3508 data-nosnippet>3508</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file
+<a href=#3356 id=3356 data-nosnippet>3356</a>            .build()
+<a href=#3357 id=3357 data-nosnippet>3357</a>            .unwrap()
+<a href=#3358 id=3358 data-nosnippet>3358</a>            .metadata;
+<a href=#3359 id=3359 data-nosnippet>3359</a>
+<a href=#3360 id=3360 data-nosnippet>3360</a>        <span class="comment">// Branch snapshot should have first_row_id = 58 (30 + 28)
+<a href=#3361 id=3361 data-nosnippet>3361</a>        </span><span class="kw">let </span>branch_ref_2 = table_after_branch_2.refs.get(branch).unwrap();
+<a href=#3362 id=3362 data-nosnippet>3362</a>        <span class="kw">let </span>branch_snap_2 = table_after_branch_2
+<a href=#3363 id=3363 data-nosnippet>3363</a>            .snapshots
+<a href=#3364 id=3364 data-nosnippet>3364</a>            .get(<span class="kw-2">&amp;</span>branch_ref_2.snapshot_id)
+<a href=#3365 id=3365 data-nosnippet>3365</a>            .unwrap();
+<a href=#3366 id=3366 data-nosnippet>3366</a>        <span class="macro">assert_eq!</span>(branch_snap_2.first_row_id(), <span class="prelude-val">Some</span>(<span class="number">58</span>));
+<a href=#3367 id=3367 data-nosnippet>3367</a>
+<a href=#3368 id=3368 data-nosnippet>3368</a>        <span class="comment">// Next row id should be 79 (30 + 28 + 21)
+<a href=#3369 id=3369 data-nosnippet>3369</a>        </span><span class="macro">assert_eq!</span>(table_after_branch_2.next_row_id(), <span class="number">79</span>);
+<a href=#3370 id=3370 data-nosnippet>3370</a>    }
+<a href=#3371 id=3371 data-nosnippet>3371</a>
+<a href=#3372 id=3372 data-nosnippet>3372</a>    <span class="attr">#[test]
+<a href=#3373 id=3373 data-nosnippet>3373</a>    </span><span class="kw">fn </span>test_encryption_keys() {
+<a href=#3374 id=3374 data-nosnippet>3374</a>        <span class="kw">let </span>builder = builder_without_changes(FormatVersion::V2);
+<a href=#3375 id=3375 data-nosnippet>3375</a>
+<a href=#3376 id=3376 data-nosnippet>3376</a>        <span class="comment">// Create test encryption keys
+<a href=#3377 id=3377 data-nosnippet>3377</a>        </span><span class="kw">let </span>encryption_key_1 = EncryptedKey::builder()
+<a href=#3378 id=3378 data-nosnippet>3378</a>            .key_id(<span class="string">"key-1"</span>)
+<a href=#3379 id=3379 data-nosnippet>3379</a>            .encrypted_key_metadata(<span class="macro">vec!</span>[<span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span>, <span class="number">4</span>])
+<a href=#3380 id=3380 data-nosnippet>3380</a>            .encrypted_by_id(<span class="string">"encryption-service-1"</span>)
+<a href=#3381 id=3381 data-nosnippet>3381</a>            .properties(HashMap::from_iter(<span class="macro">vec!</span>[(
+<a href=#3382 id=3382 data-nosnippet>3382</a>                <span class="string">"algorithm"</span>.to_string(),
+<a href=#3383 id=3383 data-nosnippet>3383</a>                <span class="string">"AES-256"</span>.to_string(),
+<a href=#3384 id=3384 data-nosnippet>3384</a>            )]))
+<a href=#3385 id=3385 data-nosnippet>3385</a>            .build();
+<a href=#3386 id=3386 data-nosnippet>3386</a>
+<a href=#3387 id=3387 data-nosnippet>3387</a>        <span class="kw">let </span>encryption_key_2 = EncryptedKey::builder()
+<a href=#3388 id=3388 data-nosnippet>3388</a>            .key_id(<span class="string">"key-2"</span>)
+<a href=#3389 id=3389 data-nosnippet>3389</a>            .encrypted_key_metadata(<span class="macro">vec!</span>[<span class="number">5</span>, <span class="number">6</span>, <span class="number">7</span>, <span class="number">8</span>])
+<a href=#3390 id=3390 data-nosnippet>3390</a>            .encrypted_by_id(<span class="string">"encryption-service-2"</span>)
+<a href=#3391 id=3391 data-nosnippet>3391</a>            .properties(HashMap::new())
+<a href=#3392 id=3392 data-nosnippet>3392</a>            .build();
+<a href=#3393 id=3393 data-nosnippet>3393</a>
+<a href=#3394 id=3394 data-nosnippet>3394</a>        <span class="comment">// Add first encryption key
+<a href=#3395 id=3395 data-nosnippet>3395</a>        </span><span class="kw">let </span>build_result = builder
+<a href=#3396 id=3396 data-nosnippet>3396</a>            .add_encryption_key(encryption_key_1.clone())
+<a href=#3397 id=3397 data-nosnippet>3397</a>            .build()
+<a href=#3398 id=3398 data-nosnippet>3398</a>            .unwrap();
+<a href=#3399 id=3399 data-nosnippet>3399</a>
+<a href=#3400 id=3400 data-nosnippet>3400</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#3401 id=3401 data-nosnippet>3401</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
+<a href=#3402 id=3402 data-nosnippet>3402</a>        <span class="macro">assert_eq!</span>(
+<a href=#3403 id=3403 data-nosnippet>3403</a>            build_result.metadata.encryption_key(<span class="string">"key-1"</span>),
+<a href=#3404 id=3404 data-nosnippet>3404</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_1)
+<a href=#3405 id=3405 data-nosnippet>3405</a>        );
+<a href=#3406 id=3406 data-nosnippet>3406</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddEncryptionKey {
+<a href=#3407 id=3407 data-nosnippet>3407</a>            encryption_key: encryption_key_1.clone()
+<a href=#3408 id=3408 data-nosnippet>3408</a>        });
+<a href=#3409 id=3409 data-nosnippet>3409</a>
+<a href=#3410 id=3410 data-nosnippet>3410</a>        <span class="comment">// Add second encryption key
+<a href=#3411 id=3411 data-nosnippet>3411</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#3412 id=3412 data-nosnippet>3412</a>            .metadata
+<a href=#3413 id=3413 data-nosnippet>3413</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#3414 id=3414 data-nosnippet>3414</a>                <span class="string">"s3://bucket/test/location/metadata/metadata1.json"</span>.to_string(),
+<a href=#3415 id=3415 data-nosnippet>3415</a>            ))
+<a href=#3416 id=3416 data-nosnippet>3416</a>            .add_encryption_key(encryption_key_2.clone())
+<a href=#3417 id=3417 data-nosnippet>3417</a>            .build()
+<a href=#3418 id=3418 data-nosnippet>3418</a>            .unwrap();
+<a href=#3419 id=3419 data-nosnippet>3419</a>
+<a href=#3420 id=3420 data-nosnippet>3420</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#3421 id=3421 data-nosnippet>3421</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">2</span>);
+<a href=#3422 id=3422 data-nosnippet>3422</a>        <span class="macro">assert_eq!</span>(
+<a href=#3423 id=3423 data-nosnippet>3423</a>            build_result.metadata.encryption_key(<span class="string">"key-1"</span>),
+<a href=#3424 id=3424 data-nosnippet>3424</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_1)
+<a href=#3425 id=3425 data-nosnippet>3425</a>        );
+<a href=#3426 id=3426 data-nosnippet>3426</a>        <span class="macro">assert_eq!</span>(
+<a href=#3427 id=3427 data-nosnippet>3427</a>            build_result.metadata.encryption_key(<span class="string">"key-2"</span>),
+<a href=#3428 id=3428 data-nosnippet>3428</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_2)
+<a href=#3429 id=3429 data-nosnippet>3429</a>        );
+<a href=#3430 id=3430 data-nosnippet>3430</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::AddEncryptionKey {
+<a href=#3431 id=3431 data-nosnippet>3431</a>            encryption_key: encryption_key_2.clone()
+<a href=#3432 id=3432 data-nosnippet>3432</a>        });
+<a href=#3433 id=3433 data-nosnippet>3433</a>
+<a href=#3434 id=3434 data-nosnippet>3434</a>        <span class="comment">// Try to add duplicate key - should not create a change
+<a href=#3435 id=3435 data-nosnippet>3435</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#3436 id=3436 data-nosnippet>3436</a>            .metadata
+<a href=#3437 id=3437 data-nosnippet>3437</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#3438 id=3438 data-nosnippet>3438</a>                <span class="string">"s3://bucket/test/location/metadata/metadata2.json"</span>.to_string(),
+<a href=#3439 id=3439 data-nosnippet>3439</a>            ))
+<a href=#3440 id=3440 data-nosnippet>3440</a>            .add_encryption_key(encryption_key_1.clone())
+<a href=#3441 id=3441 data-nosnippet>3441</a>            .build()
+<a href=#3442 id=3442 data-nosnippet>3442</a>            .unwrap();
+<a href=#3443 id=3443 data-nosnippet>3443</a>
+<a href=#3444 id=3444 data-nosnippet>3444</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
+<a href=#3445 id=3445 data-nosnippet>3445</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">2</span>);
+<a href=#3446 id=3446 data-nosnippet>3446</a>
+<a href=#3447 id=3447 data-nosnippet>3447</a>        <span class="comment">// Remove first encryption key
+<a href=#3448 id=3448 data-nosnippet>3448</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#3449 id=3449 data-nosnippet>3449</a>            .metadata
+<a href=#3450 id=3450 data-nosnippet>3450</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#3451 id=3451 data-nosnippet>3451</a>                <span class="string">"s3://bucket/test/location/metadata/metadata3.json"</span>.to_string(),
+<a href=#3452 id=3452 data-nosnippet>3452</a>            ))
+<a href=#3453 id=3453 data-nosnippet>3453</a>            .remove_encryption_key(<span class="string">"key-1"</span>)
+<a href=#3454 id=3454 data-nosnippet>3454</a>            .build()
+<a href=#3455 id=3455 data-nosnippet>3455</a>            .unwrap();
+<a href=#3456 id=3456 data-nosnippet>3456</a>
+<a href=#3457 id=3457 data-nosnippet>3457</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#3458 id=3458 data-nosnippet>3458</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
+<a href=#3459 id=3459 data-nosnippet>3459</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_key(<span class="string">"key-1"</span>), <span class="prelude-val">None</span>);
+<a href=#3460 id=3460 data-nosnippet>3460</a>        <span class="macro">assert_eq!</span>(
+<a href=#3461 id=3461 data-nosnippet>3461</a>            build_result.metadata.encryption_key(<span class="string">"key-2"</span>),
+<a href=#3462 id=3462 data-nosnippet>3462</a>            <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>encryption_key_2)
+<a href=#3463 id=3463 data-nosnippet>3463</a>        );
+<a href=#3464 id=3464 data-nosnippet>3464</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::RemoveEncryptionKey {
+<a href=#3465 id=3465 data-nosnippet>3465</a>            key_id: <span class="string">"key-1"</span>.to_string()
+<a href=#3466 id=3466 data-nosnippet>3466</a>        });
+<a href=#3467 id=3467 data-nosnippet>3467</a>
+<a href=#3468 id=3468 data-nosnippet>3468</a>        <span class="comment">// Try to remove non-existent key - should not create a change
+<a href=#3469 id=3469 data-nosnippet>3469</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#3470 id=3470 data-nosnippet>3470</a>            .metadata
+<a href=#3471 id=3471 data-nosnippet>3471</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#3472 id=3472 data-nosnippet>3472</a>                <span class="string">"s3://bucket/test/location/metadata/metadata4.json"</span>.to_string(),
+<a href=#3473 id=3473 data-nosnippet>3473</a>            ))
+<a href=#3474 id=3474 data-nosnippet>3474</a>            .remove_encryption_key(<span class="string">"non-existent-key"</span>)
+<a href=#3475 id=3475 data-nosnippet>3475</a>            .build()
+<a href=#3476 id=3476 data-nosnippet>3476</a>            .unwrap();
+<a href=#3477 id=3477 data-nosnippet>3477</a>
+<a href=#3478 id=3478 data-nosnippet>3478</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">0</span>);
+<a href=#3479 id=3479 data-nosnippet>3479</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">1</span>);
+<a href=#3480 id=3480 data-nosnippet>3480</a>
+<a href=#3481 id=3481 data-nosnippet>3481</a>        <span class="comment">// Test encryption_keys_iter()
+<a href=#3482 id=3482 data-nosnippet>3482</a>        </span><span class="kw">let </span>keys = build_result
+<a href=#3483 id=3483 data-nosnippet>3483</a>            .metadata
+<a href=#3484 id=3484 data-nosnippet>3484</a>            .encryption_keys_iter()
+<a href=#3485 id=3485 data-nosnippet>3485</a>            .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
+<a href=#3486 id=3486 data-nosnippet>3486</a>        <span class="macro">assert_eq!</span>(keys.len(), <span class="number">1</span>);
+<a href=#3487 id=3487 data-nosnippet>3487</a>        <span class="macro">assert_eq!</span>(keys[<span class="number">0</span>], <span class="kw-2">&amp;</span>encryption_key_2);
+<a href=#3488 id=3488 data-nosnippet>3488</a>
+<a href=#3489 id=3489 data-nosnippet>3489</a>        <span class="comment">// Remove last encryption key
+<a href=#3490 id=3490 data-nosnippet>3490</a>        </span><span class="kw">let </span>build_result = build_result
+<a href=#3491 id=3491 data-nosnippet>3491</a>            .metadata
+<a href=#3492 id=3492 data-nosnippet>3492</a>            .into_builder(<span class="prelude-val">Some</span>(
+<a href=#3493 id=3493 data-nosnippet>3493</a>                <span class="string">"s3://bucket/test/location/metadata/metadata5.json"</span>.to_string(),
+<a href=#3494 id=3494 data-nosnippet>3494</a>            ))
+<a href=#3495 id=3495 data-nosnippet>3495</a>            .remove_encryption_key(<span class="string">"key-2"</span>)
+<a href=#3496 id=3496 data-nosnippet>3496</a>            .build()
+<a href=#3497 id=3497 data-nosnippet>3497</a>            .unwrap();
+<a href=#3498 id=3498 data-nosnippet>3498</a>
+<a href=#3499 id=3499 data-nosnippet>3499</a>        <span class="macro">assert_eq!</span>(build_result.changes.len(), <span class="number">1</span>);
+<a href=#3500 id=3500 data-nosnippet>3500</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_keys.len(), <span class="number">0</span>);
+<a href=#3501 id=3501 data-nosnippet>3501</a>        <span class="macro">assert_eq!</span>(build_result.metadata.encryption_key(<span class="string">"key-2"</span>), <span class="prelude-val">None</span>);
+<a href=#3502 id=3502 data-nosnippet>3502</a>        <span class="macro">assert_eq!</span>(build_result.changes[<span class="number">0</span>], TableUpdate::RemoveEncryptionKey {
+<a href=#3503 id=3503 data-nosnippet>3503</a>            key_id: <span class="string">"key-2"</span>.to_string()
+<a href=#3504 id=3504 data-nosnippet>3504</a>        });
+<a href=#3505 id=3505 data-nosnippet>3505</a>
+<a href=#3506 id=3506 data-nosnippet>3506</a>        <span class="comment">// Verify empty encryption_keys_iter()
+<a href=#3507 id=3507 data-nosnippet>3507</a>        </span><span class="kw">let </span>keys = build_result.metadata.encryption_keys_iter();
+<a href=#3508 id=3508 data-nosnippet>3508</a>        <span class="macro">assert_eq!</span>(keys.len(), <span class="number">0</span>);
+<a href=#3509 id=3509 data-nosnippet>3509</a>    }
+<a href=#3510 id=3510 data-nosnippet>3510</a>}</code></pre></div></section></main></body></html>
\ No newline at end of file