Support for REPLACE TABLE operation #433

anupam-saini · 2024-02-15T20:22:26Z

Closes #281
API proposal (from PR feedback):

table = catalog.create_or_replace_table(identifier, schema, location, partition_spec, sort_order, properties)

TODO:

pyiceberg/schema.py

Fokko · 2024-02-16T10:59:23Z

@anupam-saini Thanks for working on this. I'm not sure if the following API is where people would expect it:

with table.transaction() as transaction:
    transaction.replace_table_with(new_table)

Specially because this is an unsafe operation that breaks for downstream consumers.

I would expect this operation on the catalog itself:

catalog = load_catalog('default')

catalog.create_table('schema.table', schema=...)
catalog.create_or_replace_table('schema.table', schema=...)

We want to generalize this operation, so we don't have to implement this for each of the catalogs. Therefore I would expect this on the Catalog(ABC) itself.

Just a heads up, for the replace table it keeps the history in Spark:

And when we look at the metadata, we can see the previous schema/snapshot as well:

{
  "format-version" : 2,
  "table-uuid" : "9b8b02af-2097-453f-86e2-5b2715e9d37a",
  "location" : "s3://warehouse/default/fokko",
  "last-sequence-number" : 2,
  "last-updated-ms" : 1708081058809,
  "last-column-id" : 2,
  "current-schema-id" : 1,
  "schemas" : [ {
    "type" : "struct",
    "schema-id" : 0,
    "fields" : [ {
      "id" : 1,
      "name" : "name",
      "required" : false,
      "type" : "string"
    } ]
  }, {
    "type" : "struct",
    "schema-id" : 1,
    "fields" : [ {
      "id" : 1,
      "name" : "name",
      "required" : false,
      "type" : "string"
    }, {
      "id" : 2,
      "name" : "age"
      "required" : false,
      "type" : "int"
    } ],
  } ],
  "default-spec-id" : 0,
  "partition-specs" : [ {
    "spec-id" : 0,
    "fields" : [ ]
  } ],
  "last-partition-id" : 999,
  "default-sort-order-id" : 0,
  "sort-orders" : [ {
    "order-id" : 0,
    "fields" : [ ]
  } ],
  "properties" : {
    "owner" : "root",
    "created-at" : "2024-02-16T10:57:38.541088095Z",
    "write.parquet.compression-codec" : "zstd"
  },
  "current-snapshot-id" : 398515508184271470,
  "refs" : {
    "main" : {
      "snapshot-id" : 398515508184271470,
      "type" : "branch"
    }
  },
  "snapshots" : [ {
    "sequence-number" : 1,
    "snapshot-id" : 4615041670163082108,
    "timestamp-ms" : 1708081058629,
    "summary" : {
      "operation" : "append",
      "spark.app.id" : "local-1708080918556",
      "added-data-files" : "1",
      "added-records" : "1",
      "added-files-size" : "416",
      "changed-partition-count" : "1",
      "total-records" : "1",
      "total-files-size" : "416",
      "total-data-files" : "1",
      "total-delete-files" : "0",
      "total-position-deletes" : "0",
      "total-equality-deletes" : "0"
    },
    "manifest-list" : "s3://warehouse/default/fokko/metadata/snap-4615041670163082108-1-d3852ba7-ff54-4abd-99a2-0265206cfbfa.avro",
    "schema-id" : 0
  }, {
    "sequence-number" : 2,
    "snapshot-id" : 398515508184271470,
    "timestamp-ms" : 1708081058809,
    "summary" : {
      "operation" : "append",
      "spark.app.id" : "local-1708080918556",
      "added-data-files" : "1",
      "added-records" : "1",
      "added-files-size" : "628",
      "changed-partition-count" : "1",
      "total-records" : "1",
      "total-files-size" : "628",
      "total-data-files" : "1",
      "total-delete-files" : "0",
      "total-position-deletes" : "0",
      "total-equality-deletes" : "0"
    },
    "manifest-list" : "s3://warehouse/default/fokko/metadata/snap-398515508184271470-1-4d03a8b5-8912-4235-8c18-75400fef9874.avro",
    "schema-id" : 1
  } ],
  "statistics" : [ ],
  "snapshot-log" : [ {
    "timestamp-ms" : 1708081058809,
    "snapshot-id" : 398515508184271470
  } ],
  "metadata-log" : [ {
    "timestamp-ms" : 1708081058629,
    "metadata-file" : "s3://warehouse/default/fokko/metadata/00000-10d2c8d5-f6a2-4dc4-90cb-c545d8ffd497.metadata.json"
  } ]
}

…iceberg-python into as-replace-table-as-select

anupam-saini · 2024-02-16T22:55:40Z

Thank you @Fokko for taking time to explain in such great detail. Now it makes much more sense to have this part of the Catalog API. Made changes as suggested.

…iceberg-python into as-replace-table-as-select

anupam-saini · 2024-03-01T03:54:54Z

Now with Sort Order and Partition Spec updates, this PR has all the necessary pieces for create-replace table operation and is ready for review.

@Fokko @syun64

Fokko

Sorry for the late reply @anupam-saini This is looking great, but looks like there are still some discrepancies with the reference implementation in Java.

Fokko · 2024-03-14T09:08:04Z

pyiceberg/catalog/__init__.py

+                AddPartitionSpecUpdate(spec=new_partition_spec),
+                SetDefaultSpecUpdate(spec_id=-1),
+            )
+            tx._apply(updates, requirements)


With #471 in this is not necessary anymore! 🥳

Suggested change

tx._apply(updates, requirements)

tx._apply(updates, requirements)

Fokko · 2024-03-14T09:31:57Z

pyiceberg/catalog/__init__.py

+        table = self.load_table(identifier)
+        with table.transaction() as tx:
+            base_schema = table.schema()
+            new_schema = assign_fresh_schema_ids(schema_or_type=new_schema, base_schema=base_schema)


Let's consider the following:

CREATE TABLE default.t1 (name string);

Results in:

{ "format-version" : 2, "table-uuid" : "c10da17c-c40c-4e02-9e81-15b6f0f35cb9", "location" : "s3://warehouse/default/t1", "last-sequence-number" : 0, "last-updated-ms" : 1710407936565, "last-column-id" : 1, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ ] } ], "last-partition-id" : 999, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ ] }

CREATE OR REPLACE TABLE default.t1 (name string, age int);

The second schema is added:

{ "format-version" : 2, "table-uuid" : "c10da17c-c40c-4e02-9e81-15b6f0f35cb9", "location" : "s3://warehouse/default/t1", "last-sequence-number" : 0, "last-updated-ms" : 1710407992389, "last-column-id" : 2, "current-schema-id" : 1, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" } ] }, { "type" : "struct", "schema-id" : 1, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" }, { "id" : 2, "name" : "age", "required" : false, "type" : "int" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ ] } ], "last-partition-id" : 999, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710407936565, "metadata-file" : "s3://warehouse/default/t1/metadata/00000-83e6fd53-d3c9-41f9-aeea-b978fb882c7f.metadata.json" } ] }

And then go back to the original schema:

CREATE OR REPLACE TABLE default.t1 (name string);

You'll see that no new schema is being added:

{ "format-version" : 2, "table-uuid" : "c10da17c-c40c-4e02-9e81-15b6f0f35cb9", "location" : "s3://warehouse/default/t1", "last-sequence-number" : 0, "last-updated-ms" : 1710408026710, "last-column-id" : 2, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" } ] }, { "type" : "struct", "schema-id" : 1, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" }, { "id" : 2, "name" : "age", "required" : false, "type" : "int" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ ] } ], "last-partition-id" : 999, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710407936565, "metadata-file" : "s3://warehouse/default/t1/metadata/00000-83e6fd53-d3c9-41f9-aeea-b978fb882c7f.metadata.json" }, { "timestamp-ms" : 1710407992389, "metadata-file" : "s3://warehouse/default/t1/metadata/00001-00192fa8-9019-481a-b4da-ebd99d11eeb9.metadata.json" } ] }

What do you think of re-using the update_schema() class:

with table.transaction() as transaction: with transaction.update_schema(allow_incompatible_changes=True) as update_schema: # Remove old fields removed_column_names = base_schema._name_to_id().keys() - schema._name_to_id().keys() for removed_column_name in removed_column_names: update_schema.delete_column(removed_column_name) # Add new and evolve existing fields update_schema.union_by_name(schema)

^ Pseudocode, could be cleaner. Ideally, the removal should be done with a visit_with_partner (that's the opposite of the union_by_name.

Thanks @Fokko for this detailed explanation.
But we also need to cover the step 2 of this example where we add a new schema, right?

So from my understanding, if the schema fields match with an old schema in the metadata, we do union_by_name with the old schema and set it as the current one
Else, we add the new schema.
Is this correct assessment?

That's correct!

Fokko · 2024-03-14T09:43:40Z

pyiceberg/catalog/__init__.py

+                AddPartitionSpecUpdate(spec=new_partition_spec),
+                SetDefaultSpecUpdate(spec_id=-1),


Same goes here, the spec is being re-used:

CREATE TABLE default.t2 (name string, age int) PARTITIONED BY (name);

{ "format-version" : 2, "table-uuid" : "27f1ab29-7a9f-4324-bb64-c10c5bd2be53", "location" : "s3://warehouse/default/t2", "last-sequence-number" : 0, "last-updated-ms" : 1710409060360, "last-column-id" : 2, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" }, { "id" : 2, "name" : "age", "required" : false, "type" : "int" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ { "name" : "name", "transform" : "identity", "source-id" : 1, "field-id" : 1000 } ] } ], "last-partition-id" : 1000, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ ] }

CREATE OR REPLACE TABLE default.t2 (name string, age int) PARTITIONED BY (name, age);

{ "format-version" : 2, "table-uuid" : "27f1ab29-7a9f-4324-bb64-c10c5bd2be53", "location" : "s3://warehouse/default/t2", "last-sequence-number" : 0, "last-updated-ms" : 1710409079414, "last-column-id" : 2, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" }, { "id" : 2, "name" : "age", "required" : false, "type" : "int" } ] } ], "default-spec-id" : 1, "partition-specs" : [ { "spec-id" : 0, "fields" : [ { "name" : "name", "transform" : "identity", "source-id" : 1, "field-id" : 1000 } ] }, { "spec-id" : 1, "fields" : [ { "name" : "name", "transform" : "identity", "source-id" : 1, "field-id" : 1000 }, { "name" : "age", "transform" : "identity", "source-id" : 2, "field-id" : 1001 } ] } ], "last-partition-id" : 1001, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710409060360, "metadata-file" : "s3://warehouse/default/t2/metadata/00000-bc21fe27-d037-4b98-a8ca-cc1502eb19ec.metadata.json" } ] }

CREATE OR REPLACE TABLE default.t2 (name string, age int) PARTITIONED BY (name);

{ "format-version" : 2, "table-uuid" : "27f1ab29-7a9f-4324-bb64-c10c5bd2be53", "location" : "s3://warehouse/default/t2", "last-sequence-number" : 0, "last-updated-ms" : 1710409086268, "last-column-id" : 2, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" }, { "id" : 2, "name" : "age", "required" : false, "type" : "int" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ { "name" : "name", "transform" : "identity", "source-id" : 1, "field-id" : 1000 } ] }, { "spec-id" : 1, "fields" : [ { "name" : "name", "transform" : "identity", "source-id" : 1, "field-id" : 1000 }, { "name" : "age", "transform" : "identity", "source-id" : 2, "field-id" : 1001 } ] } ], "last-partition-id" : 1001, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710409060360, "metadata-file" : "s3://warehouse/default/t2/metadata/00000-bc21fe27-d037-4b98-a8ca-cc1502eb19ec.metadata.json" }, { "timestamp-ms" : 1710409079414, "metadata-file" : "s3://warehouse/default/t2/metadata/00001-8062294f-a8d6-493d-905f-b82dfe01cb29.metadata.json" } ] }

Ideally, we also want to-reuse the update_spec class here.

Fokko · 2024-03-14T10:23:11Z

pyiceberg/catalog/__init__.py

+            )
+
+            requirements: Tuple[TableRequirement, ...] = (AssertTableUUID(uuid=table.metadata.table_uuid),)
+            updates: Tuple[TableUpdate, ...] = (


We need to clear the snapshots here as well:

CREATE TABLE default.t3 AS SELECT 'Fokko' as name

{ "format-version" : 2, "table-uuid" : "c61404c8-2211-46c7-866f-2eb87022b728", "location" : "s3://warehouse/default/t3", "last-sequence-number" : 1, "last-updated-ms" : 1710409653861, "last-column-id" : 1, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ ] } ], "last-partition-id" : 999, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "created-at" : "2024-03-14T09:47:10.455199504Z", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ { "sequence-number" : 1, "snapshot-id" : 3622792816294171432, "timestamp-ms" : 1710409631964, "summary" : { "operation" : "append", "spark.app.id" : "local-1710405058122", "added-data-files" : "1", "added-records" : "1", "added-files-size" : "416", "changed-partition-count" : "1", "total-records" : "1", "total-files-size" : "416", "total-data-files" : "1", "total-delete-files" : "0", "total-position-deletes" : "0", "total-equality-deletes" : "0" }, "manifest-list" : "s3://warehouse/default/t3/metadata/snap-3622792816294171432-1-e457c732-62e5-41eb-998b-abbb8f021ed5.avro", "schema-id" : 0 } ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710409631964, "metadata-file" : "s3://warehouse/default/t3/metadata/00000-c82191f3-e6e2-4001-8e85-8623e3915ff7.metadata.json" } ] }

CREATE OR REPLACE TABLE default.t3 (name string);

{ "format-version" : 2, "table-uuid" : "c61404c8-2211-46c7-866f-2eb87022b728", "location" : "s3://warehouse/default/t3", "last-sequence-number" : 1, "last-updated-ms" : 1710411760623, "last-column-id" : 1, "current-schema-id" : 0, "schemas" : [ { "type" : "struct", "schema-id" : 0, "fields" : [ { "id" : 1, "name" : "name", "required" : false, "type" : "string" } ] } ], "default-spec-id" : 0, "partition-specs" : [ { "spec-id" : 0, "fields" : [ ] } ], "last-partition-id" : 999, "default-sort-order-id" : 0, "sort-orders" : [ { "order-id" : 0, "fields" : [ ] } ], "properties" : { "owner" : "root", "created-at" : "2024-03-14T09:47:10.455199504Z", "write.parquet.compression-codec" : "zstd" }, "current-snapshot-id" : -1, "refs" : { }, "snapshots" : [ { "sequence-number" : 1, "snapshot-id" : 3622792816294171432, "timestamp-ms" : 1710409631964, "summary" : { "operation" : "append", "spark.app.id" : "local-1710405058122", "added-data-files" : "1", "added-records" : "1", "added-files-size" : "416", "changed-partition-count" : "1", "total-records" : "1", "total-files-size" : "416", "total-data-files" : "1", "total-delete-files" : "0", "total-position-deletes" : "0", "total-equality-deletes" : "0" }, "manifest-list" : "s3://warehouse/default/t3/metadata/snap-3622792816294171432-1-e457c732-62e5-41eb-998b-abbb8f021ed5.avro", "schema-id" : 0 } ], "statistics" : [ ], "snapshot-log" : [ ], "metadata-log" : [ { "timestamp-ms" : 1710409631964, "metadata-file" : "s3://warehouse/default/t3/metadata/00000-c82191f3-e6e2-4001-8e85-8623e3915ff7.metadata.json" }, { "timestamp-ms" : 1710409653861, "metadata-file" : "s3://warehouse/default/t3/metadata/00001-0297d4e7-2468-4c0d-b4ed-ea717df8c3e6.metadata.json" } ] }

anupam-saini added 8 commits February 14, 2024 22:46

Method to generate IDs based on schema

ac59bd6

Support generating IDs based on existing schema

efc71de

Merge branch 'main' into as-replace-table-as-select

e1f81f0

Fix bug

359b8ec

Add API for replacing table

5a9f078

Cleanup

b344516

Cleanup

24fcda4

Fix bug

93587fb

sungwy reviewed Feb 15, 2024

View reviewed changes

pyiceberg/schema.py Outdated Show resolved Hide resolved

anupam-saini added 5 commits February 16, 2024 17:02

Merge branch 'apache:main' into as-replace-table-as-select

b1ea25c

Catalog API for create or replace table

ec36946

Merge branch 'as-replace-table-as-select' of github.com:anupam-saini/…

2e6b8ec

…iceberg-python into as-replace-table-as-select

Fix bug

34f559a

Remove visiting_schema param

bb7a591

anupam-saini added 2 commits February 16, 2024 18:12

Fix bug

1f397a8

Cleanup

e25366e

Fokko added this to the PyIceberg 0.7.0 release milestone Feb 19, 2024

anupam-saini added 6 commits February 19, 2024 12:24

Merge branch 'main' into as-replace-table-as-select

38f4855

Merge branch 'apache:main' into as-replace-table-as-select

d644906

Merge branch 'apache:main' into as-replace-table-as-select

24b6b9f

Remove poetry.lock from PR

aa34637

Add more functionality and test

6b33671

Merge branch 'as-replace-table-as-select' of github.com:anupam-saini/…

0326af3

…iceberg-python into as-replace-table-as-select

anupam-saini marked this pull request as ready for review February 21, 2024 03:54

Add TODO note for sort order update

8d25dda

sungwy mentioned this pull request Feb 22, 2024

REPLACE TABLE Support #281

Open

anupam-saini and others added 2 commits February 25, 2024 11:41

Merge branch 'apache:main' into as-replace-table-as-select

53f2d2c

Merge branch 'main' into as-replace-table-as-select

db62f56

anupam-saini added 3 commits February 29, 2024 13:12

Merge branch 'apache:main' into as-replace-table-as-select

f9ea0cf

Add partition spec and sort order update

9eea538

Merge branch 'main' into as-replace-table-as-select

d7dd4ae

anupam-saini requested a review from sungwy March 1, 2024 03:12

Fokko reviewed Mar 14, 2024

View reviewed changes

anupam-saini added 4 commits March 19, 2024 08:53

Merge branch 'main' into as-replace-table-as-select

ab9ddf2

Merge branch 'apache:main' into as-replace-table-as-select

a8eb07a

Merge branch 'apache:main' into as-replace-table-as-select

b54b357

Merge branch 'apache:main' into as-replace-table-as-select

044896d

HonahX modified the milestones: PyIceberg 0.7.0 release, PyIceberg 0.8.0 release Jul 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for REPLACE TABLE operation #433

Support for REPLACE TABLE operation #433

anupam-saini commented Feb 15, 2024 •

edited

Loading

Fokko commented Feb 16, 2024

anupam-saini commented Feb 16, 2024

anupam-saini commented Mar 1, 2024

Fokko left a comment

Fokko Mar 14, 2024

Fokko Mar 14, 2024

anupam-saini Mar 17, 2024 •

edited

Loading

Fokko Apr 25, 2024

Fokko Mar 14, 2024

Fokko Mar 14, 2024

	tx._apply(updates, requirements)
	tx._apply(updates, requirements)

		AddPartitionSpecUpdate(spec=new_partition_spec),
		SetDefaultSpecUpdate(spec_id=-1),

Support for REPLACE TABLE operation #433

Are you sure you want to change the base?

Support for REPLACE TABLE operation #433

Conversation

anupam-saini commented Feb 15, 2024 • edited Loading

Fokko commented Feb 16, 2024

anupam-saini commented Feb 16, 2024

anupam-saini commented Mar 1, 2024

Fokko left a comment

Choose a reason for hiding this comment

Fokko Mar 14, 2024

Choose a reason for hiding this comment

Fokko Mar 14, 2024

Choose a reason for hiding this comment

anupam-saini Mar 17, 2024 • edited Loading

Choose a reason for hiding this comment

Fokko Apr 25, 2024

Choose a reason for hiding this comment

Fokko Mar 14, 2024

Choose a reason for hiding this comment

Fokko Mar 14, 2024

Choose a reason for hiding this comment

anupam-saini commented Feb 15, 2024 •

edited

Loading

anupam-saini Mar 17, 2024 •

edited

Loading