diff --git a/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/DeltaSharingCapabilities.java b/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/DeltaSharingCapabilities.java index 0e15dde2..ef986cd2 100644 --- a/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/DeltaSharingCapabilities.java +++ b/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/DeltaSharingCapabilities.java @@ -19,6 +19,8 @@ public enum ResponseFormat { public static final String HEADER = "delta-sharing-capabilities"; + private static final String COLUMN_MAPPING_MODE = "delta.columnMapping.mode"; + private static final Set KEYS = Set.of("responseformat", "readerfeatures", "includeendstreamaction"); @@ -84,6 +86,22 @@ public static void requireReaderFeatures( } } + /** + * A table with column mapping on cannot be served to a client that did not advertise the {@code + * columnmapping} reader feature, whatever its protocol lists: the property decides. {@code + * version} is the table version {@code configuration} is of. + */ + public static void requireColumnMappingSupport( + String header, Map configuration, long version) { + String mode = configuration == null ? null : configuration.get(COLUMN_MAPPING_MODE); + if (mode != null + && !mode.equals("none") + && !advertisedReaderFeatures(header).contains("columnmapping")) { + throw ApiException.invalidParameter( + "Table features " + COLUMN_MAPPING_MODE + " are found in table version: " + version + "."); + } + } + /** * The capabilities this server knows. Clients advertise ones it does not, such as asyncquery, * and may send parts without a value; both are ignored. diff --git a/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/delta/DeltaTableQueryReader.java b/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/delta/DeltaTableQueryReader.java index b99a7ae0..056d8dd4 100644 --- a/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/delta/DeltaTableQueryReader.java +++ b/server/opensharing-server-core/src/main/java/io/opensharing/asset/table/delta/DeltaTableQueryReader.java @@ -148,6 +148,8 @@ public void read( ResponseWriter out = new ResponseWriter(session, table, options, sink)) { Snapshot snapshot = DeltaSnapshots.open(session, version, timestamp); SnapshotImpl impl = (SnapshotImpl) snapshot; + DeltaSharingCapabilities.requireColumnMappingSupport( + options.capabilities(), impl.getMetadata().getConfiguration(), snapshot.getVersion()); out.requireReaderFeatures(impl.getProtocol()); Long fileVersion = historical ? snapshot.getVersion() : null; Long fileTimestamp = historical ? snapshot.getTimestamp(session.engine()) : null; diff --git a/server/opensharing-server-core/src/test/java/io/opensharing/asset/table/DeltaSharingCapabilitiesTest.java b/server/opensharing-server-core/src/test/java/io/opensharing/asset/table/DeltaSharingCapabilitiesTest.java index da3d52e2..72a1db8f 100644 --- a/server/opensharing-server-core/src/test/java/io/opensharing/asset/table/DeltaSharingCapabilitiesTest.java +++ b/server/opensharing-server-core/src/test/java/io/opensharing/asset/table/DeltaSharingCapabilitiesTest.java @@ -9,6 +9,7 @@ import io.delta.kernel.internal.actions.Protocol; import io.opensharing.asset.table.DeltaSharingCapabilities.ResponseFormat; import io.opensharing.http.ApiException; +import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; @@ -123,4 +124,33 @@ void queryRequiresReaderFeaturesOnlyFromClientsThatAcceptDelta() { ResponseFormat.DELTA, advanced)); } + + @Test + void refusesColumnMappingToClientsThatDidNotAdvertiseIt() { + Map mapped = Map.of("delta.columnMapping.mode", "name"); + ApiException refused = + assertThrows( + ApiException.class, + () -> + DeltaSharingCapabilities.requireColumnMappingSupport( + "responseformat=parquet", mapped, 3)); + assertEquals( + "Table features delta.columnMapping.mode are found in table version: 3.", + refused.getMessage()); + assertThrows( + ApiException.class, + () -> + DeltaSharingCapabilities.requireColumnMappingSupport( + "responseformat=delta;readerfeatures=deletionVectors", mapped, 3)); + assertDoesNotThrow( + () -> + DeltaSharingCapabilities.requireColumnMappingSupport( + "responseformat=delta;readerfeatures=columnMapping", mapped, 3)); + assertDoesNotThrow( + () -> + DeltaSharingCapabilities.requireColumnMappingSupport( + "responseformat=parquet", Map.of("delta.columnMapping.mode", "none"), 3)); + assertDoesNotThrow( + () -> DeltaSharingCapabilities.requireColumnMappingSupport(null, Map.of(), 3)); + } }