Merge branch 'xwei/add-release-image-publish-workflow' of github.com:anlowee/presto into xwei/add-release-image-publish-workflow

Author: Xiaochong Wei

presto-clp/src/main/java/com/facebook/presto/plugin/clp/ClpMetadataFilterProvider.java

@@ -85,6 +85,10 @@ public ClpMetadataFilterProvider(ClpConfig config)
     {
         requireNonNull(config, "config is null");
 
+        if (null == config.getMetadataFilterConfig()) {
+            filterMap = ImmutableMap.of();
+            return;
+        }
         ObjectMapper mapper = new ObjectMapper();
         try {
             filterMap = mapper.readValue(

presto-clp/src/test/java/com/facebook/presto/plugin/clp/TestClpMetadataFilterConfig.java

@@ -26,8 +26,10 @@
 import java.nio.file.Paths;
 import java.util.Set;
 
+import static java.util.UUID.randomUUID;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
 
 @Test(singleThreaded = true)
 public class TestClpMetadataFilterConfig
@@ -74,6 +76,22 @@ public void getFilterNames()
         assertEquals(ImmutableSet.of("level", "author", "msg.timestamp", "file_name"), tableFilterNames);
     }
 
+    @Test
+    public void handleEmptyAndInvalidMetadataFilterConfig()
+    {
+        ClpConfig config = new ClpConfig();
+
+        // Empty config
+        ClpMetadataFilterProvider filterProvider = new ClpMetadataFilterProvider(config);
+        assertTrue(filterProvider.getColumnNames("clp").isEmpty());
+        assertTrue(filterProvider.getColumnNames("abc.xyz").isEmpty());
+        assertTrue(filterProvider.getColumnNames("abc.opq.xyz").isEmpty());
+
+        // Invalid config
+        config.setMetadataFilterConfig(randomUUID().toString());
+        assertThrows(PrestoException.class, () -> new ClpMetadataFilterProvider(config));
+    }
+
     @Test
     public void remapSql()
     {

presto-docs/src/main/sphinx/connector/clp.rst

@@ -69,7 +69,9 @@ Property Name                      Description
                                    database name is not specified in the URL.
 ``clp.metadata-db-password``       The password for the metadata database user. This option is required if
                                    ``clp.metadata-provider-type`` is set to ``mysql``.
-``clp.metadata-filter-config``     The absolute path of the metadata filter config file.
+``clp.metadata-filter-config``     The absolute path to an optional metadata filter config file. See the
+                                   :ref:`Metadata Filter Config File<metadata-filter-config-file>` section
+                                   for details.
 ``clp.metadata-table-prefix``      A string prefix prepended to all metadata table names when querying the
                                    database. Useful for namespacing or avoiding collisions. This option is
                                    required if ``clp.metadata-provider-type`` is set to ``mysql``.
@@ -96,6 +98,8 @@ If you prefer to use a different source--or the same source with a custom implem
 implementations of the ``ClpMetadataProvider`` and ``ClpSplitProvider`` interfaces, and configure the connector
 accordingly.
 
+.. _metadata-filter-config-file:
+
 Metadata Filter Config File
 ----------------------------