You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by kw...@apache.org on 2022/08/11 01:00:20 UTC
[beam] branch master updated: [#22647] Upgrade org.apache.samza to 1.6 (#22648)
This is an automated email from the ASF dual-hosted git repository.
kw2542 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 cf9ea1f4426 [#22647] Upgrade org.apache.samza to 1.6 (#22648)
cf9ea1f4426 is described below
commit cf9ea1f442636f781b9f449e953016bb39622781
Author: Ke Wu <ke...@icloud.com>
AuthorDate: Wed Aug 10 18:00:15 2022 -0700
[#22647] Upgrade org.apache.samza to 1.6 (#22648)
* [#22647] Upgrade org.apache.samza to 1.6
* Exclude NeedsRunner to run less tests
* Add logging for unsupported timer domain
* Exclude tests with synchronized processing time timer
* Add github issue for NeedsRunner tests
---
runners/samza/build.gradle | 2 +-
runners/samza/job-server/build.gradle | 6 ++++--
.../runners/samza/runtime/SamzaTimerInternalsFactory.java | 13 +++++++++----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/runners/samza/build.gradle b/runners/samza/build.gradle
index 5f1d08938c7..4af15a5e310 100644
--- a/runners/samza/build.gradle
+++ b/runners/samza/build.gradle
@@ -40,7 +40,7 @@ configurations {
validatesRunner
}
-def samza_version = "1.5.0"
+def samza_version = "1.6.0"
dependencies {
implementation library.java.vendored_guava_26_0_jre
diff --git a/runners/samza/job-server/build.gradle b/runners/samza/job-server/build.gradle
index c1c74701a6d..ddbd21a8c5b 100644
--- a/runners/samza/job-server/build.gradle
+++ b/runners/samza/job-server/build.gradle
@@ -74,8 +74,8 @@ def portableValidatesRunnerTask(String name, boolean docker) {
includeCategories 'org.apache.beam.sdk.testing.UsesSdkHarnessEnvironment'
return
}
-
- includeCategories 'org.apache.beam.sdk.testing.NeedsRunner'
+ // TODO(https://github.com/apache/beam/issues/22657)
+ // includeCategories 'org.apache.beam.sdk.testing.NeedsRunner'
includeCategories 'org.apache.beam.sdk.testing.ValidatesRunner'
// Should be run only in a properly configured SDK harness environment
excludeCategories 'org.apache.beam.sdk.testing.UsesSdkHarnessEnvironment'
@@ -178,6 +178,8 @@ def portableValidatesRunnerTask(String name, boolean docker) {
excludeTestsMatching 'org.apache.beam.sdk.transforms.ParDoTest$TimerTests.testRelativeTimerWithOutputTimestamp'
// TODO(BEAM-13498)
excludeTestsMatching 'org.apache.beam.sdk.transforms.ParDoTest$TimestampTests.testProcessElementSkew'
+ // TODO(https://github.com/apache/beam/issues/22650)
+ excludeTestsMatching 'org.apache.beam.sdk.transforms.GroupByKeyTest$BasicTests.testAfterProcessingTimeContinuationTriggerUsingState'
}
)
}
diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/runtime/SamzaTimerInternalsFactory.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/runtime/SamzaTimerInternalsFactory.java
index 0d27e83f919..bd6547b805a 100644
--- a/runners/samza/src/main/java/org/apache/beam/runners/samza/runtime/SamzaTimerInternalsFactory.java
+++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/runtime/SamzaTimerInternalsFactory.java
@@ -374,7 +374,8 @@ public class SamzaTimerInternalsFactory<K> implements TimerInternalsFactory<K> {
default:
throw new UnsupportedOperationException(
String.format(
- "%s currently only supports event time or processing time", SamzaRunner.class));
+ "%s currently only supports event time or processing time but get %s",
+ SamzaRunner.class, timerData.getDomain()));
}
}
@@ -460,7 +461,9 @@ public class SamzaTimerInternalsFactory<K> implements TimerInternalsFactory<K> {
default:
throw new UnsupportedOperationException(
- String.format("%s currently only supports event time", SamzaRunner.class));
+ String.format(
+ "%s currently only supports event time or processing time but get %s",
+ SamzaRunner.class, domain));
}
}
@@ -490,7 +493,8 @@ public class SamzaTimerInternalsFactory<K> implements TimerInternalsFactory<K> {
default:
throw new UnsupportedOperationException(
String.format(
- "%s currently only supports event time or processing time", SamzaRunner.class));
+ "%s currently only supports event time or processing time but get %s",
+ SamzaRunner.class, keyedTimerData.getTimerData().getDomain()));
}
}
@@ -509,7 +513,8 @@ public class SamzaTimerInternalsFactory<K> implements TimerInternalsFactory<K> {
default:
throw new UnsupportedOperationException(
String.format(
- "%s currently only supports event time or processing time", SamzaRunner.class));
+ "%s currently only supports event time or processing time but get %s",
+ SamzaRunner.class, keyedTimerData.getTimerData().getDomain()));
}
}