refactor: Extract split filter provider interface to improve flexibility for user customization. (#46)

Author: anlowee

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

@@ -29,11 +29,12 @@ public class ClpConfig
     private String metadataDbName;
     private String metadataDbUser;
     private String metadataDbPassword;
-    private String metadataFilterConfig;
     private String metadataTablePrefix;
     private long metadataRefreshInterval = 60;
     private long metadataExpireInterval = 600;
 
+    private String splitFilterConfig;
+    private SplitFilterProviderType splitFilterProviderType = SplitFilterProviderType.MYSQL;
     private SplitProviderType splitProviderType = SplitProviderType.MYSQL;
 
     public boolean isPolymorphicTypeEnabled()
@@ -108,18 +109,6 @@ public ClpConfig setMetadataDbPassword(String metadataDbPassword)
         return this;
     }
 
-    public String getMetadataFilterConfig()
-    {
-        return metadataFilterConfig;
-    }
-
-    @Config("clp.metadata-filter-config")
-    public ClpConfig setMetadataFilterConfig(String metadataFilterConfig)
-    {
-        this.metadataFilterConfig = metadataFilterConfig;
-        return this;
-    }
-
     public String getMetadataTablePrefix()
     {
         return metadataTablePrefix;
@@ -162,6 +151,30 @@ public ClpConfig setMetadataExpireInterval(long metadataExpireInterval)
         return this;
     }
 
+    public String getSplitFilterConfig()
+    {
+        return splitFilterConfig;
+    }
+
+    @Config("clp.split-filter-config")
+    public ClpConfig setSplitFilterConfig(String splitFilterConfig)
+    {
+        this.splitFilterConfig = splitFilterConfig;
+        return this;
+    }
+
+    public SplitFilterProviderType getSplitFilterProviderType()
+    {
+        return splitFilterProviderType;
+    }
+
+    @Config("clp.split-filter-provider-type")
+    public ClpConfig setSplitFilterProviderType(SplitFilterProviderType splitFilterProviderType)
+    {
+        this.splitFilterProviderType = splitFilterProviderType;
+        return this;
+    }
+
     public SplitProviderType getSplitProviderType()
     {
         return splitProviderType;
@@ -179,6 +192,11 @@ public enum MetadataProviderType
         MYSQL
     }
 
+    public enum SplitFilterProviderType
+    {
+        MYSQL
+    }
+
     public enum SplitProviderType
     {
         MYSQL

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

@@ -15,6 +15,7 @@
 
 import com.facebook.airlift.bootstrap.LifeCycleManager;
 import com.facebook.airlift.log.Logger;
+import com.facebook.presto.plugin.clp.split.filter.ClpSplitFilterProvider;
 import com.facebook.presto.spi.connector.Connector;
 import com.facebook.presto.spi.connector.ConnectorMetadata;
 import com.facebook.presto.spi.connector.ConnectorPlanOptimizerProvider;
@@ -40,7 +41,7 @@ public class ClpConnector
     private final ClpSplitManager splitManager;
     private final FunctionMetadataManager functionManager;
     private final StandardFunctionResolution functionResolution;
-    private final ClpMetadataFilterProvider metadataFilterProvider;
+    private final ClpSplitFilterProvider splitFilterProvider;
 
     @Inject
     public ClpConnector(
@@ -50,21 +51,21 @@ public ClpConnector(
             ClpSplitManager splitManager,
             FunctionMetadataManager functionManager,
             StandardFunctionResolution functionResolution,
-            ClpMetadataFilterProvider metadataFilterProvider)
+            ClpSplitFilterProvider splitFilterProvider)
     {
         this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null");
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
         this.splitManager = requireNonNull(splitManager, "splitManager is null");
         this.functionManager = requireNonNull(functionManager, "functionManager is null");
         this.functionResolution = requireNonNull(functionResolution, "functionResolution is null");
-        this.metadataFilterProvider = requireNonNull(metadataFilterProvider, "metadataFilterProvider is null");
+        this.splitFilterProvider = requireNonNull(splitFilterProvider, "splitFilterProvider is null");
     }
 
     @Override
     public ConnectorPlanOptimizerProvider getConnectorPlanOptimizerProvider()
     {
-        return new ClpPlanOptimizerProvider(functionManager, functionResolution, metadataFilterProvider);
+        return new ClpPlanOptimizerProvider(functionManager, functionResolution, splitFilterProvider);
     }
 
     @Override

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

@@ -29,8 +29,9 @@ public enum ClpErrorCode
     CLP_UNSUPPORTED_TYPE(3, EXTERNAL),
     CLP_UNSUPPORTED_CONFIG_OPTION(4, EXTERNAL),
 
-    CLP_METADATA_FILTER_CONFIG_NOT_FOUND(10, USER_ERROR),
-    CLP_MANDATORY_METADATA_FILTER_NOT_VALID(11, USER_ERROR);
+    CLP_SPLIT_FILTER_CONFIG_NOT_FOUND(10, USER_ERROR),
+    CLP_MANDATORY_SPLIT_FILTER_NOT_VALID(11, USER_ERROR),
+    CLP_UNSUPPORTED_SPLIT_FILTER_SOURCE(12, EXTERNAL);
 
     private final ErrorCode errorCode;