(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 2c134ace53a Updating config from bot 2c134ace53a is described below commit 2c134ace53ac64f441ef1b95d014ecef1b3e2640 Author: github-actions AuthorDate: Wed Jun 19 02:41:16 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-build.json b/scripts/ci/pr-bot/state/reviewers-for-label-build.json index 26006761000..d28aae6e159 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-build.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-build.json @@ -1,7 +1,7 @@ { "label": "build", "dateOfLastReviewAssignment": { -"damccorm": 1718098465447, +"damccorm": 1718764874062, "Abacn": 1718709675302 } } \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new df39fa8fb9a Updating config from bot df39fa8fb9a is described below commit df39fa8fb9a0171271675b4019f3af3a2f229cbf Author: github-actions AuthorDate: Wed Jun 19 02:41:15 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31626.json | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31626.json b/scripts/ci/pr-bot/state/pr-state/pr-31626.json index 242a48d7d3b..8a92900947e 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-31626.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-31626.json @@ -1,7 +1,9 @@ { - "commentedAboutFailingChecks": true, - "reviewersAssignedForLabels": {}, - "nextAction": "Author", + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": { +"build": "damccorm" + }, + "nextAction": "Reviewers", "stopReviewerNotifications": false, "remindAfterTestsPass": [], "committerAssigned": false
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 8e24087f17f Updating config from bot 8e24087f17f is described below commit 8e24087f17f8eabb7b347d42da295253c1fbbf36 Author: github-actions AuthorDate: Wed Jun 19 00:36:45 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31645.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31645.json b/scripts/ci/pr-bot/state/pr-state/pr-31645.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31645.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch master updated (eaea331981c -> 0a392e9c238)
This is an automated email from the ASF dual-hosted git repository. robertwb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git from eaea331981c Add counters for bytes read/written per gcs bucket (#31498) add 0a392e9c238 Feature add metrics counting the number of bytes read/written from/to GCS bucket per job (#31466) No new revisions were added by this update. Summary of changes: sdks/python/apache_beam/io/gcp/gcsio.py| 55 --- sdks/python/apache_beam/io/gcp/gcsio_test.py | 62 +- .../python/apache_beam/options/pipeline_options.py | 13 + .../runners/dataflow/internal/apiclient.py | 4 ++ 4 files changed, 125 insertions(+), 9 deletions(-)
(beam) branch master updated (8e308cd666f -> eaea331981c)
This is an automated email from the ASF dual-hosted git repository. robertwb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git from 8e308cd666f Merge pull request #31643: Use correct name for tox doc task. add eaea331981c Add counters for bytes read/written per gcs bucket (#31498) No new revisions were added by this update. Summary of changes: .../sdk/extensions/gcp/options/GcsOptions.java | 30 + .../beam/sdk/extensions/gcp/util/GcsUtil.java | 109 +++-- .../util/channels/CountingReadableByteChannel.java | 63 ++ .../util/channels/CountingSeekableByteChannel.java | 116 ++ .../util/channels/CountingWritableByteChannel.java | 60 ++ .../gcp/util/channels}/package-info.java | 4 +- .../beam/sdk/extensions/gcp/util/GcsUtilTest.java | 131 - .../CountingChannelsIsOpenCloseMethodsTest.java| 105 + .../channels/CountingChannelsReadMethodsTest.java | 122 +++ .../channels/CountingChannelsWriteMethodsTest.java | 118 +++ .../channels/CountingSeekableByteChannelTest.java | 68 +++ 11 files changed, 912 insertions(+), 14 deletions(-) create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingReadableByteChannel.java create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingSeekableByteChannel.java create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingWritableByteChannel.java copy {.test-infra/pipelines/src/main/java/org/apache/beam/testinfra/pipelines/bigquery => sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/channels}/package-info.java (87%) create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingChannelsIsOpenCloseMethodsTest.java create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingChannelsReadMethodsTest.java create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingChannelsWriteMethodsTest.java create mode 100644 sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/channels/CountingSeekableByteChannelTest.java
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 6fb0ecc22dd Updating config from bot 6fb0ecc22dd is described below commit 6fb0ecc22ddeaf2845b67b41fee8275feae4e210 Author: github-actions AuthorDate: Tue Jun 18 23:58:05 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31646.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31646.json b/scripts/ci/pr-bot/state/pr-state/pr-31646.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31646.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 750c0367642 Updating config from bot 750c0367642 is described below commit 750c03676428bd1a85da4ca49f2ad16fd8e24413 Author: github-actions AuthorDate: Tue Jun 18 23:37:51 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31639.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31639.json b/scripts/ci/pr-bot/state/pr-state/pr-31639.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31639.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch asf-site updated: Publishing website 2024/06/18 23:37:50 at commit 8e308cd
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/asf-site by this push: new fcd99cf2e87 Publishing website 2024/06/18 23:37:50 at commit 8e308cd fcd99cf2e87 is described below commit fcd99cf2e87242e3f22cd015c207dae0a2e88d4b Author: runner AuthorDate: Tue Jun 18 23:37:51 2024 + Publishing website 2024/06/18 23:37:50 at commit 8e308cd --- website/generated-content/sitemap.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/generated-content/sitemap.xml b/website/generated-content/sitemap.xml index d7f32c058e0..0435a248c8d 100644 --- a/website/generated-content/sitemap.xml +++ b/website/generated-content/sitemap.xml @@ -1 +1 @@ -http://www.sitemaps.org/schemas/sitemap/0.9"; xmlns:xhtml="http://www.w3.org/1999/xhtml";>/blog/beam-2.56.0/2024-06-18T19:28:34+02:00/categories/blog/2024-06-18T19:28:34+02:00/blog/2024-06-18T19:28:34+02:00/categories/2024-06-18T19:28:34+02:00/catego [...] \ No newline at end of file +http://www.sitemaps.org/schemas/sitemap/0.9"; xmlns:xhtml="http://www.w3.org/1999/xhtml";>/blog/beam-2.56.0/2024-06-18T15:40:59-07:00/categories/blog/2024-06-18T15:40:59-07:00/blog/2024-06-18T15:40:59-07:00/categories/2024-06-18T15:40:59-07:00/catego [...] \ No newline at end of file
(beam) branch fixelversion updated (08e446059e6 -> c30fb4d217f)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a change to branch fixelversion in repository https://gitbox.apache.org/repos/asf/beam.git from 08e446059e6 Fix dependency add c30fb4d217f fix spotbug No new revisions were added by this update. Summary of changes: .../beam/sdk/io/elasticsearch/ElasticsearchIOTestCommon.java | 7 +++ .../java/org/apache/beam/sdk/io/elasticsearch/package-info.java| 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) copy sdks/java/io/{elasticsearch => elasticsearch-tests/elasticsearch-tests-common}/src/main/java/org/apache/beam/sdk/io/elasticsearch/package-info.java (93%)
(beam) branch fixelversion updated (f98366b203e -> 08e446059e6)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a change to branch fixelversion in repository https://gitbox.apache.org/repos/asf/beam.git from f98366b203e Remove elasticsearch-test-5,6 which never exercised on intended version add 08e446059e6 Fix dependency No new revisions were added by this update. Summary of changes: .../elasticsearch-tests/elasticsearch-tests-common/build.gradle | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new ce8cc761219 Updating config from bot ce8cc761219 is described below commit ce8cc7612196ffc5bc143dcdd0cd3a45c9e8e4cd Author: github-actions AuthorDate: Tue Jun 18 23:03:41 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31644.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31644.json b/scripts/ci/pr-bot/state/pr-state/pr-31644.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31644.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch fixelversion created (now f98366b203e)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a change to branch fixelversion in repository https://gitbox.apache.org/repos/asf/beam.git at f98366b203e Remove elasticsearch-test-5,6 which never exercised on intended version No new revisions were added by this update.
(beam) 01/01: Merge pull request #31642: Use correct name for tox doc task.
This is an automated email from the ASF dual-hosted git repository. kenn pushed a commit to branch release-2.57.0 in repository https://gitbox.apache.org/repos/asf/beam.git commit 40653e730b6997395d99efa0fb981b7abed45edc Merge: df480af7776 4b132b29b96 Author: Kenneth Knowles AuthorDate: Tue Jun 18 15:41:09 2024 -0700 Merge pull request #31642: Use correct name for tox doc task. .github/workflows/build_release_candidate.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
(beam) branch release-2.57.0 updated (df480af7776 -> 40653e730b6)
This is an automated email from the ASF dual-hosted git repository. kenn pushed a change to branch release-2.57.0 in repository https://gitbox.apache.org/repos/asf/beam.git from df480af7776 Merge pull request #31562: Cherrypick #31550 and #31602 onto release branch add 4b132b29b96 Use correct name for tox doc task. new 40653e730b6 Merge pull request #31642: Use correct name for tox doc task. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build_release_candidate.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
(beam) branch master updated (aabf7d0fb46 -> 8e308cd666f)
This is an automated email from the ASF dual-hosted git repository. kenn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git from aabf7d0fb46 Bump scikit-learn from 1.0.2 to 1.5.0 in /sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline (#31629) add 9379df192be Use correct name for tox doc task. new 8e308cd666f Merge pull request #31643: Use correct name for tox doc task. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build_release_candidate.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
(beam) 01/01: Merge pull request #31643: Use correct name for tox doc task.
This is an automated email from the ASF dual-hosted git repository. kenn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git commit 8e308cd666fff94c98647d92d3fa8c547362bb18 Merge: aabf7d0fb46 9379df192be Author: Kenneth Knowles AuthorDate: Tue Jun 18 15:40:59 2024 -0700 Merge pull request #31643: Use correct name for tox doc task. .github/workflows/build_release_candidate.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-)
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new a43caa96b07 Updating config from bot a43caa96b07 is described below commit a43caa96b074b7aacd39c4b835e090756d8758a4 Author: github-actions AuthorDate: Tue Jun 18 22:38:39 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31643.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31643.json b/scripts/ci/pr-bot/state/pr-state/pr-31643.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31643.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 8e1e56af68e Updating config from bot 8e1e56af68e is described below commit 8e1e56af68e3ec463f5ac9e85c2642af72ddedaf Author: github-actions AuthorDate: Tue Jun 18 22:32:07 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31642.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31642.json b/scripts/ci/pr-bot/state/pr-state/pr-31642.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31642.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch dependabot/pip/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/scikit-learn-1.5.0 deleted (was c66f3dbfdd0)
This is an automated email from the ASF dual-hosted git repository. tvalentyn pushed a change to branch dependabot/pip/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/scikit-learn-1.5.0 in repository https://gitbox.apache.org/repos/asf/beam.git was c66f3dbfdd0 Bump scikit-learn The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(beam) branch master updated: Bump scikit-learn from 1.0.2 to 1.5.0 in /sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline (#31629)
This is an automated email from the ASF dual-hosted git repository. tvalentyn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new aabf7d0fb46 Bump scikit-learn from 1.0.2 to 1.5.0 in /sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline (#31629) aabf7d0fb46 is described below commit aabf7d0fb46bb8b7ffb3b2f61db3cac75a6f972a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 18 14:29:58 2024 -0700 Bump scikit-learn from 1.0.2 to 1.5.0 in /sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline (#31629) Bumps [scikit-learn](https://github.com/scikit-learn/scikit-learn) from 1.0.2 to 1.5.0. - [Release notes](https://github.com/scikit-learn/scikit-learn/releases) - [Commits](https://github.com/scikit-learn/scikit-learn/compare/1.0.2...1.5.0) --- updated-dependencies: - dependency-name: scikit-learn dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../inference/anomaly_detection/anomaly_detection_pipeline/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/setup.py b/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/setup.py index 72a65ab7281..365b6634d1a 100644 --- a/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/setup.py +++ b/sdks/python/apache_beam/examples/inference/anomaly_detection/anomaly_detection_pipeline/setup.py @@ -31,7 +31,7 @@ from setuptools import find_packages REQUIREMENTS = [ "apache-beam[gcp]==2.41.0", "hdbscan==0.8.28", -"scikit-learn==1.0.2", +"scikit-learn==1.5.0", "transformers==4.36.0", "torch==1.13.1", "pandas==1.3.5",
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new d4da6d35cf5 Updating config from bot d4da6d35cf5 is described below commit d4da6d35cf5ae3079409e4cd3bfc72b936521168 Author: github-actions AuthorDate: Tue Jun 18 21:29:50 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31356.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31356.json b/scripts/ci/pr-bot/state/pr-state/pr-31356.json index 28c0f36dc93..df39b8f2cf1 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-31356.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-31356.json @@ -3,7 +3,7 @@ "reviewersAssignedForLabels": { "python": "shunping" }, - "nextAction": "Reviewers", + "nextAction": "Author", "stopReviewerNotifications": false, "remindAfterTestsPass": [], "committerAssigned": false
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 5bd0e841e08 Updating config from bot 5bd0e841e08 is described below commit 5bd0e841e086364ef86a1f3a6a5b676c6b60fe25 Author: github-actions AuthorDate: Tue Jun 18 18:36:39 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31495.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31495.json b/scripts/ci/pr-bot/state/pr-state/pr-31495.json new file mode 100644 index 000..242a48d7d3b --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31495.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": true, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": false, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch lostluck-patch-3 deleted (was de51848cf3e)
This is an automated email from the ASF dual-hosted git repository. lostluck pushed a change to branch lostluck-patch-3 in repository https://gitbox.apache.org/repos/asf/beam.git was de51848cf3e Update build_release_candidate.yml The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(beam) branch master updated: Update build_release_candidate.yml (#31638)
This is an automated email from the ASF dual-hosted git repository. lostluck pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new 3ed91c880f8 Update build_release_candidate.yml (#31638) 3ed91c880f8 is described below commit 3ed91c880f85d09a45039e70d5136f1c2324916d Author: Robert Burke AuthorDate: Tue Jun 18 11:25:40 2024 -0700 Update build_release_candidate.yml (#31638) Fix issue where the release version directory might not exist yet for the SVN repo when the prism build step occurs. ``` ...Adding prism artifacts to the Dev Apache SVN repo... svn: E15: Can't find parent directory's node while trying to add '/home/runner/work/beam/beam/beam/2.57.0/prism' svn: E155010: The node '/home/runner/work/beam/beam/beam/2.57.0' was not found. ``` Adding --parents makes SVN also add intermediate parents before making the update. --- .github/workflows/build_release_candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_candidate.yml b/.github/workflows/build_release_candidate.yml index ab4b3859177..215f2566634 100644 --- a/.github/workflows/build_release_candidate.yml +++ b/.github/workflows/build_release_candidate.yml @@ -530,6 +530,6 @@ jobs: echo "...Adding prism artifacts to the Dev Apache SVN repo..." - svn add --force prism + svn add --force --parents prism svn status svn commit -m "Staging Prism artifacts for Apache Beam ${RELEASE} RC${RC_NUM}" --non-interactive --username "${{ github.event.inputs.APACHE_ID }}" --password "${{ github.event.inputs.APACHE_PASSWORD }}"
(beam) branch master updated: warn when using auto_unique_labels (#31551)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new 33267eae7d9 warn when using auto_unique_labels (#31551) 33267eae7d9 is described below commit 33267eae7d9e36df8b4714fe6f34e49e9916b266 Author: liferoad AuthorDate: Tue Jun 18 13:46:44 2024 -0400 warn when using auto_unique_labels (#31551) * warn when using auto_unique_labels * Added more notes --- sdks/python/apache_beam/options/pipeline_options.py | 5 - sdks/python/apache_beam/pipeline.py | 9 - sdks/python/apache_beam/pipeline_test.py| 5 - 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sdks/python/apache_beam/options/pipeline_options.py b/sdks/python/apache_beam/options/pipeline_options.py index 55fb2f1703f..626a906f8a0 100644 --- a/sdks/python/apache_beam/options/pipeline_options.py +++ b/sdks/python/apache_beam/options/pipeline_options.py @@ -556,7 +556,10 @@ class StandardOptions(PipelineOptions): action='store_true', help='Whether to automatically generate unique transform labels ' 'for every transform. The default behavior is to raise an ' -'exception if a transform is created with a non-unique label.') +'exception if a transform is created with a non-unique label. ' +'Using --auto_unique_labels could cause data loss when ' +'updating a pipeline or reloading the job state. ' +'This is not recommended for streaming jobs.') class StreamingOptions(PipelineOptions): diff --git a/sdks/python/apache_beam/pipeline.py b/sdks/python/apache_beam/pipeline.py index a20fae2ae73..128ab9206bf 100644 --- a/sdks/python/apache_beam/pipeline.py +++ b/sdks/python/apache_beam/pipeline.py @@ -694,6 +694,10 @@ class Pipeline(HasDisplayData): if auto_unique_labels: # If auto_unique_labels is set, we will append a unique suffix to the # label to make it unique. +logging.warning( +'Using --auto_unique_labels could cause data loss when ' +'updating a pipeline or reloading the job state. ' +'This is not recommended for streaming jobs.') unique_label = self._generate_unique_label(transform) return self.apply(transform, pvalueish, unique_label) else: @@ -702,7 +706,10 @@ class Pipeline(HasDisplayData): 'To apply a transform with a specified label, write ' 'pvalue | "label" >> transform or use the option ' '"auto_unique_labels" to automatically generate unique ' -'transform labels' % full_label) +'transform labels. Note "auto_unique_labels" ' +'could cause data loss when updating a pipeline or ' +'reloading the job state. This is not recommended for ' +'streaming jobs.' % full_label) self.applied_labels.add(full_label) pvalueish, inputs = transform._extract_input_pvalues(pvalueish) diff --git a/sdks/python/apache_beam/pipeline_test.py b/sdks/python/apache_beam/pipeline_test.py index 8d6cf4aceea..b11211668e9 100644 --- a/sdks/python/apache_beam/pipeline_test.py +++ b/sdks/python/apache_beam/pipeline_test.py @@ -267,7 +267,10 @@ class PipelineTest(unittest.TestCase): 'pipeline. To apply a transform with a specified label, write ' 'pvalue | "label" >> transform or use the option ' '"auto_unique_labels" to automatically generate unique ' -'transform labels') +'transform labels. Note "auto_unique_labels" ' +'could cause data loss when updating a pipeline or ' +'reloading the job state. This is not recommended for ' +'streaming jobs.') def test_auto_unique_labels(self):
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 26fcaf93e32 Updating config from bot 26fcaf93e32 is described below commit 26fcaf93e32d9e86914de4bf43b6ea96ea314502 Author: github-actions AuthorDate: Tue Jun 18 17:38:07 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31638.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31638.json b/scripts/ci/pr-bot/state/pr-state/pr-31638.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31638.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch lostluck-patch-3 created (now de51848cf3e)
This is an automated email from the ASF dual-hosted git repository. lostluck pushed a change to branch lostluck-patch-3 in repository https://gitbox.apache.org/repos/asf/beam.git at de51848cf3e Update build_release_candidate.yml This branch includes the following new commits: new de51848cf3e Update build_release_candidate.yml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(beam) 01/01: Update build_release_candidate.yml
This is an automated email from the ASF dual-hosted git repository. lostluck pushed a commit to branch lostluck-patch-3 in repository https://gitbox.apache.org/repos/asf/beam.git commit de51848cf3e74b30dac87e70e8761a7721cc3206 Author: Robert Burke AuthorDate: Tue Jun 18 10:36:19 2024 -0700 Update build_release_candidate.yml Fix issue where the release version directory might not exist yet for the SVN repo when the prism build step occurs. ``` ...Adding prism artifacts to the Dev Apache SVN repo... svn: E15: Can't find parent directory's node while trying to add '/home/runner/work/beam/beam/beam/2.57.0/prism' svn: E155010: The node '/home/runner/work/beam/beam/beam/2.57.0' was not found. ``` Adding --parents makes SVN also add intermediate parents before making the update. --- .github/workflows/build_release_candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_candidate.yml b/.github/workflows/build_release_candidate.yml index ab4b3859177..215f2566634 100644 --- a/.github/workflows/build_release_candidate.yml +++ b/.github/workflows/build_release_candidate.yml @@ -530,6 +530,6 @@ jobs: echo "...Adding prism artifacts to the Dev Apache SVN repo..." - svn add --force prism + svn add --force --parents prism svn status svn commit -m "Staging Prism artifacts for Apache Beam ${RELEASE} RC${RC_NUM}" --non-interactive --username "${{ github.event.inputs.APACHE_ID }}" --password "${{ github.event.inputs.APACHE_PASSWORD }}"
(beam) branch master updated: Add interfaces for broker-helper classes (#31635)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new 2b9078506ca Add interfaces for broker-helper classes (#31635) 2b9078506ca is described below commit 2b9078506ca28c3c0ceef8e8aca554c16001dccd Author: Bartosz Zablocki AuthorDate: Tue Jun 18 19:28:34 2024 +0200 Add interfaces for broker-helper classes (#31635)
(beam) branch master updated (ef885399c92 -> 96b9de0fee9)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git from ef885399c92 CassandraIO: Fix generic SelectAll clauses provided by ValueProvider causing CassandraIO.read to fail (#31623) add 96b9de0fee9 Solace Read connector: UnboundedSource and UnboundedReader (#31636) No new revisions were added by this update. Summary of changes: sdks/java/io/solace/build.gradle | 3 + .../beam/sdk/io/solace/broker/MessageReceiver.java | 59 +++ .../beam/sdk/io/solace/broker/SempClient.java | 49 ++ .../sdk/io/solace/broker/SempClientFactory.java| 11 +- .../beam/sdk/io/solace/broker/SessionService.java | 50 ++ .../io/solace/broker/SessionServiceFactory.java| 9 +- .../sdk/io/solace/read/SolaceCheckpointMark.java | 6 +- .../sdk/io/solace/read/UnboundedSolaceReader.java | 191 + .../sdk/io/solace/read/UnboundedSolaceSource.java | 148 9 files changed, 523 insertions(+), 3 deletions(-) create mode 100644 sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/MessageReceiver.java create mode 100644 sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SempClient.java create mode 100644 sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/broker/SessionService.java create mode 100644 sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/UnboundedSolaceReader.java create mode 100644 sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/UnboundedSolaceSource.java
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 33d90d91cfa Updating config from bot 33d90d91cfa is described below commit 33d90d91cfaf3babde4dbaf50660fd31892a295d Author: github-actions AuthorDate: Tue Jun 18 17:11:37 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31636.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31636.json b/scripts/ci/pr-bot/state/pr-state/pr-31636.json index 242a48d7d3b..37f7ab41238 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-31636.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-31636.json @@ -2,7 +2,7 @@ "commentedAboutFailingChecks": true, "reviewersAssignedForLabels": {}, "nextAction": "Author", - "stopReviewerNotifications": false, + "stopReviewerNotifications": true, "remindAfterTestsPass": [], "committerAssigned": false } \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 81aa5e49755 Updating config from bot 81aa5e49755 is described below commit 81aa5e49755c83a986bbef219ea8eccdde75eb51 Author: github-actions AuthorDate: Tue Jun 18 17:09:08 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31637.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31637.json b/scripts/ci/pr-bot/state/pr-state/pr-31637.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31637.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 3aacac55d31 Updating config from bot 3aacac55d31 is described below commit 3aacac55d3174682403c78bfcee47b5189adb09e Author: github-actions AuthorDate: Tue Jun 18 17:05:46 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31636.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31636.json b/scripts/ci/pr-bot/state/pr-state/pr-31636.json new file mode 100644 index 000..242a48d7d3b --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31636.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": true, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": false, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch master updated: CassandraIO: Fix generic SelectAll clauses provided by ValueProvider causing CassandraIO.read to fail (#31623)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new ef885399c92 CassandraIO: Fix generic SelectAll clauses provided by ValueProvider causing CassandraIO.read to fail (#31623) ef885399c92 is described below commit ef885399c929d6763240ad59e150e31ae3aa1ea5 Author: George Ma <111381964+george...@users.noreply.github.com> AuthorDate: Tue Jun 18 12:22:01 2024 -0400 CassandraIO: Fix generic SelectAll clauses provided by ValueProvider causing CassandraIO.read to fail (#31623) * Fix ValueProvider not expanding properly when query does not have 'WHERE' in it * Tweak test case 'WHERE' clause * Linted CassandraIO --- .../org/apache/beam/sdk/io/cassandra/ReadFn.java | 13 ++-- .../beam/sdk/io/cassandra/CassandraIOTest.java | 89 ++ 2 files changed, 96 insertions(+), 6 deletions(-) diff --git a/sdks/java/io/cassandra/src/main/java/org/apache/beam/sdk/io/cassandra/ReadFn.java b/sdks/java/io/cassandra/src/main/java/org/apache/beam/sdk/io/cassandra/ReadFn.java index b8fff229712..44e3808f53f 100644 --- a/sdks/java/io/cassandra/src/main/java/org/apache/beam/sdk/io/cassandra/ReadFn.java +++ b/sdks/java/io/cassandra/src/main/java/org/apache/beam/sdk/io/cassandra/ReadFn.java @@ -107,7 +107,7 @@ class ReadFn extends DoFn, T> { String finalHighQuery = (spec.query() == null) ? buildInitialQuery(spec, true) + highestClause -: spec.query() + " AND " + highestClause; +: spec.query() + getJoinerClause(spec.query().get()) + highestClause; LOG.debug("CassandraIO generated a wrapAround query : {}", finalHighQuery); return finalHighQuery; } @@ -117,7 +117,7 @@ class ReadFn extends DoFn, T> { String finalLowQuery = (spec.query() == null) ? buildInitialQuery(spec, true) + lowestClause -: spec.query() + " AND " + lowestClause; +: spec.query() + getJoinerClause(spec.query().get()) + lowestClause; LOG.debug("CassandraIO generated a wrapAround query : {}", finalLowQuery); return finalLowQuery; } @@ -141,9 +141,10 @@ class ReadFn extends DoFn, T> { return (spec.query() == null) ? String.format("SELECT * FROM %s.%s", spec.keyspace().get(), spec.table().get()) + " WHERE " -: spec.query().get() -+ (hasRingRange -? spec.query().get().toUpperCase().contains("WHERE") ? " AND " : " WHERE " -: ""); +: spec.query().get() + (hasRingRange ? getJoinerClause(spec.query().get()) : ""); + } + + private static String getJoinerClause(String queryString) { +return queryString.toUpperCase().contains("WHERE") ? " AND " : " WHERE "; } } diff --git a/sdks/java/io/cassandra/src/test/java/org/apache/beam/sdk/io/cassandra/CassandraIOTest.java b/sdks/java/io/cassandra/src/test/java/org/apache/beam/sdk/io/cassandra/CassandraIOTest.java index a7090d5c7bc..747f803ea46 100644 --- a/sdks/java/io/cassandra/src/test/java/org/apache/beam/sdk/io/cassandra/CassandraIOTest.java +++ b/sdks/java/io/cassandra/src/test/java/org/apache/beam/sdk/io/cassandra/CassandraIOTest.java @@ -61,6 +61,7 @@ import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; import org.apache.beam.sdk.coders.SerializableCoder; import org.apache.beam.sdk.io.common.NetworkTestHelper; +import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Count; @@ -489,6 +490,94 @@ public class CassandraIOTest implements Serializable { pipeline.run(); } + /** + * Create a mock value provider class that tests how the query gets expanded in + * CassandraIO.ReadFn. + */ + static class MockQueryProvider implements ValueProvider { +private volatile String query; + +MockQueryProvider(String query) { + this.query = query; +} + +@Override +public String get() { + return query; +} + +@Override +public boolean isAccessible() { + return !query.isEmpty(); +} + } + + @Test + public void testReadWithQueryProvider() throws Exception { +String query = +String.format( +"select person_id, writetime(person_name) from %s.%s", +CASSANDRA_KEYSPACE, CASSANDRA_TABLE); + +PCollection output = +pipeline.apply( +CassandraIO.read() +.withHosts(Collections.singletonList(CASSANDRA_HOST)) +.withPort(cassandraPort) +.withKeyspace(CASSANDRA_KEYSPACE) +.withTable(CASSANDRA_TABLE) +.withMinNumberOfSplits(20) +.withQuery(new MockQueryProvider(query)) +.withCoder(Se
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 97a7fddb87d Updating config from bot 97a7fddb87d is described below commit 97a7fddb87d28e5c91765a31c64e0ade55b9d040 Author: github-actions AuthorDate: Tue Jun 18 16:21:26 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31635.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31635.json b/scripts/ci/pr-bot/state/pr-state/pr-31635.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-31635.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch revert-31473-jackson215 deleted (was 3622973c853)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch revert-31473-jackson215 in repository https://gitbox.apache.org/repos/asf/beam.git was 3622973c853 Revert "Bump Jackson databind to 2.15 (#31473)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(beam) branch revert-31451-expansion_service_upgrade_2_dependencies deleted (was 5f1b33b5fa0)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch revert-31451-expansion_service_upgrade_2_dependencies in repository https://gitbox.apache.org/repos/asf/beam.git was 5f1b33b5fa0 Revert "Updates Expansion Service Container to support upgrading using the sc…" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new aee187a9bf2 Updating config from bot aee187a9bf2 is described below commit aee187a9bf2d8c38d66e1926ca4385d0709b273e Author: github-actions AuthorDate: Tue Jun 18 14:26:31 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-30758.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-30758.json b/scripts/ci/pr-bot/state/pr-state/pr-30758.json index 337ace80587..75fc067f55b 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-30758.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-30758.json @@ -3,7 +3,7 @@ "reviewersAssignedForLabels": { "no-matching-label": "shunping" }, - "nextAction": "Reviewers", + "nextAction": "Author", "stopReviewerNotifications": false, "remindAfterTestsPass": [], "committerAssigned": false
(beam) branch master updated: Add SolaceCheckpointMark for handling Solace checkpointing (#31621)
This is an automated email from the ASF dual-hosted git repository. yhu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/master by this push: new b058f0fcbd1 Add SolaceCheckpointMark for handling Solace checkpointing (#31621) b058f0fcbd1 is described below commit b058f0fcbd1ec03f5804856c3bc09066a61f271b Author: Bartosz Zablocki AuthorDate: Tue Jun 18 14:16:51 2024 +0200 Add SolaceCheckpointMark for handling Solace checkpointing (#31621) --- sdks/java/io/solace/build.gradle | 1 + .../sdk/io/solace/read/SolaceCheckpointMark.java | 94 ++ 2 files changed, 95 insertions(+) diff --git a/sdks/java/io/solace/build.gradle b/sdks/java/io/solace/build.gradle index c49b79f96a3..fbf096abd22 100644 --- a/sdks/java/io/solace/build.gradle +++ b/sdks/java/io/solace/build.gradle @@ -34,4 +34,5 @@ dependencies { implementation project(path: ":sdks:java:core", configuration: "shadow") implementation library.java.joda_time implementation library.java.solace +implementation project(":sdks:java:extensions:avro") } diff --git a/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/SolaceCheckpointMark.java b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/SolaceCheckpointMark.java new file mode 100644 index 000..f429df3f8cd --- /dev/null +++ b/sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/SolaceCheckpointMark.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.beam.sdk.io.solace.read; + +import com.solacesystems.jcsmp.BytesXMLMessage; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.beam.sdk.coders.DefaultCoder; +import org.apache.beam.sdk.extensions.avro.coders.AvroCoder; +import org.apache.beam.sdk.io.UnboundedSource; +import org.checkerframework.checker.nullness.qual.Nullable; + +/** + * Checkpoint for an unbounded Solace source. Consists of the Solace messages waiting to be + * acknowledged. + */ +@DefaultCoder(AvroCoder.class) +class SolaceCheckpointMark implements UnboundedSource.CheckpointMark { + private transient AtomicBoolean activeReader; + // BytesXMLMessage is not serializable so if a job restarts from the checkpoint, we cannot retry + // these messages here. We relay on Solace's retry mechanism. + private transient ArrayDeque ackQueue; + + @SuppressWarnings("initialization") // Avro will set the fields by breaking abstraction + private SolaceCheckpointMark() {} + + /** + * Creates a new {@link SolaceCheckpointMark}. + * + * @param activeReader {@link AtomicBoolean} indicating if the related reader is active. The + * reader creating the messages has to be active to acknowledge the messages. + * @param ackQueue {@link List} of {@link BytesXMLMessage} to be acknowledged. + */ + SolaceCheckpointMark(AtomicBoolean activeReader, List ackQueue) { +this.activeReader = activeReader; +this.ackQueue = new ArrayDeque<>(ackQueue); + } + + @Override + public void finalizeCheckpoint() { +if (activeReader == null || !activeReader.get() || ackQueue == null) { + return; +} + +while (!ackQueue.isEmpty()) { + BytesXMLMessage msg = ackQueue.poll(); + if (msg != null) { +msg.ackMessage(); + } +} + } + + @Override + public boolean equals(@Nullable Object o) { +if (o == null) { + return false; +} +if (this == o) { + return true; +} +if (!(o instanceof SolaceCheckpointMark)) { + return false; +} +SolaceCheckpointMark that = (SolaceCheckpointMark) o; +// Needed to convert to ArrayList because ArrayDeque.equals checks only for reference, not +// content. +ArrayList ackList = new ArrayList<>(ackQueue); +ArrayList thatAckList = new ArrayList<>(that.ackQueue); +return Objects.equals(activeReader, that.activeReader) && Objects.equals(ackList, thatAckList); + } + + @Override + public int hashCode() { +return Objects.hash(act
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 58423f91355 Updating config from bot 58423f91355 is described below commit 58423f9135572995469386a3eb0d06a79c1573cd Author: github-actions AuthorDate: Tue Jun 18 11:21:17 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-java.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-java.json b/scripts/ci/pr-bot/state/reviewers-for-label-java.json index d94d9262d8f..a7b815491c1 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-java.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-java.json @@ -2,7 +2,7 @@ "label": "java", "dateOfLastReviewAssignment": { "lukecwik": 1680701852535, -"kennknowles": 1718314465974, +"kennknowles": 1718709675302, "robertwb": 1718369454700, "kileys": 1674428678843, "apilloud": 1678822446183,
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 4785c191fbb Updating config from bot 4785c191fbb is described below commit 4785c191fbb094f823b2da4ed41c262866e1c310 Author: github-actions AuthorDate: Tue Jun 18 11:21:19 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-build.json b/scripts/ci/pr-bot/state/reviewers-for-label-build.json index 87e8eb5ec5a..26006761000 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-build.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-build.json @@ -2,6 +2,6 @@ "label": "build", "dateOfLastReviewAssignment": { "damccorm": 1718098465447, -"Abacn": 1717783688131 +"Abacn": 1718709675302 } } \ No newline at end of file
(beam) branch pr-bot-state updated: Updating config from bot
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch pr-bot-state in repository https://gitbox.apache.org/repos/asf/beam.git The following commit(s) were added to refs/heads/pr-bot-state by this push: new 9b50df4eb99 Updating config from bot 9b50df4eb99 is described below commit 9b50df4eb9955df2241730afa46f65548fd0fe27 Author: github-actions AuthorDate: Tue Jun 18 11:21:16 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-31379.json | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-31379.json b/scripts/ci/pr-bot/state/pr-state/pr-31379.json index 242a48d7d3b..feff8c4234d 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-31379.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-31379.json @@ -1,7 +1,10 @@ { "commentedAboutFailingChecks": true, - "reviewersAssignedForLabels": {}, - "nextAction": "Author", + "reviewersAssignedForLabels": { +"java": "kennknowles", +"build": "Abacn" + }, + "nextAction": "Reviewers", "stopReviewerNotifications": false, "remindAfterTestsPass": [], "committerAssigned": false