commit f558815feb6560ebbc3d1fcf502acee8fea1e555
author Volodymyr Vysotskyi <vvovyk@gmail.com> Wed Jun 21 20:24:31 2023 +0300
committer Volodymyr Vysotskyi <20928429+vvysotskyi@users.noreply.github.com> Sat Jul 15 22:17:17 2023 +0300
tree bea58205febdfbc2650161d5620c585948c4d19b
parent 8fcf0ebff6b96be9b58800003f7a738cf8873afb

DRILL-8442: Fix DeltaRowGroupScan deserialization

contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java

diff --git a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java
index 5645c3f..df675df 100644
--- a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java
+++ b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java
@@ -53,7 +53,7 @@
   @JsonCreator
   public DeltaRowGroupScan(@JacksonInject StoragePluginRegistry registry,
     @JsonProperty("userName") String userName,
-    @JsonProperty("storage") StoragePluginConfig storageConfig,
+    @JsonProperty("storageConfig") StoragePluginConfig storageConfig,
     @JsonProperty("formatPluginConfig") FormatPluginConfig formatPluginConfig,
     @JsonProperty("rowGroupReadEntries") List<RowGroupReadEntry> rowGroupReadEntries,
     @JsonProperty("columns") List<SchemaPath> columns,
@@ -86,6 +86,11 @@
   }
 
   @JsonProperty
+  public StoragePluginConfig getStorageConfig() {
+    return formatPlugin.getStorageConfig();
+  }
+
+  @JsonProperty
   public DeltaFormatPluginConfig getFormatPluginConfig() {
     return formatPluginConfig;
   }

contrib/format-deltalake/src/test/java/org/apache/drill/exec/store/delta/DeltaQueriesTest.java

diff --git a/contrib/format-deltalake/src/test/java/org/apache/drill/exec/store/delta/DeltaQueriesTest.java b/contrib/format-deltalake/src/test/java/org/apache/drill/exec/store/delta/DeltaQueriesTest.java
index fb98fec..326d918 100644
--- a/contrib/format-deltalake/src/test/java/org/apache/drill/exec/store/delta/DeltaQueriesTest.java
+++ b/contrib/format-deltalake/src/test/java/org/apache/drill/exec/store/delta/DeltaQueriesTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.drill.common.logical.FormatPluginConfig;
 import org.apache.drill.common.logical.security.PlainCredentialsProvider;
+import org.apache.drill.exec.ExecConstants;
 import org.apache.drill.exec.store.StoragePluginRegistry;
 import org.apache.drill.exec.store.delta.format.DeltaFormatPluginConfig;
 import org.apache.drill.exec.store.dfs.FileSystemConfig;
@@ -61,7 +62,8 @@
 
   @Test
   public void testSerDe() throws Exception {
-    String plan = queryBuilder().sql("select * from dfs.`data-reader-partition-values`").explainJson();
+    client.alterSession(ExecConstants.SLICE_TARGET, 1);
+    String plan = queryBuilder().sql("select * from table(dfs.`data-reader-partition-values` (type => 'delta'))").explainJson();
     long count = queryBuilder().physical(plan).run().recordCount();
     assertEquals(3, count);
   }