Skip to content

Commit a3fd151

Browse files
authored
Fix sql example in playground (#36358)
1 parent 666c75a commit a3fd151

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

playground/backend/containers/java/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
###############################################################################
18-
ARG BEAM_VERSION=2.44.0
18+
ARG BEAM_VERSION=2.68.0
1919
FROM golang:1-bullseye AS build
2020
ARG BEAM_VERSION
2121
ARG GIT_COMMIT="<unknown>"
@@ -56,15 +56,15 @@ FROM apache/beam_java11_sdk:$BEAM_VERSION
5656

5757
ARG BEAM_VERSION
5858
ARG SPRING_VERSION=5.3.27
59-
ARG KAFKA_CLIENTS_VERSION=2.3.1
59+
ARG KAFKA_CLIENTS_VERSION=2.8.2
6060
ENV BEAM_VERSION=$BEAM_VERSION
6161
ENV SERVER_IP=0.0.0.0
6262
ENV SERVER_PORT=8080
6363
ENV APP_WORK_DIR=/opt/playground/backend/
6464
ENV BEAM_SDK="SDK_JAVA"
6565
ENV PROPERTY_PATH=/opt/playground/backend/properties.yaml
66-
ARG CALCITE_VERSION=1_28_0
67-
ARG BYTEBUDDY_VERSION=1.12.14
66+
ARG CALCITE_VERSION=1_40_0
67+
ARG BYTEBUDDY_VERSION=1.14.12
6868
ARG JANINO_VERSION=3.0.11
6969

7070
# Copy build result
@@ -94,8 +94,8 @@ RUN wget https://repo1.maven.org/maven2/org/springframework/spring-jcl/$SPRING_V
9494
RUN wget https://repo1.maven.org/maven2/org/apache/beam/beam-sdks-java-extensions-sql/$BEAM_VERSION/beam-sdks-java-extensions-sql-$BEAM_VERSION.jar &&\
9595
mv beam-sdks-java-extensions-sql-$BEAM_VERSION.jar /opt/apache/beam/jars/beam-sdks-java-extensions-sql.jar
9696

97-
RUN wget https://repo1.maven.org/maven2/org/apache/beam/beam-vendor-calcite-$CALCITE_VERSION/0.2/beam-vendor-calcite-$CALCITE_VERSION-0.2.jar &&\
98-
mv beam-vendor-calcite-$CALCITE_VERSION-0.2.jar /opt/apache/beam/jars/beam-vendor-calcite-$CALCITE_VERSION.jar
97+
RUN wget https://repo1.maven.org/maven2/org/apache/beam/beam-vendor-calcite-$CALCITE_VERSION/0.1/beam-vendor-calcite-$CALCITE_VERSION-0.1.jar &&\
98+
mv beam-vendor-calcite-$CALCITE_VERSION-0.1.jar /opt/apache/beam/jars/beam-vendor-calcite-$CALCITE_VERSION.jar
9999

100100
RUN wget https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/$BYTEBUDDY_VERSION/byte-buddy-$BYTEBUDDY_VERSION.jar &&\
101101
mv byte-buddy-$BYTEBUDDY_VERSION.jar /opt/apache/beam/jars/byte-buddy-$BYTEBUDDY_VERSION.jar
@@ -105,7 +105,7 @@ RUN wget https://repo1.maven.org/maven2/org/codehaus/janino/janino/$JANINO_VERS
105105

106106
RUN wget https://repo1.maven.org/maven2/org/codehaus/janino/commons-compiler/$JANINO_VERSION/commons-compiler-$JANINO_VERSION.jar &&\
107107
mv commons-compiler-$JANINO_VERSION.jar /opt/apache/beam/jars/commons-compiler-$JANINO_VERSION.jar
108-
108+
109109
# Install Java Katas Utils
110110
COPY katas /go/src/katas
111111
RUN cd /go/src/katas &&\

playground/infrastructure/ci_cd.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@ def _run_ci_cd(step: str, raw_sdk: str, origin: Origin, project: str, namespace:
100100
logging.info("Start of searching Playground examples ...")
101101
examples = find_examples(root_dir, subdirs, sdk)
102102

103-
# TODO: remove SqlTransformExample skip when vendor-calcite is on runtime CP (expected by Beam ≥ 2.69.0).
104-
if sdk == SdkEnum.JAVA:
105-
ignored = r"(?:^|/)SqlTransformExample\.java$"
106-
examples = [
107-
e for e in examples
108-
if not (re.search(ignored, e.filepath) or re.search(ignored, str(e.url_vcs)))
109-
]
110103
validate_examples_for_duplicates_by_name(examples)
111104
validate_examples_for_conflicting_datasets(examples)
112105
logging.info("Finish of searching Playground examples")

0 commit comments

Comments
 (0)