Skip to content

[BEAM-9379] Vendor Calcite 1.26.0 #14146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apilloud merged 2 commits into from
Mar 8, 2021
Merged

[BEAM-9379] Vendor Calcite 1.26.0 #14146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd6b3c2
[BEAM-9379] Update vendored Calcite to 1.26.0
nielsbasjes Sep 2, 2020
e4d09bb
[BEAM-9379] Fix linkage issues
apilloud Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ include(":sdks:python:test-suites:tox:py37")
include(":sdks:python:test-suites:tox:py38")
include(":vendor:grpc-1_26_0")
include(":vendor:bytebuddy-1_10_8")
include(":vendor:calcite-1_20_0")
include(":vendor:calcite-1_26_0")
include(":vendor:guava-26_0-jre")
include(":website")
include(":runners:google-cloud-dataflow-java:worker:legacy-worker")
Expand Down
59 changes: 47 additions & 12 deletions vendor/calcite-1_20_0/build.gradle → vendor/calcite-1_26_0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,82 @@

plugins { id 'org.apache.beam.vendor-java' }

description = "Apache Beam :: Vendored Dependencies :: Calcite 1.20.0"
description = "Apache Beam :: Vendored Dependencies :: Calcite 1.26.0"

group = "org.apache.beam"
version = "0.2"
version = "0.1"

def calcite_version = "1.20.0"
def avatica_version = "1.16.0"
def prefix = "org.apache.beam.vendor.calcite.v1_20_0"
def calcite_version = "1.26.0"
def avatica_version = "1.17.0"
def prefix = "org.apache.beam.vendor.calcite.v1_26_0"

List<String> packagesToRelocate = [
"com.esri",
"com.fasterxml",
"com.google.common",
"com.google.thirdparty",
"com.google.protobuf",
"com.fasterxml",
"com.google.thirdparty",
"com.google.uzaygezen",
"com.jayway",
"com.yahoo",
"net.minidev",
"org.apache.calcite",
"org.apache.commons",
"org.apache.http",
"org.apiguardian.api",
"org.codehaus",
"org.objectweb",
"org.pentaho",
"org.yaml"
"org.yaml",
]

vendorJava(
dependencies: [
"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
],
runtimeDependencies: [
library.java.slf4j_api,
],
relocations: packagesToRelocate.collectEntries {
[ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"]
},
exclusions: [
// Code quality / Building annotations
"com/google/errorprone/**",
"com/google/j2objc/annotations/**",
"javax/annotation/**",
"org/checkerframework/**",
"org/jmlspecs/**",

// Runtime logging interface
"org/slf4j/**",
"**/module-info.class"
"org/apache/log4j/**",
"org/apache/logging/log4j/**",
"META-INF/versions/9/org/apache/logging/log4j/**",

// Optional loggers
"org/apache/commons/logging/impl/AvalonLogger*",
"org/apache/commons/logging/impl/LogKitLogger*",

// Optional JSON providers
"com/jayway/jsonpath/spi/json/GsonJsonProvider*",
"com/jayway/jsonpath/spi/json/JettisonProvider*",
"com/jayway/jsonpath/spi/json/JsonOrgJsonProvider*",
"com/jayway/jsonpath/spi/json/TapestryJsonProvider*",
"com/jayway/jsonpath/spi/mapper/GsonMappingProvider*",
"com/jayway/jsonpath/spi/mapper/JsonOrgMappingProvider*",
"com/jayway/jsonpath/spi/mapper/TapestryMappingProvider*",

// Unused broken code
"org/apache/commons/dbcp2/managed/**",
"org/apache/commons/pool2/proxy/**",
"org/codehaus/janino/AntCompilerAdapter*",

"**/module-info.class",
],
groupId: group,
artifactId: "beam-vendor-calcite-1_20_0",
artifactId: "beam-vendor-calcite-1_26_0",
version: version,
)