From 033c30487434e44d85ff181bff4b5a84392e0b61 Mon Sep 17 00:00:00 2001 From: Chamikara Jayalath Date: Wed, 20 Jul 2022 17:55:17 -0700 Subject: [PATCH] Remove unnecessary reference to use_runner_v2 experiment in x-lang examples and documentation --- sdks/python/apache_beam/examples/kafkataxi/README.md | 6 ++---- sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py | 3 +-- sdks/python/apache_beam/examples/sql_taxi.py | 5 ++--- sdks/python/apache_beam/examples/wordcount_xlang_sql.py | 5 ++--- .../en/documentation/sdks/java-multi-language-pipelines.md | 3 +-- .../documentation/sdks/python-multi-language-pipelines.md | 2 -- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sdks/python/apache_beam/examples/kafkataxi/README.md b/sdks/python/apache_beam/examples/kafkataxi/README.md index dc086e36c3d3..c4e808cad8b4 100644 --- a/sdks/python/apache_beam/examples/kafkataxi/README.md +++ b/sdks/python/apache_beam/examples/kafkataxi/README.md @@ -104,8 +104,7 @@ python -m apache_beam.examples.kafkataxi.kafka_taxi \ --region $REGION \ --num_workers $NUM_WORKERS \ --job_name $JOB_NAME \ - --bootstrap_servers $BOOTSTRAP_SERVER \ - --experiments=use_runner_v2 + --bootstrap_servers $BOOTSTRAP_SERVER ``` ## *(Optional)* Running the Example from a Beam Git Clone @@ -185,6 +184,5 @@ python -m apache_beam.examples.kafkataxi.kafka_taxi \ --num_workers $NUM_WORKERS \ --job_name $JOB_NAME \ --bootstrap_servers $BOOTSTRAP_SERVER \ - --sdk_harness_container_image_overrides ".*java.*,${DOCKER_ROOT}/beam_java8_sdk:latest" \ - --experiments=use_runner_v2 + --sdk_harness_container_image_overrides ".*java.*,${DOCKER_ROOT}/beam_java8_sdk:latest" ``` diff --git a/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py b/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py index 96fee057b322..1cdd266c3df4 100644 --- a/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py +++ b/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py @@ -49,8 +49,7 @@ def run( # '--runner', 'DataflowRunner', # '--temp_location', 'my-temp-location', # '--region', 'my-region', - # '--num_workers', 'my-num-workers', - # '--experiments', 'use_runner_v2'] + # '--num_workers', 'my-num-workers'] window_size = 15 # size of the Window in seconds. diff --git a/sdks/python/apache_beam/examples/sql_taxi.py b/sdks/python/apache_beam/examples/sql_taxi.py index 165bbc9cd9ba..e8a29806d72a 100644 --- a/sdks/python/apache_beam/examples/sql_taxi.py +++ b/sdks/python/apache_beam/examples/sql_taxi.py @@ -22,9 +22,8 @@ the data in 15s windows using SqlTransform, and writes the output to a user-defined PubSub topic. -Java 8 must be available to run this pipeline, and the ---experiments=use_runner_v2 flag must be passed when running on Dataflow. -Docker must also be available to run this pipeline locally. +A Java version supported by Beam must be installed locally to run this pipeline. +Additionally, Docker must also be available to run this pipeline locally. """ # pytype: skip-file diff --git a/sdks/python/apache_beam/examples/wordcount_xlang_sql.py b/sdks/python/apache_beam/examples/wordcount_xlang_sql.py index 97a43d386c75..9d7d756f223f 100644 --- a/sdks/python/apache_beam/examples/wordcount_xlang_sql.py +++ b/sdks/python/apache_beam/examples/wordcount_xlang_sql.py @@ -17,9 +17,8 @@ """A word-counting workflow that uses the SQL transform. -Java 8 must be available to run this pipeline, and the ---experiments=use_runner_v2 flag must be passed when running on Dataflow. -Docker must also be available to run this pipeline locally. +A Java version supported by Beam must be installed locally to run this pipeline. +Additionally, Docker must also be available to run this pipeline locally. """ import argparse diff --git a/website/www/site/content/en/documentation/sdks/java-multi-language-pipelines.md b/website/www/site/content/en/documentation/sdks/java-multi-language-pipelines.md index 93243bee9ced..f96fece1e1c4 100644 --- a/website/www/site/content/en/documentation/sdks/java-multi-language-pipelines.md +++ b/website/www/site/content/en/documentation/sdks/java-multi-language-pipelines.md @@ -149,8 +149,7 @@ export PYTHON_VERSION= ./gradlew :examples:multi-language:pythonDataframeWordCount --args=" \ --runner=DataflowRunner \ --output=gs://${OUTPUT_BUCKET}/count \ ---region=${GCP_REGION} \ ---experiments=use_runner_v2" +--region=${GCP_REGION}" ``` The pipeline outputs a file with the results to diff --git a/website/www/site/content/en/documentation/sdks/python-multi-language-pipelines.md b/website/www/site/content/en/documentation/sdks/python-multi-language-pipelines.md index 668dcd881d93..332a62901a23 100644 --- a/website/www/site/content/en/documentation/sdks/python-multi-language-pipelines.md +++ b/website/www/site/content/en/documentation/sdks/python-multi-language-pipelines.md @@ -205,7 +205,6 @@ export NUM_WORKERS="1" gsutil rm gs://$GCS_BUCKET/javaprefix/* -# --experiments=use_runner_v2 is optional for Beam 2.32.0 and later python addprefix.py \ --runner DataflowRunner \ --temp_location $TEMP_LOCATION \ @@ -213,7 +212,6 @@ python addprefix.py \ --region $GCP_REGION \ --job_name $JOB_NAME \ --num_workers $NUM_WORKERS \ - --experiments=use_runner_v2 \ --input "gs://dataflow-samples/shakespeare/kinglear.txt" \ --output "gs://$GCS_BUCKET/javaprefix/output" ```