From 661ad4f13f0a9831f738644e35830fe323375146 Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Thu, 5 Mar 2020 10:30:43 -0800 Subject: [PATCH 01/10] vendor calcite 1.22.0 --- settings.gradle | 2 +- vendor/{calcite-1_20_0 => calcite-1_22_0}/build.gradle | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename vendor/{calcite-1_20_0 => calcite-1_22_0}/build.gradle (92%) diff --git a/settings.gradle b/settings.gradle index 580d3159ce47..be60ab288e02 100644 --- a/settings.gradle +++ b/settings.gradle @@ -152,7 +152,7 @@ include ":sdks:python:test-suites:tox:py36" include ":sdks:python:test-suites:tox:py37" include ":vendor:grpc-1_26_0" include ":vendor:bytebuddy-1_10_8" -include ":vendor:calcite-1_20_0" +include ":vendor:calcite-1_22_0" include ":vendor:guava-26_0-jre" include ":vendor:sdks-java-extensions-protobuf" include ":website" diff --git a/vendor/calcite-1_20_0/build.gradle b/vendor/calcite-1_22_0/build.gradle similarity index 92% rename from vendor/calcite-1_20_0/build.gradle rename to vendor/calcite-1_22_0/build.gradle index 5ea3e81233df..9f64c6ff6cc1 100644 --- a/vendor/calcite-1_20_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -18,14 +18,14 @@ plugins { id 'org.apache.beam.vendor-java' } -description = "Apache Beam :: Vendored Dependencies :: Calcite 1.20.0" +description = "Apache Beam :: Vendored Dependencies :: Calcite 1.22.0" group = "org.apache.beam" -version = "0.2" +version = "0.1" -def calcite_version = "1.20.0" +def calcite_version = "1.22.0" def avatica_version = "1.16.0" -def prefix = "org.apache.beam.vendor.calcite.v1_20_0" +def prefix = "org.apache.beam.vendor.calcite.v1_22_0" List packagesToRelocate = [ "com.esri", @@ -58,6 +58,6 @@ vendorJava( "org/slf4j/**" ], groupId: group, - artifactId: "beam-vendor-calcite-1_20_0", + artifactId: "beam-vendor-calcite-1_22_0", version: version, ) From fe532326f4b198ebcdab968dec5f07acb4fd8897 Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Thu, 5 Mar 2020 23:01:40 -0800 Subject: [PATCH 02/10] fix linkage --- vendor/calcite-1_22_0/build.gradle | 34 ++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 9f64c6ff6cc1..98f7a610ff43 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -33,12 +33,10 @@ List packagesToRelocate = [ "com.google.thirdparty", "com.google.protobuf", "com.fasterxml", - "com.jayway", "com.yahoo", "org.apache.calcite", "org.apache.commons", "org.apache.http", - "org.codehaus", "org.pentaho", "org.yaml" ] @@ -49,13 +47,41 @@ vendorJava( "org.apache.calcite:calcite-linq4j:$calcite_version", "org.apache.calcite.avatica:avatica-core:$avatica_version", library.java.protobuf_java, - library.java.slf4j_api + library.java.slf4j_api, + "com.google.code.gson:gson:2.8.6", + "org.json:json:20190722", + "org.apache.ant:ant:1.9.2", + "com.jayway.jsonpath:json-path:2.4.0", + "org.apache.tapestry:tapestry-json:5.4.3", + + "org.easymock:easymock:3.3.1", + "org.antlr:stringtemplate:3.2.1", + "org.codehaus.jettison:jettison:1.4.0", + "org.easymock:easymock:4.1", + "org.testng:testng:7.1.0", + "cglib:cglib:3.3.0", + "javax.transaction:javax.transaction-api:1.2", + "javax.servlet:javax.servlet-api:3.0.1", + "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227" + ], + runtimeDependencies: [ + "com.google.errorprone:error_prone_annotations:2.3.3", + "commons-logging:commons-logging:1.2", + "org.antlr:antlr-runtime:3.1.2", + "org.apache.logging.log4j:log4j-api:2.6.2", + "org.slf4j:slf4j-api:1.7.21" + ], + testDependencies: [ + "junit:junit:4.12" + ], relocations: packagesToRelocate.collectEntries { [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] }, exclusions: [ - "org/slf4j/**" + "org/apache/log/**", + "org/apache/log4j/**", + "org/apache/logging/log4j/**", ], groupId: group, artifactId: "beam-vendor-calcite-1_22_0", From 1bc56eac6c2f53436f69ee665c4fd157e07c9a40 Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Sat, 7 Mar 2020 21:00:48 -0800 Subject: [PATCH 03/10] fix validate vendoring --- vendor/calcite-1_22_0/build.gradle | 32 +++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 98f7a610ff43..329dcbc5edde 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -32,13 +32,33 @@ List packagesToRelocate = [ "com.google.common", "com.google.thirdparty", "com.google.protobuf", + "com.google.inject", + "com.google.gson", "com.fasterxml", "com.yahoo", "org.apache.calcite", "org.apache.commons", "org.apache.http", + "org.apache.tool", "org.pentaho", - "org.yaml" + "org.yaml", + "org.testng", + "antlr", + "org.antlr", + "org.objenesis", + "org.eclipse.jetty", + "com.beust", + "org.codehaus", + "net.minidev", + "net.sf", + "org.objectweb", + "org.easymock", + "org.json", + "com.jayway.jsonpath", + "org.aopalliance", + "org.apiguardian.api", + "org.slf4j", + "javax" ] vendorJava( @@ -51,8 +71,6 @@ vendorJava( "com.google.code.gson:gson:2.8.6", "org.json:json:20190722", "org.apache.ant:ant:1.9.2", - "com.jayway.jsonpath:json-path:2.4.0", - "org.apache.tapestry:tapestry-json:5.4.3", "org.easymock:easymock:3.3.1", "org.antlr:stringtemplate:3.2.1", @@ -65,11 +83,11 @@ vendorJava( "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227" ], runtimeDependencies: [ - "com.google.errorprone:error_prone_annotations:2.3.3", "commons-logging:commons-logging:1.2", "org.antlr:antlr-runtime:3.1.2", "org.apache.logging.log4j:log4j-api:2.6.2", - "org.slf4j:slf4j-api:1.7.21" + "org.slf4j:slf4j-api:1.7.21", + "com.jayway.jsonpath:json-path:2.4.0", ], testDependencies: [ "junit:junit:4.12" @@ -82,6 +100,10 @@ vendorJava( "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", + "junit/**", + "org/junit/**", + "com/google/errorprone/**", + "module-info.class" ], groupId: group, artifactId: "beam-vendor-calcite-1_22_0", From b5022b034ac862c4a35f69dc8a1904a626709bcb Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Sat, 7 Mar 2020 21:06:31 -0800 Subject: [PATCH 04/10] sort lines alphabetically --- vendor/calcite-1_22_0/build.gradle | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 329dcbc5edde..bd6e6526d6ab 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -28,37 +28,37 @@ def avatica_version = "1.16.0" def prefix = "org.apache.beam.vendor.calcite.v1_22_0" List packagesToRelocate = [ + "antlr", + "com.beust", "com.esri", + "com.fasterxml", "com.google.common", - "com.google.thirdparty", - "com.google.protobuf", - "com.google.inject", "com.google.gson", - "com.fasterxml", + "com.google.inject", + "com.google.protobuf", + "com.google.thirdparty", + "com.jayway.jsonpath", "com.yahoo", + "javax", + "net.minidev", + "net.sf", + "org.antlr", + "org.aopalliance", "org.apache.calcite", "org.apache.commons", "org.apache.http", "org.apache.tool", - "org.pentaho", - "org.yaml", - "org.testng", - "antlr", - "org.antlr", - "org.objenesis", - "org.eclipse.jetty", - "com.beust", + "org.apiguardian.api", "org.codehaus", - "net.minidev", - "net.sf", - "org.objectweb", "org.easymock", + "org.eclipse.jetty", "org.json", - "com.jayway.jsonpath", - "org.aopalliance", - "org.apiguardian.api", + "org.objectweb", + "org.objenesis", + "org.pentaho", "org.slf4j", - "javax" + "org.testng", + "org.yaml", ] vendorJava( @@ -68,26 +68,26 @@ vendorJava( "org.apache.calcite.avatica:avatica-core:$avatica_version", library.java.protobuf_java, library.java.slf4j_api, + + "cglib:cglib:3.3.0", "com.google.code.gson:gson:2.8.6", - "org.json:json:20190722", - "org.apache.ant:ant:1.9.2", - - "org.easymock:easymock:3.3.1", + "javax.servlet:javax.servlet-api:3.0.1", + "javax.transaction:javax.transaction-api:1.2", "org.antlr:stringtemplate:3.2.1", + "org.apache.ant:ant:1.9.2", "org.codehaus.jettison:jettison:1.4.0", + "org.easymock:easymock:3.3.1", "org.easymock:easymock:4.1", + "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227", + "org.json:json:20190722", "org.testng:testng:7.1.0", - "cglib:cglib:3.3.0", - "javax.transaction:javax.transaction-api:1.2", - "javax.servlet:javax.servlet-api:3.0.1", - "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227" ], runtimeDependencies: [ + "com.jayway.jsonpath:json-path:2.4.0", "commons-logging:commons-logging:1.2", "org.antlr:antlr-runtime:3.1.2", "org.apache.logging.log4j:log4j-api:2.6.2", "org.slf4j:slf4j-api:1.7.21", - "com.jayway.jsonpath:json-path:2.4.0", ], testDependencies: [ "junit:junit:4.12" @@ -97,13 +97,13 @@ vendorJava( [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] }, exclusions: [ + "com/google/errorprone/**", + "junit/**", + "module-info.class", "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", - "junit/**", "org/junit/**", - "com/google/errorprone/**", - "module-info.class" ], groupId: group, artifactId: "beam-vendor-calcite-1_22_0", From 0d87a15a34cdd73fad0d454e2b708e4f90cd46ca Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Mon, 9 Mar 2020 09:34:49 -0700 Subject: [PATCH 05/10] fix --- vendor/calcite-1_22_0/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index bd6e6526d6ab..8afe1838055a 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -68,7 +68,7 @@ vendorJava( "org.apache.calcite.avatica:avatica-core:$avatica_version", library.java.protobuf_java, library.java.slf4j_api, - + "cglib:cglib:3.3.0", "com.google.code.gson:gson:2.8.6", "javax.servlet:javax.servlet-api:3.0.1", @@ -76,7 +76,6 @@ vendorJava( "org.antlr:stringtemplate:3.2.1", "org.apache.ant:ant:1.9.2", "org.codehaus.jettison:jettison:1.4.0", - "org.easymock:easymock:3.3.1", "org.easymock:easymock:4.1", "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227", "org.json:json:20190722", @@ -90,7 +89,7 @@ vendorJava( "org.slf4j:slf4j-api:1.7.21", ], testDependencies: [ - "junit:junit:4.12" + "junit:junit:4.12", ], relocations: packagesToRelocate.collectEntries { @@ -104,6 +103,7 @@ vendorJava( "org/apache/log4j/**", "org/apache/logging/log4j/**", "org/junit/**", + "org/slf4j/**", ], groupId: group, artifactId: "beam-vendor-calcite-1_22_0", From c8e6676d740beb7ce356f98eb58bce84dd8bd038 Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Sun, 12 Apr 2020 21:20:38 -0700 Subject: [PATCH 06/10] address some comments --- vendor/calcite-1_22_0/build.gradle | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 8afe1838055a..271726d45098 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -37,9 +37,8 @@ List packagesToRelocate = [ "com.google.inject", "com.google.protobuf", "com.google.thirdparty", - "com.jayway.jsonpath", + "com.jayway", "com.yahoo", - "javax", "net.minidev", "net.sf", "org.antlr", @@ -51,12 +50,10 @@ List packagesToRelocate = [ "org.apiguardian.api", "org.codehaus", "org.easymock", - "org.eclipse.jetty", "org.json", "org.objectweb", "org.objenesis", "org.pentaho", - "org.slf4j", "org.testng", "org.yaml", ] @@ -71,22 +68,22 @@ vendorJava( "cglib:cglib:3.3.0", "com.google.code.gson:gson:2.8.6", - "javax.servlet:javax.servlet-api:3.0.1", - "javax.transaction:javax.transaction-api:1.2", + "com.jayway.jsonpath:json-path:2.4.0", + "commons-logging:commons-logging:1.2", "org.antlr:stringtemplate:3.2.1", + "org.antlr:antlr-runtime:3.1.2", "org.apache.ant:ant:1.9.2", "org.codehaus.jettison:jettison:1.4.0", "org.easymock:easymock:4.1", - "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227", "org.json:json:20190722", + "org.apache.logging.log4j:log4j-api:2.6.2", + "org.slf4j:slf4j-api:1.7.21", "org.testng:testng:7.1.0", ], runtimeDependencies: [ - "com.jayway.jsonpath:json-path:2.4.0", - "commons-logging:commons-logging:1.2", - "org.antlr:antlr-runtime:3.1.2", - "org.apache.logging.log4j:log4j-api:2.6.2", - "org.slf4j:slf4j-api:1.7.21", + "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227", + "javax.servlet:javax.servlet-api:3.0.1", + "javax.transaction:javax.transaction-api:1.2" ], testDependencies: [ "junit:junit:4.12", @@ -98,11 +95,13 @@ vendorJava( exclusions: [ "com/google/errorprone/**", "junit/**", + "javax/**", "module-info.class", "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", "org/junit/**", + "org/eclipse/jetty/**", "org/slf4j/**", ], groupId: group, From 8db3db68b8aa2bb0a096d5af411c23e0538e6e1a Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Wed, 15 Apr 2020 00:53:33 -0700 Subject: [PATCH 07/10] fix --- vendor/calcite-1_22_0/build.gradle | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 271726d45098..98681817a0fe 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -50,6 +50,7 @@ List packagesToRelocate = [ "org.apiguardian.api", "org.codehaus", "org.easymock", + "org.eclipse.jetty", "org.json", "org.objectweb", "org.objenesis", @@ -63,27 +64,28 @@ vendorJava( "org.apache.calcite:calcite-core:$calcite_version", "org.apache.calcite:calcite-linq4j:$calcite_version", "org.apache.calcite.avatica:avatica-core:$avatica_version", + library.java.protobuf_java, - library.java.slf4j_api, - "cglib:cglib:3.3.0", "com.google.code.gson:gson:2.8.6", - "com.jayway.jsonpath:json-path:2.4.0", - "commons-logging:commons-logging:1.2", "org.antlr:stringtemplate:3.2.1", "org.antlr:antlr-runtime:3.1.2", "org.apache.ant:ant:1.9.2", "org.codehaus.jettison:jettison:1.4.0", + "org.eclipse.jetty:jetty-http:9.4.15.v20190215", + "org.eclipse.jetty:jetty-security:9.4.15.v20190215", + "org.eclipse.jetty:jetty-server:9.4.15.v20190215", + "org.eclipse.jetty:jetty-util:9.4.15.v20190215", "org.easymock:easymock:4.1", + "com.jayway.jsonpath:json-path:2.4.0", "org.json:json:20190722", - "org.apache.logging.log4j:log4j-api:2.6.2", - "org.slf4j:slf4j-api:1.7.21", "org.testng:testng:7.1.0", ], runtimeDependencies: [ - "org.eclipse.jetty:jetty-jmx:9.4.27.v20200227", - "javax.servlet:javax.servlet-api:3.0.1", - "javax.transaction:javax.transaction-api:1.2" + library.java.slf4j_api, + "org.apache.logging.log4j:log4j-api:2.6.2", + "commons-logging:commons-logging:1.2", + "javax.servlet:javax.servlet-api:4.0.1", ], testDependencies: [ "junit:junit:4.12", @@ -95,13 +97,13 @@ vendorJava( exclusions: [ "com/google/errorprone/**", "junit/**", - "javax/**", +// "javax/**", "module-info.class", "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", "org/junit/**", - "org/eclipse/jetty/**", +// "org/eclipse/jetty/**", "org/slf4j/**", ], groupId: group, From 8cc7aab694ce9b213411b00d432dae652a91305c Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Wed, 15 Apr 2020 22:33:02 -0700 Subject: [PATCH 08/10] fix check --- vendor/calcite-1_22_0/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index 98681817a0fe..a55d0ab651d6 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -67,6 +67,7 @@ vendorJava( library.java.protobuf_java, "cglib:cglib:3.3.0", + "com.jayway.jsonpath:json-path:2.4.0", "com.google.code.gson:gson:2.8.6", "org.antlr:stringtemplate:3.2.1", "org.antlr:antlr-runtime:3.1.2", @@ -77,7 +78,6 @@ vendorJava( "org.eclipse.jetty:jetty-server:9.4.15.v20190215", "org.eclipse.jetty:jetty-util:9.4.15.v20190215", "org.easymock:easymock:4.1", - "com.jayway.jsonpath:json-path:2.4.0", "org.json:json:20190722", "org.testng:testng:7.1.0", ], @@ -97,13 +97,14 @@ vendorJava( exclusions: [ "com/google/errorprone/**", "junit/**", -// "javax/**", + "javax/annotation/**", + "javax/inject/**", + "javax/servlet/**", "module-info.class", "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", "org/junit/**", -// "org/eclipse/jetty/**", "org/slf4j/**", ], groupId: group, From 47800064d91a4b402bc043da84787f5b68e0357d Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Tue, 21 Apr 2020 21:15:44 -0700 Subject: [PATCH 09/10] fix comments --- vendor/calcite-1_22_0/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index a55d0ab651d6..a731b1b5412b 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -39,6 +39,9 @@ List packagesToRelocate = [ "com.google.thirdparty", "com.jayway", "com.yahoo", + "javax.annotation", + "javax.inject", + "javax.servlet", "net.minidev", "net.sf", "org.antlr", @@ -69,6 +72,7 @@ vendorJava( "cglib:cglib:3.3.0", "com.jayway.jsonpath:json-path:2.4.0", "com.google.code.gson:gson:2.8.6", + "javax.servlet:javax.servlet-api:4.0.1", "org.antlr:stringtemplate:3.2.1", "org.antlr:antlr-runtime:3.1.2", "org.apache.ant:ant:1.9.2", @@ -85,7 +89,6 @@ vendorJava( library.java.slf4j_api, "org.apache.logging.log4j:log4j-api:2.6.2", "commons-logging:commons-logging:1.2", - "javax.servlet:javax.servlet-api:4.0.1", ], testDependencies: [ "junit:junit:4.12", @@ -97,9 +100,6 @@ vendorJava( exclusions: [ "com/google/errorprone/**", "junit/**", - "javax/annotation/**", - "javax/inject/**", - "javax/servlet/**", "module-info.class", "org/apache/log/**", "org/apache/log4j/**", From ba476464bb79d2f2a656a05ceb7114e34f82e078 Mon Sep 17 00:00:00 2001 From: Kai Jiang Date: Tue, 21 Apr 2020 21:30:22 -0700 Subject: [PATCH 10/10] merge BEAM-9765 --- vendor/calcite-1_22_0/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle index a731b1b5412b..e1bfa96fd45c 100644 --- a/vendor/calcite-1_22_0/build.gradle +++ b/vendor/calcite-1_22_0/build.gradle @@ -100,7 +100,7 @@ vendorJava( exclusions: [ "com/google/errorprone/**", "junit/**", - "module-info.class", + "**/module-info.class", "org/apache/log/**", "org/apache/log4j/**", "org/apache/logging/log4j/**",