Fixed several bugs and improved robustness; removed the CLP plan optimizer and unit tests for a future PR

Author: wraymo

presto-clp/pom.xml

@@ -49,12 +49,6 @@
             <artifactId>guice</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

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

@@ -85,7 +85,7 @@ public ColumnMetadata getColumnMetadata()
     @Override
     public int hashCode()
     {
-        return Objects.hash(columnName, columnType);
+        return Objects.hash(columnName, originalColumnName, columnType, nullable);
     }
 
     @Override
@@ -99,14 +99,17 @@ public boolean equals(Object obj)
         }
         ClpColumnHandle other = (ClpColumnHandle) obj;
         return Objects.equals(this.columnName, other.columnName) &&
-                Objects.equals(this.columnType, other.columnType);
+                Objects.equals(this.originalColumnName, other.originalColumnName) &&
+                Objects.equals(this.columnType, other.columnType) &&
+                Objects.equals(this.nullable, other.nullable);
     }
 
     @Override
     public String toString()
     {
         return toStringHelper(this)
                 .add("columnName", columnName)
+                .add("originalColumnName", originalColumnName)
                 .add("columnType", columnType)
                 .add("nullable", nullable)
                 .toString();

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

@@ -20,12 +20,6 @@
 
 public class ClpConfig
 {
-    public enum ArchiveSource
-    {
-        LOCAL,
-        S3
-    }
-
     public enum MetadataProviderType
     {
         MYSQL
@@ -45,7 +39,6 @@ public enum SplitProviderType
     private String metadataTablePrefix;
     private long metadataRefreshInterval = 60;
     private long metadataExpireInterval = 600;
-    private ArchiveSource archiveSource = ArchiveSource.LOCAL;
     private SplitProviderType splitProviderType = SplitProviderType.MYSQL;
 
     public static final Pattern SAFE_SQL_IDENTIFIER = Pattern.compile("^[a-zA-Z0-9_]+$");
@@ -163,18 +156,6 @@ public ClpConfig setMetadataExpireInterval(long metadataExpireInterval)
         return this;
     }
 
-    public ArchiveSource getArchiveSource()
-    {
-        return archiveSource;
-    }
-
-    @Config("clp.archive-source")
-    public ClpConfig setArchiveSource(ArchiveSource archiveSource)
-    {
-        this.archiveSource = archiveSource;
-        return this;
-    }
-
     public SplitProviderType getSplitProviderType()
     {
         return splitProviderType;

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

@@ -17,12 +17,9 @@
 import com.facebook.airlift.log.Logger;
 import com.facebook.presto.spi.connector.Connector;
 import com.facebook.presto.spi.connector.ConnectorMetadata;
-import com.facebook.presto.spi.connector.ConnectorPlanOptimizerProvider;
 import com.facebook.presto.spi.connector.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.connector.ConnectorSplitManager;
 import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
-import com.facebook.presto.spi.function.FunctionMetadataManager;
-import com.facebook.presto.spi.function.StandardFunctionResolution;
 import com.facebook.presto.spi.transaction.IsolationLevel;
 
 import javax.inject.Inject;
@@ -38,29 +35,16 @@ public class ClpConnector
     private final ClpMetadata metadata;
     private final ClpRecordSetProvider recordSetProvider;
     private final ClpSplitManager splitManager;
-    private final FunctionMetadataManager functionManager;
-    private final StandardFunctionResolution functionResolution;
-
     @Inject
     public ClpConnector(LifeCycleManager lifeCycleManager,
                         ClpMetadata metadata,
                         ClpRecordSetProvider recordSetProvider,
-                        ClpSplitManager splitManager,
-                        FunctionMetadataManager functionManager,
-                        StandardFunctionResolution functionResolution)
+                        ClpSplitManager splitManager)
     {
         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");
-    }
-
-    @Override
-    public ConnectorPlanOptimizerProvider getConnectorPlanOptimizerProvider()
-    {
-        return new ClpPlanOptimizerProvider(functionManager, functionResolution);
     }
 
     @Override