From cd20d08571762cafc1f1bcffd2492605019f2925 Mon Sep 17 00:00:00 2001 From: TG infra <> Date: Thu, 8 Feb 2024 20:04:30 +0000 Subject: [PATCH] [Automated]JDBC Driver Release 1.3.17 --- tools/etl/tg-jdbc-driver/CHANGELOG.md | 4 ++ tools/etl/tg-jdbc-driver/README.md | 6 +-- .../etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml | 51 +++++++++++++------ .../tg-jdbc-driver/src/assembly/package.xml | 2 +- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/tools/etl/tg-jdbc-driver/CHANGELOG.md b/tools/etl/tg-jdbc-driver/CHANGELOG.md index b5631f63..4491ef18 100644 --- a/tools/etl/tg-jdbc-driver/CHANGELOG.md +++ b/tools/etl/tg-jdbc-driver/CHANGELOG.md @@ -1,3 +1,7 @@ +## Release 1.3.17 +* Supported TG Version: 2.4.1+ +* Support 3 release types: jar, jar with dependencies, tar.gz + ## Release 1.3.15 * Supported TG Version: 2.4.1+ * Bugfixes: diff --git a/tools/etl/tg-jdbc-driver/README.md b/tools/etl/tg-jdbc-driver/README.md index 557f874b..17053e07 100644 --- a/tools/etl/tg-jdbc-driver/README.md +++ b/tools/etl/tg-jdbc-driver/README.md @@ -537,7 +537,7 @@ df2.write.mode("overwrite").format("jdbc").options( If you use a Spark job to connect TigerGraph via JDBC, we recommend your concurrent Spark loading jobs be capped at 10 with the following per job configuration. This limits the concurrent JDBC connections to 40. ``` /* 2 executors per job and each executor takes 2 cores */ -/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar -—num-executors 2 —-executor-cores 2 -i test.scala +/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar -—num-executors 2 —-executor-cores 2 -i test.scala ``` ``` val df = sc.textFile("/path/to/your_file", 100).toDF() @@ -653,7 +653,7 @@ val dbtable2 = """interpreted INTERPRET QUERY (int lowerBound = 0, int upperBoun Save any piece of the above script in a file (e.g., test.scala), and run it like this: ``` -/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar -i test.scala +/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar -i test.scala ``` **Please do NOT print multiple objects (i.e., variable list, vertex set, edge set, etc.) in your query if it needs to be invoked via Spark. Otherwise, only one object could be printed. The output format of TigerGraph is JSON, which is an unordered collection of key/value pairs. So the order could not be guaranteed.** @@ -668,7 +668,7 @@ Please add the following options to your scala script: And run it with **"--files"** option like this: ``` -/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar --files /path/to/trust.jks -i test.scala +/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar --files /path/to/trust.jks -i test.scala ``` The `--files` should be provided the JKS file path, while the `"trustStore" -> "trust.jks"` should be the JKS filename only. diff --git a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml index 41acdf8d..d4d809f0 100644 --- a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml +++ b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 com.tigergraph tigergraph-jdbc-driver - 1.3.15 + 1.3.17 jar TigerGraph JDBC Driver Parent @@ -140,18 +142,18 @@ 1.19 - check-java-8-compatibility - compile - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - + check-java-8-compatibility + compile + + check + + + + org.codehaus.mojo.signature + java18 + 1.0 + + @@ -166,6 +168,22 @@ shade + true + jar-with-dependencies + + + org.apache.http + org.shaded.apache.http + + + org.apache.commons.http + org.shaded.apache.commons.http + + + org.json + org.shaded.json + + *:* @@ -185,7 +203,8 @@ - + false @@ -322,4 +341,4 @@ - + \ No newline at end of file diff --git a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml index 4946c93a..09886049 100644 --- a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml +++ b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml @@ -10,7 +10,7 @@ - ${project.build.directory}/original-${project.artifactId}-${project.version}.jar + ${project.build.directory}/${project.artifactId}-${project.version}.jar ${project.artifactId}-${project.version}.jar /