Add a dummy ClpRecordSetProvider implementation and fix ClpMySqlMetadataProvider and ClpMySqlSplitProvider

Author: wraymo

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

@@ -18,6 +18,7 @@
 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;
@@ -35,19 +36,22 @@ public class ClpConnector
 
     private final LifeCycleManager lifeCycleManager;
     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)
     {
         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");
@@ -71,6 +75,12 @@ public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandl
         return metadata;
     }
 
+    @Override
+    public ConnectorRecordSetProvider getRecordSetProvider()
+    {
+        return recordSetProvider;
+    }
+
     @Override
     public ConnectorSplitManager getSplitManager()
     {

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

@@ -32,6 +32,7 @@ protected void setup(Binder binder)
     {
         binder.bind(ClpConnector.class).in(Scopes.SINGLETON);
         binder.bind(ClpMetadata.class).in(Scopes.SINGLETON);
+        binder.bind(ClpRecordSetProvider.class).in(Scopes.SINGLETON);
         binder.bind(ClpSplitManager.class).in(Scopes.SINGLETON);
         configBinder(binder).bindConfig(ClpConfig.class);
 

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

@@ -0,0 +1,36 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.facebook.presto.plugin.clp;
+
+import com.facebook.presto.spi.ColumnHandle;
+import com.facebook.presto.spi.ConnectorSession;
+import com.facebook.presto.spi.ConnectorSplit;
+import com.facebook.presto.spi.RecordSet;
+import com.facebook.presto.spi.connector.ConnectorRecordSetProvider;
+import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
+
+import java.util.List;
+
+public class ClpRecordSetProvider
+        implements ConnectorRecordSetProvider
+{
+    @Override
+    public RecordSet getRecordSet(ConnectorTransactionHandle transactionHandle,
+                                  ConnectorSession session,
+                                  ConnectorSplit split,
+                                  List<? extends ColumnHandle> columns)
+    {
+        return null;
+    }
+}

presto-clp/src/main/java/com/facebook/presto/plugin/clp/metadata/ClpMySqlMetadataProvider.java

@@ -18,6 +18,8 @@
 import com.facebook.presto.plugin.clp.ClpConfig;
 import com.facebook.presto.spi.SchemaTableName;
 
+import javax.inject.Inject;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -39,10 +41,11 @@ public class ClpMySqlMetadataProvider
 
     private final ClpConfig config;
 
+    @Inject
     public ClpMySqlMetadataProvider(ClpConfig config)
     {
         try {
-            Class.forName("com.mysql.jdbc.Driver");
+            Class.forName("com.mysql.cj.jdbc.Driver");
         }
         catch (ClassNotFoundException e) {
             log.error(e, "Failed to load MySQL JDBC driver");

presto-clp/src/main/java/com/facebook/presto/plugin/clp/split/ClpMySqlSplitProvider.java

@@ -20,6 +20,8 @@
 import com.facebook.presto.spi.SchemaTableName;
 import com.google.common.collect.ImmutableList;
 
+import javax.inject.Inject;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -40,10 +42,11 @@ public class ClpMySqlSplitProvider
 
     private final ClpConfig config;
 
+    @Inject
     public ClpMySqlSplitProvider(ClpConfig config)
     {
         try {
-            Class.forName("com.mysql.jdbc.Driver");
+            Class.forName("com.mysql.cj.jdbc.Driver");
         }
         catch (ClassNotFoundException e) {
             log.error(e, "Failed to load MySQL JDBC driver");