Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public boolean hasKernelWriteSupport(Metadata metadata) {
}

public static final TableFeature CATALOG_MANAGED_RW_FEATURE =
new CatalogManagedFeatureBase("catalogOwned-preview");
new CatalogManagedFeatureBase("catalogManaged");

private static class CatalogManagedFeatureBase extends TableFeature.ReaderWriterFeature {
CatalogManagedFeatureBase(String featureName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class IcebergWriterCompatV1MetadataValidatorAndUpdaterSuite
"typeWidening",
"typeWidening-preview",
"timestampNtz",
"catalogOwned-preview")
"catalogManaged")
val protocol = new Protocol(3, 7, readerFeatures.asJava, writerFeatures.asJava)
val metadata = getCompatEnabledMetadata(cmTestSchema())
validateAndUpdateIcebergWriterCompatV1Metadata(true, metadata, protocol)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ class IcebergWriterCompatV3MetadataValidatorAndUpdaterSuite
"variantShredding-preview",
"icebergCompatV2",
"icebergWriterCompatV1",
"catalogOwned-preview")
"catalogManaged")
val protocol = new Protocol(3, 7, readerFeatures.asJava, writerFeatures.asJava)
val metadata = getCompatEnabledMetadata(cmTestSchema())
validateAndUpdateIcebergWriterCompatV3Metadata(true, metadata, protocol)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class TableFeaturesSuite extends AnyFunSuite {
// Tests for [[TableFeature]] implementations //
/////////////////////////////////////////////////////////////////////////////////////////////////
val readerWriterFeatures = Seq(
"catalogOwned-preview",
"catalogManaged",
"columnMapping",
"deletionVectors",
"timestampNtz",
Expand Down Expand Up @@ -201,7 +201,7 @@ class TableFeaturesSuite extends AnyFunSuite {
"domainMetadata",
"vacuumProtocolCheck",
"clustering",
"catalogOwned-preview",
"catalogManaged",
"allowColumnDefaults").foreach {
feature =>
test(s"doesn't support auto enable by metadata: $feature") {
Expand Down Expand Up @@ -234,7 +234,7 @@ class TableFeaturesSuite extends AnyFunSuite {
.collect(toList()).asScala

val expected = Seq(
"catalogOwned-preview",
"catalogManaged",
"columnMapping",
"v2Checkpoint",
"variantType",
Expand All @@ -258,7 +258,7 @@ class TableFeaturesSuite extends AnyFunSuite {
// are writable because the metadata has not been set the info that
// these features are enabled
val expected = Seq(
"catalogOwned-preview",
"catalogManaged",
"columnMapping",
"allowColumnDefaults",
"v2Checkpoint",
Expand Down Expand Up @@ -323,7 +323,7 @@ class TableFeaturesSuite extends AnyFunSuite {

// Reads: Supported table features represented as readerFeatures in the protocol
Seq(
"catalogOwned-preview",
"catalogManaged",
"variantType",
"variantType-preview",
"variantShredding-preview",
Expand Down Expand Up @@ -380,7 +380,7 @@ class TableFeaturesSuite extends AnyFunSuite {

checkWriteSupported(
"validateKernelCanWriteToTable: protocol 7 with catalogManaged",
new Protocol(3, 7, singleton("catalogOwned-preview"), singleton("catalogOwned-preview")),
new Protocol(3, 7, singleton("catalogManaged"), singleton("catalogManaged")),
testMetadata())

checkWriteUnsupported(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{"commitInfo":{"inCommitTimestamp":1712091396253,"timestamp":1712091396253,"operation":"WRITE","operationParameters":{"mode":"ErrorIfExists","partitionBy":"[]"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{"numFiles":"1","numOutputRows":"3","numOutputBytes":"996"},"engineInfo":"Apache-Spark/3.5.1 Delta-Lake/3.1.0","txnId":"5df7dc20-b980-4207-a5fd-b69cb4541b2e"}}
{"metaData":{"id":"2a1e618f-d92a-4c94-bb06-a2808f8b39f3","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"letter\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},{\"name\":\"number\",\"type\":\"long\",\"nullable\":true,\"metadata\":{}},{\"name\":\"a_float\",\"type\":\"double\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":[],"configuration":{"delta.enableInCommitTimestamps":"true","catalogManaged.unityCatalog.tableId":"12345678-1234-1234-1234-123456789abc"},"createdTime":1712091393302}}
{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["catalogOwned-preview"],"writerFeatures":["catalogOwned-preview","inCommitTimestamp"]}}
{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["catalogManaged"],"writerFeatures":["catalogManaged","inCommitTimestamp"]}}
{"add":{"path":"part-00000-c9f44819-b06d-45dd-b33d-ae9aa1b96909-c000.snappy.parquet","partitionValues":{},"size":996,"modificationTime":1712091396057,"dataChange":true,"stats":"{\"numRecords\":3,\"minValues\":{\"letter\":\"a\",\"number\":1,\"a_float\":1.1},\"maxValues\":{\"letter\":\"c\",\"number\":3,\"a_float\":3.3},\"nullCount\":{\"letter\":0,\"number\":0,\"a_float\":0}}"}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{"commitInfo":{"inCommitTimestamp":1749830855993,"timestamp":1749830855992,"operation":"CREATE TABLE","operationParameters":{"partitionBy":"[\"part1\"]","clusterBy":"[]","description":null,"isManaged":"false","properties":"{}"},"isolationLevel":"Serializable","isBlindAppend":true,"operationMetrics":{},"engineInfo":"Apache-Spark/4.0.0 Delta-Lake/4.0.0","txnId":"d108f896-9662-4eda-b4de-444a99850aa8"}}
{"metaData":{"id":"64dcd182-b3b4-4ee0-88e0-63c159a4121c","format":{"provider":"parquet","options":{}},"schemaString":"{\"type\":\"struct\",\"fields\":[{\"name\":\"part1\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},{\"name\":\"col1\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}}]}","partitionColumns":["part1"],"configuration":{"delta.enableInCommitTimestamps":"true"},"createdTime":1749830855646}}
{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["catalogOwned-preview"],"writerFeatures":["catalogOwned-preview","inCommitTimestamp","invariants","appendOnly"]}}
{"protocol":{"minReaderVersion":3,"minWriterVersion":7,"readerFeatures":["catalogManaged"],"writerFeatures":["catalogManaged","inCommitTimestamp","invariants","appendOnly"]}}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FROM (
)
""")

# Then, add `"readerFeatures":["catalogOwned-preview"]` to the _delta_log/001.json protocol
# Then, add `"readerFeatures":["catalogManaged"]` to the _delta_log/001.json protocol
# Then, for commits version $v in [1, 2] move _delta_log/$v.json into
# _delta_log/_staged_commits/$v.$uuid.json, where $uuid is taken from the commitInfo.txnId in
# $v.json
Loading