[
https://issues.apache.org/jira/browse/BEAM-3773?focusedWorklogId=109799&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109799
]
ASF GitHub Bot logged work on BEAM-3773:
----------------------------------------
Author: ASF GitHub Bot
Created on: 07/Jun/18 17:20
Start Date: 07/Jun/18 17:20
Worklog Time Spent: 10m
Work Description: kennknowles closed pull request #5553: [BEAM-3773] More
JDBC Tests and Cleanup
URL: https://github.com/apache/beam/pull/5553
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/build.gradle
b/sdks/java/extensions/sql/build.gradle
index 07dcbe1548c..c0346a82dad 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -155,6 +155,9 @@ task integrationTest(type: Test) {
def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
def gcsTempRoot = project.findProperty('gcsTempRoot') ?:
'gs://temp-storage-for-end-to-end-tests/'
+ // Disable Gradle cache (it should not be used because the IT's won't run).
+ outputs.upToDateWhen { false }
+
def pipelineOptions = [
"--project=${gcpProject}",
"--tempLocation=${gcsTempRoot}",
diff --git a/sdks/java/extensions/sql/jdbc/build.gradle
b/sdks/java/extensions/sql/jdbc/build.gradle
index cd9959c7ea9..a0aa1fa5dfb 100644
--- a/sdks/java/extensions/sql/jdbc/build.gradle
+++ b/sdks/java/extensions/sql/jdbc/build.gradle
@@ -53,6 +53,9 @@ test {
task integrationTest(type: Test, dependsOn:
":beam-sdks-java-extensions-sql-jdbc:shadowJar") {
group = "Verification"
+ // Disable Gradle cache (it should not be used because the IT's won't run).
+ outputs.upToDateWhen { false }
+
systemProperty "driver.jar", configurations.shadowTestRuntimeClasspath[1]
include '**/*IT.class'
diff --git
a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
index cee3aa7142d..1ad19b4512e 100644
---
a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
+++
b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
@@ -17,7 +17,10 @@
*/
package org.apache.beam.sdk.extensions.sql.jdbc;
+import java.io.File;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
/**
* Test for {@link org.apache.beam.sdk.extensions.sql.jdbc.BeamSqlLine}. Note
that this test only
@@ -25,6 +28,8 @@
*/
public class BeamSqlLineTest {
+ @Rule public TemporaryFolder folder = new TemporaryFolder();
+
@Test
public void testSqlLine_emptyArgs() throws Exception {
BeamSqlLine.main(new String[] {});
@@ -52,4 +57,21 @@ public void testSqlLine_ddl() throws Exception {
"-e", "CREATE TABLE test (id INTEGER) TYPE 'text';", "-e", "DROP
TABLE test;"
});
}
+
+ @Test
+ public void classLoader_readFile() throws Exception {
+ File simpleTable = folder.newFile();
+
+ BeamSqlLine.main(
+ new String[] {
+ "-e",
+ "CREATE TABLE test (id INTEGER) TYPE 'text' LOCATION '"
+ + simpleTable.getAbsolutePath()
+ + "';",
+ "-e",
+ "SELECT * FROM test;",
+ "-e",
+ "DROP TABLE test;"
+ });
+ }
}
diff --git
a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/JdbcIT.java
b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/JdbcIT.java
index 5f48e5111bc..c2da72abe68 100644
---
a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/JdbcIT.java
+++
b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/JdbcIT.java
@@ -28,12 +28,16 @@
import java.sql.Statement;
import java.util.Properties;
import java.util.ServiceLoader;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
/** Test for JDBC via {@link java.net.URLClassLoader}. */
public class JdbcIT {
private static final String DRIVER_URL = "jdbc:beam:";
+ @Rule public TemporaryFolder folder = new TemporaryFolder();
+
private Connection getConnection() throws Exception {
URL jdbcUrl = new File(System.getProperty("driver.jar")).toURI().toURL();
ClassLoader classLoader =
@@ -66,4 +70,20 @@ public void classLoader_ddl() throws Exception {
assertEquals(0, statement.executeUpdate("CREATE TABLE test (id INTEGER)
TYPE 'text'"));
assertEquals(0, statement.executeUpdate("DROP TABLE test"));
}
+
+ @Test
+ public void classLoader_readFile() throws Exception {
+ File simpleTable = folder.newFile();
+
+ Connection connection = getConnection();
+ Statement statement = connection.createStatement();
+ assertEquals(
+ 0,
+ statement.executeUpdate(
+ "CREATE TABLE test (id INTEGER) TYPE 'text' LOCATION '"
+ + simpleTable.getAbsolutePath()
+ + "'"));
+ assertTrue(statement.execute("SELECT * FROM test"));
+ assertEquals(0, statement.executeUpdate("DROP TABLE test"));
+ }
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java
index b978e9ca69f..dc07280558b 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java
@@ -18,10 +18,8 @@
package org.apache.beam.sdk.extensions.sql.impl;
import java.util.Map;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.bigquery.BigQueryTableProvider;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.kafka.KafkaTableProvider;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.pubsub.PubsubJsonTableProvider;
-import org.apache.beam.sdk.extensions.sql.meta.provider.text.TextTableProvider;
+import java.util.ServiceLoader;
+import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
import org.apache.beam.sdk.extensions.sql.meta.store.InMemoryMetaStore;
import org.apache.beam.sdk.extensions.sql.meta.store.MetaStore;
import org.apache.calcite.schema.Schema;
@@ -37,10 +35,10 @@ private BeamCalciteSchemaFactory() {}
@Override
public Schema create(SchemaPlus parentSchema, String name, Map<String,
Object> operand) {
MetaStore metaStore = new InMemoryMetaStore();
- metaStore.registerProvider(new BigQueryTableProvider());
- metaStore.registerProvider(new KafkaTableProvider());
- metaStore.registerProvider(new PubsubJsonTableProvider());
- metaStore.registerProvider(new TextTableProvider());
+ for (TableProvider provider :
+ ServiceLoader.load(TableProvider.class, getClass().getClassLoader())) {
+ metaStore.registerProvider(provider);
+ }
return new BeamCalciteSchema(metaStore);
}
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java
index c8f95879011..448a0d9ece7 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java
@@ -19,6 +19,7 @@
import static
org.codehaus.commons.compiler.CompilerFactoryFactory.getDefaultCompilerFactory;
+import com.google.auto.service.AutoService;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
@@ -33,6 +34,7 @@
import org.apache.calcite.schema.SchemaPlus;
/** Calcite JDBC driver with Beam defaults. */
+@AutoService(java.sql.Driver.class)
public class JdbcDriver extends Driver {
public static final JdbcDriver INSTANCE = new JdbcDriver();
public static final String CONNECT_STRING_PREFIX = "jdbc:beam:";
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java
index 7eef9a97ae4..71bf85667b8 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java
@@ -90,10 +90,16 @@ public Result implement(EnumerableRelImplementor
implementor, Prefer prefer) {
}
public static Enumerable<Object> toEnumerable(PipelineOptions options,
BeamRelNode node) {
- if (node instanceof BeamIOSinkRel) {
- return count(options, node);
+ final ClassLoader originalClassLoader =
Thread.currentThread().getContextClassLoader();
+ try {
+
Thread.currentThread().setContextClassLoader(BeamEnumerableConverter.class.getClassLoader());
+ if (node instanceof BeamIOSinkRel) {
+ return count(options, node);
+ }
+ return collect(options, node);
+ } finally {
+ Thread.currentThread().setContextClassLoader(originalClassLoader);
}
- return collect(options, node);
}
private static PipelineResult run(
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 6c3684e03a4..ae4592c9dca 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
@@ -18,9 +18,11 @@
package org.apache.beam.sdk.extensions.sql.meta.provider.bigquery;
+import com.google.auto.service.AutoService;
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.InMemoryMetaTableProvider;
+import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
import org.apache.beam.sdk.schemas.Schema;
/**
@@ -38,6 +40,7 @@
* LOCATION '[PROJECT_ID]:[DATASET].[TABLE]'
* }</pre>
*/
+@AutoService(TableProvider.class)
public class BigQueryTableProvider extends InMemoryMetaTableProvider {
@Override
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 77ddfb10f5a..da4f2fe023b 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
@@ -20,11 +20,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.google.auto.service.AutoService;
import java.util.ArrayList;
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.InMemoryMetaTableProvider;
+import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
import org.apache.beam.sdk.schemas.Schema;
/**
@@ -42,6 +44,7 @@
* TBLPROPERTIES '{"bootstrap.servers":"localhost:9092", "topics": ["topic1",
"topic2"]}'
* }</pre>
*/
+@AutoService(TableProvider.class)
public class KafkaTableProvider extends InMemoryMetaTableProvider {
@Override
public BeamSqlTable buildBeamSqlTable(Table table) {
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
index a49a9915697..66a952a0804 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
@@ -25,6 +25,7 @@
import static org.apache.beam.sdk.schemas.Schema.TypeName.ROW;
import com.alibaba.fastjson.JSONObject;
+import com.google.auto.service.AutoService;
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.extensions.sql.BeamSqlTable;
@@ -40,6 +41,7 @@
*/
@Internal
@Experimental
+@AutoService(TableProvider.class)
public class PubsubJsonTableProvider extends InMemoryMetaTableProvider {
@Override
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 d8b7c3e5d89..fdac9096d69 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
@@ -19,9 +19,11 @@
package org.apache.beam.sdk.extensions.sql.meta.provider.text;
import com.alibaba.fastjson.JSONObject;
+import com.google.auto.service.AutoService;
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.InMemoryMetaTableProvider;
+import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.commons.csv.CSVFormat;
@@ -41,6 +43,7 @@
* TBLPROPERTIES '{"format": "Excel"}' -- format of each text line(csv format)
* }</pre>
*/
+@AutoService(TableProvider.class)
public class TextTableProvider extends InMemoryMetaTableProvider {
@Override
diff --git
a/sdks/java/extensions/sql/src/main/resources/META-INF/services/java.sql.Driver
b/sdks/java/extensions/sql/src/main/resources/META-INF/services/java.sql.Driver
deleted file mode 100644
index ecea8158b70..00000000000
---
a/sdks/java/extensions/sql/src/main/resources/META-INF/services/java.sql.Driver
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.beam.sdk.extensions.sql.impl.JdbcDriver
----------------------------------------------------------------
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: 109799)
Time Spent: 12h 20m (was: 12h 10m)
> [SQL] Investigate JDBC interface for Beam SQL
> ---------------------------------------------
>
> Key: BEAM-3773
> URL: https://issues.apache.org/jira/browse/BEAM-3773
> Project: Beam
> Issue Type: Improvement
> Components: dsl-sql
> Reporter: Anton Kedin
> Assignee: Andrew Pilloud
> Priority: Major
> Time Spent: 12h 20m
> Remaining Estimate: 0h
>
> JDBC allows integration with a lot of third-party tools, e.g
> [Zeppelin|https://zeppelin.apache.org/docs/0.7.0/manual/interpreters.html],
> [sqlline|https://github.com/julianhyde/sqlline]. We should look into how
> feasible it is to implement a JDBC interface for Beam SQL
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
