Use default methods for optional Connector methods

prestodb · Mar 9, 2015 · d07c0b0 · d07c0b0
1 parent 5e5ca2e
commit d07c0b0
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 209 deletions.
diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java
@@ -15,9 +15,7 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -62,12 +60,6 @@ public ConnectorSplitManager getSplitManager()
         return jdbcSplitManager;
     }
 
-    @Override
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSetProvider getRecordSetProvider()
     {
@@ -85,10 +77,4 @@ public ConnectorRecordSinkProvider getRecordSinkProvider()
     {
         return jdbcRecordSinkProvider;
     }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraConnector.java
@@ -15,9 +15,7 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
@@ -62,12 +60,6 @@ public ConnectorSplitManager getSplitManager()
         return splitManager;
     }
 
-    @Override
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSetProvider getRecordSetProvider()
     {
@@ -85,10 +77,4 @@ public ConnectorRecordSinkProvider getRecordSinkProvider()
     {
         return recordSinkProvider;
     }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java b/presto-example-http/src/main/java/com/facebook/presto/example/ExampleConnector.java
@@ -15,11 +15,8 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 
 import javax.inject.Inject;
@@ -59,12 +56,6 @@ public ConnectorSplitManager getSplitManager()
         return splitManager;
     }
 
-    @Override
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSetProvider getRecordSetProvider()
     {
@@ -76,16 +67,4 @@ public ConnectorHandleResolver getHandleResolver()
     {
         return handleResolver;
     }
-
-    @Override
-    public ConnectorRecordSinkProvider getRecordSinkProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveConnector.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveConnector.java
@@ -15,10 +15,8 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
 import com.facebook.presto.spi.ConnectorPageSourceProvider;
-import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 
@@ -65,12 +63,6 @@ public ConnectorPageSourceProvider getPageSourceProvider()
         return pageSourceProvider;
     }
 
-    @Override
-    public ConnectorRecordSetProvider getRecordSetProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSinkProvider getRecordSinkProvider()
     {
@@ -82,10 +74,4 @@ public ConnectorHandleResolver getHandleResolver()
     {
         return handleResolver;
     }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java b/presto-kafka/src/main/java/com/facebook/presto/kafka/KafkaConnector.java
@@ -15,11 +15,8 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 
 import javax.inject.Inject;
@@ -69,27 +66,9 @@ public ConnectorSplitManager getSplitManager()
         return splitManager;
     }
 
-    @Override
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSetProvider getRecordSetProvider()
     {
         return recordSetProvider;
     }
-
-    @Override
-    public ConnectorRecordSinkProvider getRecordSinkProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-main/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorFactory.java b/presto-main/src/main/java/com/facebook/presto/connector/jmx/JmxConnectorFactory.java
@@ -16,11 +16,8 @@
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorFactory;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 import com.facebook.presto.spi.NodeManager;
 
@@ -73,29 +70,11 @@ public ConnectorSplitManager getSplitManager()
                 return new JmxSplitManager(new JmxConnectorId(connectorId), nodeManager);
             }
 
-            @Override
-            public ConnectorPageSourceProvider getPageSourceProvider()
-            {
-                throw new UnsupportedOperationException();
-            }
-
             @Override
             public ConnectorRecordSetProvider getRecordSetProvider()
             {
                 return new JmxRecordSetProvider(mbeanServer, nodeManager);
             }
-
-            @Override
-            public ConnectorRecordSinkProvider getRecordSinkProvider()
-            {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public ConnectorIndexResolver getIndexResolver()
-            {
-                throw new UnsupportedOperationException();
-            }
         };
     }
 }
diff --git a/presto-main/src/main/java/com/facebook/presto/connector/system/SystemConnector.java b/presto-main/src/main/java/com/facebook/presto/connector/system/SystemConnector.java
@@ -15,11 +15,8 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 import com.google.common.base.Preconditions;
 
@@ -63,27 +60,9 @@ public ConnectorHandleResolver getHandleResolver()
         return new SystemHandleResolver();
     }
 
-    @Override
-    public ConnectorPageSourceProvider getPageSourceProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ConnectorRecordSetProvider getRecordSetProvider()
     {
         return recordSetProvider;
     }
-
-    @Override
-    public ConnectorRecordSinkProvider getRecordSinkProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorConnector.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorConnector.java
@@ -15,12 +15,9 @@
 
 import com.facebook.presto.spi.Connector;
 import com.facebook.presto.spi.ConnectorHandleResolver;
-import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
 import com.facebook.presto.spi.ConnectorPageSinkProvider;
 import com.facebook.presto.spi.ConnectorPageSourceProvider;
-import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 
 import javax.inject.Inject;
@@ -80,22 +77,4 @@ public ConnectorSplitManager getSplitManager()
     {
         return splitManager;
     }
-
-    @Override
-    public ConnectorRecordSinkProvider getRecordSinkProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ConnectorRecordSetProvider getRecordSetProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ConnectorIndexResolver getIndexResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/Connector.java b/presto-spi/src/main/java/com/facebook/presto/spi/Connector.java
@@ -24,21 +24,39 @@ public interface Connector
     /**
      * @throws UnsupportedOperationException if this connector does not support reading tables page at a time
      */
-    ConnectorPageSourceProvider getPageSourceProvider();
+    default ConnectorPageSourceProvider getPageSourceProvider()
+    {
+        throw new UnsupportedOperationException();
+    }
 
     /**
      * @throws UnsupportedOperationException if this connector does not support reading tables record at a time
      */
-    ConnectorRecordSetProvider getRecordSetProvider();
+    default ConnectorRecordSetProvider getRecordSetProvider()
+    {
+        throw new UnsupportedOperationException();
+    }
 
     /**
-     * @throws UnsupportedOperationException if this connector does not support writing tables
+     * @throws UnsupportedOperationException if this connector does not support writing tables page at a time
      */
-    ConnectorRecordSinkProvider getRecordSinkProvider();
+    default ConnectorPageSinkProvider getPageSinkProvider()
+    {
+        throw new UnsupportedOperationException();
+    }
 
-    ConnectorIndexResolver getIndexResolver();
+    /**
+     * @throws UnsupportedOperationException if this connector does not support writing tables record at a time
+     */
+    default ConnectorRecordSinkProvider getRecordSinkProvider()
+    {
+        throw new UnsupportedOperationException();
+    }
 
-    default ConnectorPageSinkProvider getPageSinkProvider()
+    /**
+     * @throws UnsupportedOperationException if this connector does not support indexes
+     */
+    default ConnectorIndexResolver getIndexResolver()
     {
         throw new UnsupportedOperationException();
     }

diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/tpch/IndexedTpchConnectorFactory.java b/presto-tests/src/main/java/com/facebook/presto/tests/tpch/IndexedTpchConnectorFactory.java
@@ -18,9 +18,7 @@
 import com.facebook.presto.spi.ConnectorHandleResolver;
 import com.facebook.presto.spi.ConnectorIndexResolver;
 import com.facebook.presto.spi.ConnectorMetadata;
-import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
-import com.facebook.presto.spi.ConnectorRecordSinkProvider;
 import com.facebook.presto.spi.ConnectorSplitManager;
 import com.facebook.presto.spi.NodeManager;
 import com.facebook.presto.tpch.TpchMetadata;
@@ -77,24 +75,12 @@ public ConnectorHandleResolver getHandleResolver()
                 return new TpchIndexHandleResolver(connectorId);
             }
 
-            @Override
-            public ConnectorPageSourceProvider getPageSourceProvider()
-            {
-                throw new UnsupportedOperationException();
-            }
-
             @Override
             public ConnectorRecordSetProvider getRecordSetProvider()
             {
                 return new TpchRecordSetProvider();
             }
 
-            @Override
-            public ConnectorRecordSinkProvider getRecordSinkProvider()
-            {
-                throw new UnsupportedOperationException();
-            }
-
             @Override
             public ConnectorIndexResolver getIndexResolver()
             {