Address review comments

apache · Jan 30, 2024 · 6e9f53b · 6e9f53b
1 parent 7c00062
commit 6e9f53b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/...nsions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java b/...nsions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java
@@ -1887,10 +1887,19 @@ private static QueryDefinition makeQueryDefinition(
       }
     } else if (querySpec.getDestination() instanceof ExportMSQDestination) {
       final ExportMSQDestination exportMSQDestination = (ExportMSQDestination) querySpec.getDestination();
-      final StorageConnectorProvider storageConnectorProvider = jsonMapper.convertValue(
-          exportMSQDestination.getProperties(),
-          StorageConnectorProvider.class
-      );
+      final StorageConnectorProvider storageConnectorProvider;
+      try {
+        storageConnectorProvider = jsonMapper.convertValue(
+            exportMSQDestination.getProperties(),
+            StorageConnectorProvider.class
+        );
+      }
+      catch (IllegalArgumentException e) {
+        throw DruidException.forPersona(DruidException.Persona.USER)
+                            .ofCategory(DruidException.Category.RUNTIME_FAILURE)
+                            .build("No storage connector found for storage connector type:[%s].", exportMSQDestination.getStorageConnectorType());
+      }
+
       final ResultFormat resultFormat = exportMSQDestination.getResultFormat();
 
       // If the statement is a 'REPLACE' statement, delete the existing files at the destination.

diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.msq.export.TestExportStorageConnector;
 import org.apache.druid.msq.test.MSQTestBase;
@@ -116,11 +117,12 @@ public void testWithUnsupportedStorageConnector()
                      .setExpectedRowSignature(rowSignature)
                      .setExpectedSegment(ImmutableSet.of())
                      .setExpectedResultRows(ImmutableList.of())
-                     .setExpectedExecutionErrorMatcher(
+                     .setExpectedExecutionErrorMatcher(CoreMatchers.allOf(
+                         CoreMatchers.instanceOf(ISE.class),
                          ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString(
-                             "Could not resolve type id 'hdfs' as a subtype"
-                         ))
-                     ).verifyExecutionError();
+                             "No storage connector found for storage connector type:[hdfs]."
+                         ))))
+                     .verifyExecutionError();
   }
 
   private List<Object[]> expectedFooFileContents()

diff --git a/...-extensions/src/test/java/org/apache/druid/storage/s3/S3StorageConnectorProviderTest.java b/...-extensions/src/test/java/org/apache/druid/storage/s3/S3StorageConnectorProviderTest.java
@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -115,12 +114,6 @@ public void createS3StorageFactoryWithMissingTempDir()
     );
   }
 
-  @Test
-  public void name()
-  {
-    ImmutableMap<String, String> stringStringImmutableMap = ImmutableMap.of("type", "local", "basePath", "/path");
-  }
-
   private StorageConnectorProvider getStorageConnectorProvider(Properties properties)
   {
     StartupInjectorBuilder startupInjectorBuilder = new StartupInjectorBuilder().add(

diff --git a/sql/src/main/java/org/apache/druid/sql/destination/TableDestination.java b/sql/src/main/java/org/apache/druid/sql/destination/TableDestination.java
@@ -46,6 +46,12 @@ public String getType()
     return tableName;
   }
 
+  @JsonProperty("tableName")
+  public String getTableName()
+  {
+    return tableName;
+  }
+
   @Override
   public String toString()
   {