[
https://issues.apache.org/jira/browse/BEAM-4044?focusedWorklogId=97973&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97973
]
ASF GitHub Bot logged work on BEAM-4044:
----------------------------------------
Author: ASF GitHub Bot
Created on: 03/May/18 17:25
Start Date: 03/May/18 17:25
Worklog Time Spent: 10m
Work Description: apilloud closed pull request #5254: [BEAM-4044] [SQL]
Simplify TableProvider interface
URL: https://github.com/apache/beam/pull/5254
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/InMemoryMetaTableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/InMemoryMetaTableProvider.java
new file mode 100644
index 00000000000..bfed36132ca
--- /dev/null
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/InMemoryMetaTableProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.beam.sdk.extensions.sql.meta.provider;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.beam.sdk.extensions.sql.meta.Table;
+
+/**
+ * A {@code InMemoryMetaTableProvider} is an abstract {@code TableProvider}
for in-memory types.
+ */
+public abstract class InMemoryMetaTableProvider implements TableProvider {
+
+ @Override
+ public void createTable(Table table) {
+ // No-op
+ }
+
+ @Override
+ public void dropTable(String tableName) {
+ // No-op
+ }
+
+ @Override
+ public List<Table> listTables() {
+ return Collections.emptyList();
+ }
+}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/TableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/TableProvider.java
index 5bbadb13eeb..e52021cada9 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/TableProvider.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/TableProvider.java
@@ -29,11 +29,6 @@
* handle MySQL based tables, a provider to handle Casandra based tables etc.
*/
public interface TableProvider {
- /**
- * Init the provider.
- */
- void init();
-
/**
* Gets the table type this provider handles.
*/
@@ -60,9 +55,4 @@
* Build a {@link BeamSqlTable} using the given table meta info.
*/
BeamSqlTable buildBeamSqlTable(Table table);
-
- /**
- * Close the provider.
- */
- void close();
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java
index dd728d0faeb..21483af63dc 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java
@@ -20,11 +20,9 @@
import static
org.apache.beam.sdk.extensions.sql.meta.provider.MetaUtils.getRowTypeFromTable;
-import java.util.Collections;
-import java.util.List;
import org.apache.beam.sdk.extensions.sql.BeamSqlTable;
import org.apache.beam.sdk.extensions.sql.meta.Table;
-import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
+import
org.apache.beam.sdk.extensions.sql.meta.provider.InMemoryMetaTableProvider;
import org.apache.beam.sdk.schemas.Schema;
/**
@@ -41,7 +39,7 @@
* LOCATION '[PROJECT_ID]:[DATASET].[TABLE]'
* }</pre>
*/
-public class BigQueryTableProvider implements TableProvider {
+public class BigQueryTableProvider extends InMemoryMetaTableProvider {
@Override public String getTableType() {
return "bigquery";
@@ -53,24 +51,4 @@
return new BeamBigQueryTable(schema, filePattern);
}
-
- @Override public void createTable(Table table) {
- // empty
- }
-
- @Override public void dropTable(String tableName) {
- // empty
- }
-
- @Override public List<Table> listTables() {
- return Collections.emptyList();
- }
-
- @Override public void init() {
- // empty
- }
-
- @Override public void close() {
- // empty
- }
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProvider.java
index a068f73af43..4550d02744a 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProvider.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProvider.java
@@ -23,11 +23,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.beam.sdk.extensions.sql.BeamSqlTable;
import org.apache.beam.sdk.extensions.sql.meta.Table;
-import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
+import
org.apache.beam.sdk.extensions.sql.meta.provider.InMemoryMetaTableProvider;
import org.apache.beam.sdk.schemas.Schema;
/**
@@ -45,7 +44,7 @@
* TBLPROPERTIES '{"bootstrap.servers":"localhost:9092", "topics": ["topic1",
"topic2"]}'
* }</pre>
*/
-public class KafkaTableProvider implements TableProvider {
+public class KafkaTableProvider extends InMemoryMetaTableProvider {
@Override public BeamSqlTable buildBeamSqlTable(Table table) {
Schema schema = getRowTypeFromTable(table);
@@ -63,24 +62,4 @@
@Override public String getTableType() {
return "kafka";
}
-
- @Override public void createTable(Table table) {
- // empty
- }
-
- @Override public void dropTable(String tableName) {
- // empty
- }
-
- @Override public List<Table> listTables() {
- return Collections.emptyList();
- }
-
- @Override public void init() {
- // empty
- }
-
- @Override public void close() {
- // empty
- }
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java
index 69820fbcd10..55805a2b9a6 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java
@@ -21,11 +21,9 @@
import static
org.apache.beam.sdk.extensions.sql.meta.provider.MetaUtils.getRowTypeFromTable;
import com.alibaba.fastjson.JSONObject;
-import java.util.Collections;
-import java.util.List;
import org.apache.beam.sdk.extensions.sql.BeamSqlTable;
import org.apache.beam.sdk.extensions.sql.meta.Table;
-import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
+import
org.apache.beam.sdk.extensions.sql.meta.provider.InMemoryMetaTableProvider;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.commons.csv.CSVFormat;
@@ -44,7 +42,7 @@
* TBLPROPERTIES '{"format": "Excel"}' -- format of each text line(csv format)
* }</pre>
*/
-public class TextTableProvider implements TableProvider {
+public class TextTableProvider extends InMemoryMetaTableProvider {
@Override public String getTableType() {
return "text";
@@ -64,24 +62,4 @@
BeamTextCSVTable txtTable = new BeamTextCSVTable(schema, filePattern,
format);
return txtTable;
}
-
- @Override public void createTable(Table table) {
- // empty
- }
-
- @Override public void dropTable(String tableName) {
- // empty
- }
-
- @Override public List<Table> listTables() {
- return Collections.emptyList();
- }
-
- @Override public void init() {
- // empty
- }
-
- @Override public void close() {
- // empty
- }
}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStoreTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStoreTest.java
index 4ae03c6acb3..5e3ea98c798 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStoreTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStoreTest.java
@@ -157,10 +157,6 @@ public MockTableProvider(String type, String... names) {
this.names = names;
}
- @Override public void init() {
-
- }
-
@Override public String getTableType() {
return type;
}
@@ -185,9 +181,5 @@ public MockTableProvider(String type, String... names) {
@Override public BeamSqlTable buildBeamSqlTable(Table table) {
return null;
}
-
- @Override public void close() {
-
- }
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 97973)
Time Spent: 10h (was: 9h 50m)
> Take advantage of Calcite DDL
> -----------------------------
>
> Key: BEAM-4044
> URL: https://issues.apache.org/jira/browse/BEAM-4044
> Project: Beam
> Issue Type: New Feature
> Components: dsl-sql
> Reporter: Andrew Pilloud
> Assignee: Andrew Pilloud
> Priority: Major
> Time Spent: 10h
> Remaining Estimate: 0h
>
> In Calcite 1.15 support for abstract DDL moved into calcite core. We should
> take advantage of that.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
