(beam) branch nightly-refs/heads/master updated (094eb7dc5d7 -> 6066af3dbd5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch nightly-refs/heads/master in repository https://gitbox.apache.org/repos/asf/beam.git from 094eb7dc5d7 Increase granularity of DICOM IO Unit Tests (#29956) add b666c6434dc [Dataflow Streaming] Make SideInputCache bytes and expiry configurable (#29871) add 97ca4430d97 remove threadlocal for DESERIALIZATION_CONTEXT and use copy instead (#29952) add f311d327aac Bump org.checkerframework:checkerframework-gradle-plugin add bb0a2037970 Merge pull request #29811: Bump org.checkerframework:checkerframework-gradle-plugin from 0.6.34 to 0.6.37 add 8fb06da4ce8 [RRIO] Build RequestResponseIO and related dependency changes (#29710) add 5e8fef44939 Bump timeout to 120 minutes (#29964) add 8aa16df9bd1 Bump runner v2 beam-master to 20240109 (#29965) add 6066af3dbd5 [YAML] - Kafka Proto String schema (#29835) No new revisions were added by this update. Summary of changes: .../beam_PreCommit_Java_Kafka_IO_Direct.yml| 4 +- buildSrc/build.gradle.kts | 2 +- runners/google-cloud-dataflow-java/build.gradle| 2 +- .../options/DataflowPipelineDebugOptions.java | 16 +- .../dataflow/worker/StreamingDataflowWorker.java | 2 +- .../worker/streaming/sideinput/SideInputCache.java | 11 +- .../streaming/sideinput/SideInputStateFetcher.java | 6 +- .../sideinput/SideInputStateFetcherTest.java | 14 +- .../beam/sdk/options/PipelineOptionsFactory.java | 19 +- sdks/java/extensions/protobuf/build.gradle | 2 + .../sdk/extensions/protobuf/ProtoByteUtils.java| 85 .../extensions/protobuf/ProtoByteUtilsTest.java| 49 ++ sdks/java/io/kafka/build.gradle| 1 + .../KafkaReadSchemaTransformConfiguration.java | 23 + .../io/kafka/KafkaReadSchemaTransformProvider.java | 157 +++--- .../kafka/KafkaWriteSchemaTransformProvider.java | 94 +++- .../KafkaReadSchemaTransformProviderTest.java | 64 +++ .../KafkaWriteSchemaTransformProviderTest.java | 22 +- .../apache/beam/io/requestresponse/ApiIOError.java | 7 +- .../org/apache/beam/io/requestresponse/Cache.java | 190 +-- .../org/apache/beam/io/requestresponse/Call.java | 377 ++ .../beam/io/requestresponse/CallShouldBackoff.java | 2 +- ...llShouldBackoffBasedOnRejectionProbability.java | 2 +- ...ava => DefaultSerializableBackoffSupplier.java} | 24 +- .../apache/beam/io/requestresponse/Monitoring.java | 362 ++ .../org/apache/beam/io/requestresponse/Quota.java | 7 +- .../beam/io/requestresponse/RedisClient.java | 4 +- .../apache/beam/io/requestresponse/Repeater.java | 85 +++- .../beam/io/requestresponse/RequestResponseIO.java | 552 +++-- .../org/apache/beam/io/requestresponse/Result.java | 65 +-- .../{Caller.java => SerializableSupplier.java} | 13 +- .../ThrottleWithExternalResource.java | 12 +- .../UserCodeExecutionException.java| 8 + .../io/requestresponse/UserCodeQuotaException.java | 6 + .../UserCodeRemoteSystemException.java | 9 + .../requestresponse/UserCodeTimeoutException.java | 9 + .../requestresponse/WindowedCallShouldBackoff.java | 76 +++ .../apache/beam/io/requestresponse/CacheIT.java| 16 +- ...ouldBackoffBasedOnRejectionProbabilityTest.java | 2 +- .../apache/beam/io/requestresponse/CallTest.java | 1 - .../EchoGRPCCallerWithSetupTeardownIT.java | 2 +- .../beam/io/requestresponse/EchoRequestCoder.java | 1 + ...choRequestCoder.java => EchoResponseCoder.java} | 13 +- .../beam/io/requestresponse/RedisClientIT.java | 2 +- .../beam/io/requestresponse/RepeaterTest.java | 2 +- .../io/requestresponse/RequestResponseIOIT.java| 95 .../io/requestresponse/RequestResponseIOTest.java | 508 +++ .../ThrottleWithExternalResourceIT.java| 6 +- .../WindowedCallShouldBackoffTest.java | 56 +++ sdks/python/apache_beam/yaml/standard_io.yaml | 1 + 50 files changed, 2646 insertions(+), 442 deletions(-) copy sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/{CallShouldBackoff.java => DefaultSerializableBackoffSupplier.java} (61%) create mode 100644 sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/Monitoring.java copy .test-infra/pipelines/src/main/java/org/apache/beam/testinfra/pipelines/conversions/RowConversionResult.java => sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/Result.java (54%) copy sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/{Caller.java => SerializableSupplier.java} (74%) create mode 100644 sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/WindowedCallShouldBackoff.java copy sdks/java/io/rrio/src/test/java/org/apache/beam/
(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 4fa11778904 Updating config from bot 4fa11778904 is described below commit 4fa11778904302226312f19ee3cdc07ed33d2347 Author: github-actions AuthorDate: Wed Jan 10 02:17:35 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-python.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-python.json b/scripts/ci/pr-bot/state/reviewers-for-label-python.json index d23cd18e31c..71ed51b2234 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-python.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-python.json @@ -10,7 +10,7 @@ "y1chi": 1667002607045, "damccorm": 1704744432457, "jrmccluskey": 1704810906996, -"riteshghorse": 1704197630099, +"riteshghorse": 1704853051609, "liferoad": 1704342894619 } } \ 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 c41316850a2 Updating config from bot c41316850a2 is described below commit c41316850a2cb49788636aae1e9f1bd4f9b9a5a3 Author: github-actions AuthorDate: Wed Jan 10 02:17:33 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29969.json | 10 ++ 1 file changed, 10 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29969.json b/scripts/ci/pr-bot/state/pr-state/pr-29969.json new file mode 100644 index 000..c43704aa814 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29969.json @@ -0,0 +1,10 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": { +"python": "riteshghorse" + }, + "nextAction": "Reviewers", + "stopReviewerNotifications": false, + "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 da5caccce1e Updating config from bot da5caccce1e is described below commit da5caccce1e2f48d2159bd014bc40aba89242fab Author: github-actions AuthorDate: Wed Jan 10 00:19:59 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29967.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29967.json b/scripts/ci/pr-bot/state/pr-state/pr-29967.json new file mode 100644 index 000..242a48d7d3b --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29967.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: [YAML] - Kafka Proto String schema (#29835)
This is an automated email from the ASF dual-hosted git repository. austin 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 6066af3dbd5 [YAML] - Kafka Proto String schema (#29835) 6066af3dbd5 is described below commit 6066af3dbd5a549cfd0424fe9efa1b2b545bd7ea Author: Ferran Fernández Garrido AuthorDate: Tue Jan 9 22:58:57 2024 +0100 [YAML] - Kafka Proto String schema (#29835) * [YAML] - Kafka Proto String schema --- sdks/java/extensions/protobuf/build.gradle | 2 + .../sdk/extensions/protobuf/ProtoByteUtils.java| 85 +++ .../extensions/protobuf/ProtoByteUtilsTest.java| 49 +++ sdks/java/io/kafka/build.gradle| 1 + .../KafkaReadSchemaTransformConfiguration.java | 23 +++ .../io/kafka/KafkaReadSchemaTransformProvider.java | 157 + .../kafka/KafkaWriteSchemaTransformProvider.java | 94 .../KafkaReadSchemaTransformProviderTest.java | 64 + .../KafkaWriteSchemaTransformProviderTest.java | 22 ++- sdks/python/apache_beam/yaml/standard_io.yaml | 1 + 10 files changed, 373 insertions(+), 125 deletions(-) diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle index 568d4f22086..1582492c293 100644 --- a/sdks/java/extensions/protobuf/build.gradle +++ b/sdks/java/extensions/protobuf/build.gradle @@ -39,6 +39,8 @@ dependencies { implementation library.java.slf4j_api implementation project(path: ":sdks:java:core", configuration: "shadow") implementation library.java.protobuf_java + implementation("com.squareup.wire:wire-schema-jvm:4.9.3") + implementation("io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2") testImplementation project(path: ":sdks:java:core", configuration: "shadowTest") testImplementation library.java.junit testRuntimeOnly library.java.slf4j_jdk14 diff --git a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteUtils.java b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteUtils.java index f156fed0f38..02419ec0f61 100644 --- a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteUtils.java +++ b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteUtils.java @@ -24,6 +24,10 @@ import com.google.protobuf.DescriptorProtos; import com.google.protobuf.Descriptors; import com.google.protobuf.DynamicMessage; import com.google.protobuf.InvalidProtocolBufferException; +import com.squareup.wire.schema.Location; +import com.squareup.wire.schema.internal.parser.ProtoFileElement; +import com.squareup.wire.schema.internal.parser.ProtoParser; +import io.apicurio.registry.utils.protobuf.schema.FileDescriptorUtils; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -55,6 +59,8 @@ public class ProtoByteUtils { private static final Logger LOG = LoggerFactory.getLogger(ProtoByteUtils.class); + private static final Location LOCATION = Location.get(""); + /** * Retrieves a Beam Schema from a Protocol Buffer message. * @@ -68,6 +74,68 @@ public class ProtoByteUtils { return ProtoDynamicMessageSchema.forDescriptor(protoDomain, messageName).getSchema(); } + /** + * Parses the given Protocol Buffers schema string, retrieves the Descriptor for the specified + * message name, and constructs a Beam Schema from it. + * + * @param schemaString The Protocol Buffers schema string. + * @param messageName The name of the message type for which the Beam Schema is desired. + * @return The Beam Schema constructed from the specified Protocol Buffers schema. + * @throws RuntimeException If there is an error during parsing, descriptor retrieval, or schema + * construction. + */ + public static Schema getBeamSchemaFromProtoSchema(String schemaString, String messageName) { +Descriptors.Descriptor descriptor = getDescriptorFromProtoSchema(schemaString, messageName); +return ProtoDynamicMessageSchema.forDescriptor(ProtoDomain.buildFrom(descriptor), descriptor) +.getSchema(); + } + + /** + * Parses the given Protocol Buffers schema string, retrieves the FileDescriptor, and returns the + * Descriptor for the specified message name. + * + * @param schemaString The Protocol Buffers schema string. + * @param messageName The name of the message type for which the descriptor is desired. + * @return The Descriptor for the specified message name. + * @throws RuntimeException If there is an error during parsing or descriptor validation. + */ + private static Descriptors.Descriptor getDescriptorFromProtoSchema( + final String schemaString, final String messageName) { +ProtoFileElement result =
(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 e940a247619 Updating config from bot e940a247619 is described below commit e940a247619660629fc10b4c13f369a0fb114e11 Author: github-actions AuthorDate: Tue Jan 9 21:34:52 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json index 2d2822ffcef..87ee809d86e 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json @@ -11,7 +11,7 @@ "lostluck": 1704684872095, "riteshghorse": 1704419692633, "robertwb": 1704835147957, -"tvalentyn": 1702945196178, +"tvalentyn": 1704836068541, "damondouglas": 1704824345789 } } \ 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 bbd6a05cbdd Updating config from bot bbd6a05cbdd is described below commit bbd6a05cbddcb220d6cfe084029276d220e9f9bc Author: github-actions AuthorDate: Tue Jan 9 21:34:29 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29965.json | 10 ++ 1 file changed, 10 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29965.json b/scripts/ci/pr-bot/state/pr-state/pr-29965.json new file mode 100644 index 000..c9972b0d659 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29965.json @@ -0,0 +1,10 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": { +"no-matching-label": "tvalentyn" + }, + "nextAction": "Reviewers", + "stopReviewerNotifications": false, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch master updated: Bump runner v2 beam-master to 20240109 (#29965)
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 8aa16df9bd1 Bump runner v2 beam-master to 20240109 (#29965) 8aa16df9bd1 is described below commit 8aa16df9bd17048250bf2e644ff6201da43d01ee Author: Shunping Huang AuthorDate: Tue Jan 9 16:34:20 2024 -0500 Bump runner v2 beam-master to 20240109 (#29965) --- runners/google-cloud-dataflow-java/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index c7e5e1ba623..76f4aac6808 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -52,7 +52,7 @@ evaluationDependsOn(":sdks:java:container:java11") ext.dataflowLegacyEnvironmentMajorVersion = '8' ext.dataflowFnapiEnvironmentMajorVersion = '8' ext.dataflowLegacyContainerVersion = 'beam-master-20231212' -ext.dataflowFnapiContainerVersion = 'beam-master-20231026' +ext.dataflowFnapiContainerVersion = 'beam-master-20240109' ext.dataflowContainerBaseRepository = 'gcr.io/cloud-dataflow/v1beta3' processResources {
(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 e5404b81c89 Updating config from bot e5404b81c89 is described below commit e5404b81c894dd46e2f9e7712fcecb448089078e Author: github-actions AuthorDate: Tue Jan 9 21:19:10 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json index fdefffe0613..2d2822ffcef 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json @@ -10,7 +10,7 @@ "kennknowles": 1704395134850, "lostluck": 1704684872095, "riteshghorse": 1704419692633, -"robertwb": 1702609556851, +"robertwb": 1704835147957, "tvalentyn": 1702945196178, "damondouglas": 1704824345789 }
(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 c3a0c213886 Updating config from bot c3a0c213886 is described below commit c3a0c213886ebd2e13dd16f9a1f3b630c26f8352 Author: github-actions AuthorDate: Tue Jan 9 21:19:09 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29963.json | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29963.json b/scripts/ci/pr-bot/state/pr-state/pr-29963.json index 242a48d7d3b..be0377d2bd0 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29963.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29963.json @@ -1,7 +1,9 @@ { "commentedAboutFailingChecks": true, - "reviewersAssignedForLabels": {}, - "nextAction": "Author", + "reviewersAssignedForLabels": { +"no-matching-label": "robertwb" + }, + "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 f9b894c74ac Updating config from bot f9b894c74ac is described below commit f9b894c74ac361f1156271b05bff7649e3738c92 Author: github-actions AuthorDate: Tue Jan 9 20:05:44 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29963.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29963.json b/scripts/ci/pr-bot/state/pr-state/pr-29963.json new file mode 100644 index 000..242a48d7d3b --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29963.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": true, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": false, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch users/damccorm/kafkaTimeout deleted (was d61dae691e8)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch users/damccorm/kafkaTimeout in repository https://gitbox.apache.org/repos/asf/beam.git was d61dae691e8 Bump timeout to 120 minutes 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 timeout to 120 minutes (#29964)
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 5e8fef44939 Bump timeout to 120 minutes (#29964) 5e8fef44939 is described below commit 5e8fef44939e8359056a09c257d7bf2a1c32df8b Author: Danny McCormick AuthorDate: Tue Jan 9 15:03:39 2024 -0500 Bump timeout to 120 minutes (#29964) --- .github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml b/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml index ac63a39380b..bbf4a0f5c8f 100644 --- a/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml +++ b/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml @@ -75,7 +75,7 @@ jobs: matrix: job_name: ["beam_PreCommit_Java_Kafka_IO_Direct"] job_phrase: ["Run Java_Kafka_IO_Direct PreCommit"] -timeout-minutes: 60 +timeout-minutes: 120 if: | github.event_name == 'push' || github.event_name == 'pull_request_target' || @@ -125,4 +125,4 @@ jobs: if: always() with: name: Publish SpotBugs - path: '**/build/reports/spotbugs/*.html' \ No newline at end of file + path: '**/build/reports/spotbugs/*.html'
(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 baa4603f44c Updating config from bot baa4603f44c is described below commit baa4603f44c8841ba11d6a26efa7f979f9ff1ef3 Author: github-actions AuthorDate: Tue Jan 9 19:46:10 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29964.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29964.json b/scripts/ci/pr-bot/state/pr-state/pr-29964.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29964.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch users/damccorm/kafkaTimeout created (now d61dae691e8)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch users/damccorm/kafkaTimeout in repository https://gitbox.apache.org/repos/asf/beam.git at d61dae691e8 Bump timeout to 120 minutes This branch includes the following new commits: new d61dae691e8 Bump timeout to 120 minutes 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: Bump timeout to 120 minutes
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a commit to branch users/damccorm/kafkaTimeout in repository https://gitbox.apache.org/repos/asf/beam.git commit d61dae691e816e014fe96e2b68bd1bab3aa18a27 Author: Danny McCormick AuthorDate: Tue Jan 9 14:44:22 2024 -0500 Bump timeout to 120 minutes --- .github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml b/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml index ac63a39380b..bbf4a0f5c8f 100644 --- a/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml +++ b/.github/workflows/beam_PreCommit_Java_Kafka_IO_Direct.yml @@ -75,7 +75,7 @@ jobs: matrix: job_name: ["beam_PreCommit_Java_Kafka_IO_Direct"] job_phrase: ["Run Java_Kafka_IO_Direct PreCommit"] -timeout-minutes: 60 +timeout-minutes: 120 if: | github.event_name == 'push' || github.event_name == 'pull_request_target' || @@ -125,4 +125,4 @@ jobs: if: always() with: name: Publish SpotBugs - path: '**/build/reports/spotbugs/*.html' \ No newline at end of file + path: '**/build/reports/spotbugs/*.html'
(beam) branch master updated (bb0a2037970 -> 8fb06da4ce8)
This is an automated email from the ASF dual-hosted git repository. damondouglas pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/beam.git from bb0a2037970 Merge pull request #29811: Bump org.checkerframework:checkerframework-gradle-plugin from 0.6.34 to 0.6.37 add 8fb06da4ce8 [RRIO] Build RequestResponseIO and related dependency changes (#29710) No new revisions were added by this update. Summary of changes: .../apache/beam/io/requestresponse/ApiIOError.java | 7 +- .../org/apache/beam/io/requestresponse/Cache.java | 190 +-- .../org/apache/beam/io/requestresponse/Call.java | 377 ++ .../beam/io/requestresponse/CallShouldBackoff.java | 2 +- ...llShouldBackoffBasedOnRejectionProbability.java | 2 +- ...ava => DefaultSerializableBackoffSupplier.java} | 24 +- .../apache/beam/io/requestresponse/Monitoring.java | 362 ++ .../org/apache/beam/io/requestresponse/Quota.java | 7 +- .../beam/io/requestresponse/RedisClient.java | 4 +- .../apache/beam/io/requestresponse/Repeater.java | 85 +++- .../beam/io/requestresponse/RequestResponseIO.java | 552 +++-- .../org/apache/beam/io/requestresponse/Result.java | 65 +-- .../{Caller.java => SerializableSupplier.java} | 13 +- .../ThrottleWithExternalResource.java | 12 +- .../UserCodeExecutionException.java| 8 + .../io/requestresponse/UserCodeQuotaException.java | 6 + .../UserCodeRemoteSystemException.java | 9 + .../requestresponse/UserCodeTimeoutException.java | 9 + .../requestresponse/WindowedCallShouldBackoff.java | 76 +++ .../apache/beam/io/requestresponse/CacheIT.java| 16 +- ...ouldBackoffBasedOnRejectionProbabilityTest.java | 2 +- .../apache/beam/io/requestresponse/CallTest.java | 1 - .../EchoGRPCCallerWithSetupTeardownIT.java | 2 +- .../beam/io/requestresponse/EchoRequestCoder.java | 1 + ...choRequestCoder.java => EchoResponseCoder.java} | 13 +- .../beam/io/requestresponse/RedisClientIT.java | 2 +- .../beam/io/requestresponse/RepeaterTest.java | 2 +- .../io/requestresponse/RequestResponseIOIT.java| 95 .../io/requestresponse/RequestResponseIOTest.java | 508 +++ .../ThrottleWithExternalResourceIT.java| 6 +- .../WindowedCallShouldBackoffTest.java | 56 +++ 31 files changed, 2225 insertions(+), 289 deletions(-) copy sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/{CallShouldBackoff.java => DefaultSerializableBackoffSupplier.java} (61%) create mode 100644 sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/Monitoring.java copy .test-infra/pipelines/src/main/java/org/apache/beam/testinfra/pipelines/conversions/RowConversionResult.java => sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/Result.java (54%) copy sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/{Caller.java => SerializableSupplier.java} (74%) create mode 100644 sdks/java/io/rrio/src/main/java/org/apache/beam/io/requestresponse/WindowedCallShouldBackoff.java copy sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/{EchoRequestCoder.java => EchoResponseCoder.java} (74%) create mode 100644 sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/RequestResponseIOIT.java create mode 100644 sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/RequestResponseIOTest.java create mode 100644 sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/WindowedCallShouldBackoffTest.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 34fafc922a1 Updating config from bot 34fafc922a1 is described below commit 34fafc922a19ba9735977720663df6ed21c6cc37 Author: github-actions AuthorDate: Tue Jan 9 18:19:09 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json index 3f44dcaf22b..fdefffe0613 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-no-matching-label.json @@ -12,6 +12,6 @@ "riteshghorse": 1704419692633, "robertwb": 1702609556851, "tvalentyn": 1702945196178, -"damondouglas": 1702430984870 +"damondouglas": 1704824345789 } } \ 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 8afa17c736c Updating config from bot 8afa17c736c is described below commit 8afa17c736cc084b04a562bf8f7cc2edfe969e82 Author: github-actions AuthorDate: Tue Jan 9 18:19:07 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29957.json | 10 ++ 1 file changed, 10 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29957.json b/scripts/ci/pr-bot/state/pr-state/pr-29957.json new file mode 100644 index 000..2040c933220 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29957.json @@ -0,0 +1,10 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": { +"no-matching-label": "damondouglas" + }, + "nextAction": "Reviewers", + "stopReviewerNotifications": false, + "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 0324740fade Updating config from bot 0324740fade is described below commit 0324740fadea61b4d7fc8d33b3a24276eae4c16c Author: github-actions AuthorDate: Tue Jan 9 17:45:40 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29960.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29960.json b/scripts/ci/pr-bot/state/pr-state/pr-29960.json new file mode 100644 index 000..9c2aa5aa212 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29960.json @@ -0,0 +1,8 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": {}, + "nextAction": "Author", + "stopReviewerNotifications": true, + "remindAfterTestsPass": [], + "committerAssigned": false +} \ No newline at end of file
(beam) branch users/damccorm/artifact updated (d29ca356f60 -> 0aab6d38ee8)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch users/damccorm/artifact in repository https://gitbox.apache.org/repos/asf/beam.git from d29ca356f60 indentation fix add 0aab6d38ee8 indentation No new revisions were added by this update. Summary of changes: .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(beam) branch users/damccorm/artifact updated (356a228b5d5 -> d29ca356f60)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch users/damccorm/artifact in repository https://gitbox.apache.org/repos/asf/beam.git from 356a228b5d5 Downgrade artifact version in build_wheels add d29ca356f60 indentation fix No new revisions were added by this update. Summary of changes: .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(beam) branch users/damccorm/artifact created (now 356a228b5d5)
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a change to branch users/damccorm/artifact in repository https://gitbox.apache.org/repos/asf/beam.git at 356a228b5d5 Downgrade artifact version in build_wheels This branch includes the following new commits: new 356a228b5d5 Downgrade artifact version in build_wheels 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: Downgrade artifact version in build_wheels
This is an automated email from the ASF dual-hosted git repository. damccorm pushed a commit to branch users/damccorm/artifact in repository https://gitbox.apache.org/repos/asf/beam.git commit 356a228b5d51d0d1f45386daaab1ea4b2bc7f071 Author: Danny McCormick AuthorDate: Tue Jan 9 12:41:12 2024 -0500 Downgrade artifact version in build_wheels --- .github/workflows/build_wheels.yml | 30 -- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 82924c3abcb..cf703b2a643 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -125,12 +125,14 @@ jobs: working-directory: ./sdks/python run: mv $(ls | grep apache-beam) apache-beam-source - name: Upload source as artifact -uses: actions/upload-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 +uses: actions/upload-artifact@v3 with: name: source path: sdks/python/apache-beam-source - name: Upload compressed sources as artifacts -uses: actions/upload-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 +uses: actions/upload-artifact@v3 with: name: source_zip path: sdks/python/dist @@ -167,13 +169,15 @@ jobs: run: mv $(ls | grep apache-beam) apache-beam-source-rc - name: Upload RC source as artifact if: steps.is_rc.outputs.is_rc == 1 -uses: actions/upload-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 +uses: actions/upload-artifact@v3 with: name: source_rc${{ steps.get_rc_version.outputs.RC_NUM }} path: sdks/python/apache-beam-source-rc - name: Upload compressed RC sources as artifacts if: steps.is_rc.outputs.is_rc == 1 -uses: actions/upload-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 +uses: actions/upload-artifact@v3 with: name: source_zip_rc${{ steps.get_rc_version.outputs.RC_NUM }} path: sdks/python/dist @@ -204,7 +208,8 @@ jobs: if: needs.check_env_variables.outputs.gcp-variables-set == 'true' steps: - name: Download compressed sources from artifacts -uses: actions/download-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 +uses: actions/download-artifact@v3 with: name: source_zip path: source/ @@ -237,13 +242,15 @@ jobs: arch: aarch64 steps: - name: Download python source distribution from artifacts - uses: actions/download-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 + uses: actions/download-artifact@v3 with: name: source path: apache-beam-source - name: Download Python SDK RC source distribution from artifacts if: ${{ needs.build_source.outputs.is_rc == 1 }} - uses: actions/download-artifact@v4 +# Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 + uses: actions/download-artifact@v3 with: name: source_rc${{ needs.build_source.outputs.rc_num }} path: apache-beam-source-rc @@ -278,7 +285,8 @@ jobs: done shell: bash - name: Upload wheels as artifacts - uses: actions/upload-artifact@v4 + # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 + uses: actions/upload-artifact@v3 with: name: wheelhouse-${{ matrix.os_python.os }}${{ (matrix.arch == 'aarch64' && '-aarch64') || '' }} path: apache-beam-source/wheelhouse/ @@ -303,7 +311,8 @@ jobs: shell: bash - name: Upload RC wheels as artifacts if: ${{ needs.build_source.outputs.is_rc == 1 }} - uses: actions/upload-artifact@v4 + # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 + uses: actions/upload-artifact@v3 with: name: wheelhouse-rc${{ needs.build_source.outputs.rc_num }}-${{ matrix.os_python.os }}${{ (matrix.arch == 'aarch64' && '-aarch64') || '' }} path: apache-beam-source-rc/wheelhouse/ @@ -324,7 +333,8 @@ jobs: arch: aarch64 steps: - name: Download wheels from artifacts - uses: actions/download-artifact@v4 + # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 + uses: actions/download-artifact@v3 with: name: wheelhouse-${{ matrix.os }}${{ (matrix.arch == 'aarch64' && '-aarch64') || '' }} path: wheelhouse/
(beam) 01/01: Merge pull request #29811: Bump org.checkerframework:checkerframework-gradle-plugin from 0.6.34 to 0.6.37
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 bb0a2037970ac80e98766abb081768fd531abfad Merge: 97ca4430d97 f311d327aac Author: Kenneth Knowles AuthorDate: Tue Jan 9 12:34:17 2024 -0500 Merge pull request #29811: Bump org.checkerframework:checkerframework-gradle-plugin from 0.6.34 to 0.6.37 buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(beam) branch dependabot/gradle/org.checkerframework-checkerframework-gradle-plugin-0.6.37 deleted (was f311d327aac)
This is an automated email from the ASF dual-hosted git repository. kenn pushed a change to branch dependabot/gradle/org.checkerframework-checkerframework-gradle-plugin-0.6.37 in repository https://gitbox.apache.org/repos/asf/beam.git was f311d327aac Bump org.checkerframework:checkerframework-gradle-plugin 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 (97ca4430d97 -> bb0a2037970)
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 97ca4430d97 remove threadlocal for DESERIALIZATION_CONTEXT and use copy instead (#29952) add f311d327aac Bump org.checkerframework:checkerframework-gradle-plugin new bb0a2037970 Merge pull request #29811: Bump org.checkerframework:checkerframework-gradle-plugin from 0.6.34 to 0.6.37 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: buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(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 b879f4cf439 Updating config from bot b879f4cf439 is described below commit b879f4cf439e407d90ec4a42738fc518b30ceeeb Author: github-actions AuthorDate: Tue Jan 9 17:05:38 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 a974face7d4..b35fe4219de 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-java.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-java.json @@ -9,6 +9,6 @@ "Abacn": 1704738939588, "bvolpato": 1704811241283, "m-trieu": 1704742532925, -"damondouglas": 1704716041623 +"damondouglas": 1704819936038 } } \ 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 35fd12425b6 Updating config from bot 35fd12425b6 is described below commit 35fd12425b6790180588685aefef8a01bfd46c30 Author: github-actions AuthorDate: Tue Jan 9 17:05:37 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29953.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29953.json b/scripts/ci/pr-bot/state/pr-state/pr-29953.json index a69247bb3d7..6717dabc76f 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29953.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29953.json @@ -1,11 +1,11 @@ { "commentedAboutFailingChecks": true, "reviewersAssignedForLabels": { -"java": "bvolpato", +"java": "damondouglas", "io": "bvolpato" }, "nextAction": "Reviewers", "stopReviewerNotifications": false, "remindAfterTestsPass": [], - "committerAssigned": false + "committerAssigned": true } \ 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 448fff3c3cb Updating config from bot 448fff3c3cb is described below commit 448fff3c3cb140e90c84ceb98860919833e1e97f Author: github-actions AuthorDate: Tue Jan 9 16:37:36 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29958.json | 8 1 file changed, 8 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29958.json b/scripts/ci/pr-bot/state/pr-state/pr-29958.json new file mode 100644 index 000..242a48d7d3b --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29958.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: remove threadlocal for DESERIALIZATION_CONTEXT and use copy instead (#29952)
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 97ca4430d97 remove threadlocal for DESERIALIZATION_CONTEXT and use copy instead (#29952) 97ca4430d97 is described below commit 97ca4430d97b782a3b95fc56805d51f4ebd19377 Author: Jerry Wang AuthorDate: Wed Jan 10 00:03:50 2024 +0800 remove threadlocal for DESERIALIZATION_CONTEXT and use copy instead (#29952) Co-authored-by: jierwang --- .../beam/sdk/options/PipelineOptionsFactory.java | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java index 555f50bc823..0b0ef88cf65 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java @@ -500,15 +500,12 @@ public class PipelineOptionsFactory { new ObjectMapper() .registerModules(ObjectMapper.findModules(ReflectHelpers.findClassLoader())); - private static final ThreadLocal DESERIALIZATION_CONTEXT = - ThreadLocal.withInitial( - () -> - new DefaultDeserializationContext.Impl( - MAPPER.getDeserializationContext().getFactory()) - .createInstance( - MAPPER.getDeserializationConfig(), - new TokenBuffer(MAPPER, false).asParser(), - new InjectableValues.Std())); + private static final DefaultDeserializationContext DESERIALIZATION_CONTEXT = + new DefaultDeserializationContext.Impl(MAPPER.getDeserializationContext().getFactory()) + .createInstance( + MAPPER.getDeserializationConfig(), + new TokenBuffer(MAPPER, false).asParser(), + new InjectableValues.Std()); static final DefaultSerializerProvider SERIALIZER_PROVIDER = new DefaultSerializerProvider.Impl() @@ -1731,7 +1728,7 @@ public class PipelineOptionsFactory { BeanProperty prop = createBeanProperty(method); AnnotatedMember annotatedMethod = prop.getMember(); - DefaultDeserializationContext context = DESERIALIZATION_CONTEXT.get(); + DefaultDeserializationContext context = DESERIALIZATION_CONTEXT.copy(); Object maybeDeserializerClass = context.getAnnotationIntrospector().findDeserializer(annotatedMethod); @@ -1803,7 +1800,7 @@ public class PipelineOptionsFactory { parser.nextToken(); JsonDeserializer jsonDeserializer = getDeserializerForMethod(method); -return jsonDeserializer.deserialize(parser, DESERIALIZATION_CONTEXT.get()); +return jsonDeserializer.deserialize(parser, DESERIALIZATION_CONTEXT.copy()); } /**
(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 f64333d6873 Updating config from bot f64333d6873 is described below commit f64333d6873b492335f8a5287d06c740e524efde Author: github-actions AuthorDate: Tue Jan 9 16:03:27 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-io.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-io.json b/scripts/ci/pr-bot/state/reviewers-for-label-io.json index b345c8e1433..d8cb4770ab3 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-io.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-io.json @@ -8,6 +8,6 @@ "ahmedabu98": 1704814960005, "bvolpato": 1704811241283, "manavgarg": 1690826779210, -"damondouglas": 1704716049141 +"damondouglas": 1704816203587 } } \ 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 1751fdf41a6 Updating config from bot 1751fdf41a6 is described below commit 1751fdf41a6da7e1017329bfba2c87377dc8efd6 Author: github-actions AuthorDate: Tue Jan 9 16:03:26 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29903.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29903.json b/scripts/ci/pr-bot/state/pr-state/pr-29903.json index feb78c79bcd..fde575fabf6 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29903.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29903.json @@ -1,7 +1,7 @@ { "commentedAboutFailingChecks": false, "reviewersAssignedForLabels": { -"io": "ahmedabu98" +"io": "damondouglas" }, "nextAction": "Reviewers", "stopReviewerNotifications": 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 39705651425 Updating config from bot 39705651425 is described below commit 397056514251eca24773fbd23c65a87c7de29d4d Author: github-actions AuthorDate: Tue Jan 9 15:42:42 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29903.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29903.json b/scripts/ci/pr-bot/state/pr-state/pr-29903.json index d93a01459b8..feb78c79bcd 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29903.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29903.json @@ -1,7 +1,7 @@ { "commentedAboutFailingChecks": false, "reviewersAssignedForLabels": { -"io": "johnjcasey" +"io": "ahmedabu98" }, "nextAction": "Reviewers", "stopReviewerNotifications": 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 2c0c5d804e2 Updating config from bot 2c0c5d804e2 is described below commit 2c0c5d804e2e9f97bd45f40be39d9585d378160e Author: github-actions AuthorDate: Tue Jan 9 15:42:44 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-io.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-io.json b/scripts/ci/pr-bot/state/reviewers-for-label-io.json index 7a35d972698..b345c8e1433 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-io.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-io.json @@ -5,7 +5,7 @@ "johnjcasey": 1704802438515, "pabloem": 1691787951165, "Abacn": 1704744432457, -"ahmedabu98": 1704571545412, +"ahmedabu98": 1704814960005, "bvolpato": 1704811241283, "manavgarg": 1690826779210, "damondouglas": 1704716049141
(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 f360b89d4f0 Updating config from bot f360b89d4f0 is described below commit f360b89d4f050e7d0810c778edd9896a27f8e10c Author: github-actions AuthorDate: Tue Jan 9 14:40:44 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 95c595345bc..a974face7d4 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-java.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-java.json @@ -7,7 +7,7 @@ "kileys": 1674428678843, "apilloud": 1678822446183, "Abacn": 1704738939588, -"bvolpato": 1704344674218, +"bvolpato": 1704811241283, "m-trieu": 1704742532925, "damondouglas": 1704716041623 }
(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 e16b32b7c0e Updating config from bot e16b32b7c0e is described below commit e16b32b7c0e389b477d44f6d2ec2bf63ba22d187 Author: github-actions AuthorDate: Tue Jan 9 14:40:45 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-io.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-io.json b/scripts/ci/pr-bot/state/reviewers-for-label-io.json index cce8e3ee73e..7a35d972698 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-io.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-io.json @@ -6,7 +6,7 @@ "pabloem": 1691787951165, "Abacn": 1704744432457, "ahmedabu98": 1704571545412, -"bvolpato": 1704303264925, +"bvolpato": 1704811241283, "manavgarg": 1690826779210, "damondouglas": 1704716049141 }
(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 edacc465fde Updating config from bot edacc465fde is described below commit edacc465fdeb5a85ec087f74df09da56598c8d88 Author: github-actions AuthorDate: Tue Jan 9 14:40:42 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29953.json | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29953.json b/scripts/ci/pr-bot/state/pr-state/pr-29953.json index 242a48d7d3b..a69247bb3d7 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29953.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29953.json @@ -1,7 +1,10 @@ { "commentedAboutFailingChecks": true, - "reviewersAssignedForLabels": {}, - "nextAction": "Author", + "reviewersAssignedForLabels": { +"java": "bvolpato", +"io": "bvolpato" + }, + "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 94e80d6c857 Updating config from bot 94e80d6c857 is described below commit 94e80d6c85712a1d59217ded42e0934f59d79507 Author: github-actions AuthorDate: Tue Jan 9 14:35:09 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-python.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-python.json b/scripts/ci/pr-bot/state/reviewers-for-label-python.json index 2257f8e27bd..d23cd18e31c 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-python.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-python.json @@ -9,7 +9,7 @@ "pabloem": 1681281324703, "y1chi": 1667002607045, "damccorm": 1704744432457, -"jrmccluskey": 1704284040082, +"jrmccluskey": 1704810906996, "riteshghorse": 1704197630099, "liferoad": 1704342894619 }
(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 f0f1c20bcbd Updating config from bot f0f1c20bcbd is described below commit f0f1c20bcbde2632cff91cf85a8d9310189d1f22 Author: github-actions AuthorDate: Tue Jan 9 14:35:08 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29873.json | 10 ++ 1 file changed, 10 insertions(+) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29873.json b/scripts/ci/pr-bot/state/pr-state/pr-29873.json new file mode 100644 index 000..959c289c017 --- /dev/null +++ b/scripts/ci/pr-bot/state/pr-state/pr-29873.json @@ -0,0 +1,10 @@ +{ + "commentedAboutFailingChecks": false, + "reviewersAssignedForLabels": { +"python": "jrmccluskey" + }, + "nextAction": "Reviewers", + "stopReviewerNotifications": false, + "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 863ccfe78e4 Updating config from bot 863ccfe78e4 is described below commit 863ccfe78e4676bea909b962c0a9c1148fabe4ee Author: github-actions AuthorDate: Tue Jan 9 12:13:59 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29566.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29566.json b/scripts/ci/pr-bot/state/pr-state/pr-29566.json index e41b428b191..1f347bfade2 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29566.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29566.json @@ -1,8 +1,8 @@ { "commentedAboutFailingChecks": true, "reviewersAssignedForLabels": { -"java": "damondouglas", -"io": "damondouglas" +"java": "robertwb", +"io": "johnjcasey" }, "nextAction": "Reviewers", "stopReviewerNotifications": 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 5791b8b9ff1 Updating config from bot 5791b8b9ff1 is described below commit 5791b8b9ff165cfeb7796b9ce3471c667e46042a Author: github-actions AuthorDate: Tue Jan 9 12:14:01 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 060a7a0baf4..95c595345bc 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-java.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-java.json @@ -3,7 +3,7 @@ "dateOfLastReviewAssignment": { "lukecwik": 1680701852535, "kennknowles": 1704716047847, -"robertwb": 1704402830318, +"robertwb": 1704802437421, "kileys": 1674428678843, "apilloud": 1678822446183, "Abacn": 1704738939588,
(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 8de2c783045 Updating config from bot 8de2c783045 is described below commit 8de2c783045717403ff6a6fe0e7c7d1b735825cd Author: github-actions AuthorDate: Tue Jan 9 12:14:02 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-io.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-io.json b/scripts/ci/pr-bot/state/reviewers-for-label-io.json index 4c72fb733d3..cce8e3ee73e 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-io.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-io.json @@ -2,7 +2,7 @@ "label": "io", "dateOfLastReviewAssignment": { "chamikaramj": 1704742532925, -"johnjcasey": 1704405959122, +"johnjcasey": 1704802438515, "pabloem": 1691787951165, "Abacn": 1704744432457, "ahmedabu98": 1704571545412,
(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 119c6ce1450 Updating config from bot 119c6ce1450 is described below commit 119c6ce1450084fe4919d84de91debb139d818de Author: github-actions AuthorDate: Tue Jan 9 12:13:54 2024 + Updating config from bot --- scripts/ci/pr-bot/state/reviewers-for-label-website.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/reviewers-for-label-website.json b/scripts/ci/pr-bot/state/reviewers-for-label-website.json index 212f1c887b0..6c7400f5d4b 100644 --- a/scripts/ci/pr-bot/state/reviewers-for-label-website.json +++ b/scripts/ci/pr-bot/state/reviewers-for-label-website.json @@ -2,7 +2,7 @@ "label": "website", "dateOfLastReviewAssignment": { "rszper": 1704558975280, -"melap": 1703092019501, +"melap": 1704802432103, "damccorm": 1703208510530, "liferoad": 1704303264925, "kennknowles": 1704400479165
(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 0adfbda06ee Updating config from bot 0adfbda06ee is described below commit 0adfbda06eecce6f2e935cfde53c38709c6bbdeb Author: github-actions AuthorDate: Tue Jan 9 12:13:53 2024 + Updating config from bot --- scripts/ci/pr-bot/state/pr-state/pr-29860.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/pr-bot/state/pr-state/pr-29860.json b/scripts/ci/pr-bot/state/pr-state/pr-29860.json index 19d93ede2f7..867254c8014 100644 --- a/scripts/ci/pr-bot/state/pr-state/pr-29860.json +++ b/scripts/ci/pr-bot/state/pr-state/pr-29860.json @@ -1,7 +1,7 @@ { "commentedAboutFailingChecks": false, "reviewersAssignedForLabels": { -"website": "damccorm" +"website": "melap" }, "nextAction": "Reviewers", "stopReviewerNotifications": false,
(beam) branch master updated: [Dataflow Streaming] Make SideInputCache bytes and expiry configurable (#29871)
This is an automated email from the ASF dual-hosted git repository. scwhittle 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 b666c6434dc [Dataflow Streaming] Make SideInputCache bytes and expiry configurable (#29871) b666c6434dc is described below commit b666c6434dc6e15079b10bdaf1d6a88b530bb714 Author: Arun Pandian AuthorDate: Tue Jan 9 03:40:52 2024 -0800 [Dataflow Streaming] Make SideInputCache bytes and expiry configurable (#29871) Co-authored-by: Arun Pandian --- .../dataflow/options/DataflowPipelineDebugOptions.java | 16 ++-- .../runners/dataflow/worker/StreamingDataflowWorker.java | 2 +- .../worker/streaming/sideinput/SideInputCache.java | 11 ++- .../streaming/sideinput/SideInputStateFetcher.java | 6 -- .../streaming/sideinput/SideInputStateFetcherTest.java | 14 +++--- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptions.java index f8649a1f0f3..290418bd1cb 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptions.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptions.java @@ -239,8 +239,8 @@ public interface DataflowPipelineDebugOptions /** * The size of the worker's in-memory cache, in megabytes. * - * Currently, this cache is used for storing read values of side inputs. as well as the state - * for streaming jobs. + * Currently, this cache is used for storing read values of side inputs in batch as well as the + * user state for streaming jobs. */ @Description("The size of the worker's in-memory cache, in megabytes.") @Default.Integer(100) @@ -248,6 +248,18 @@ public interface DataflowPipelineDebugOptions void setWorkerCacheMb(Integer value); + @Description("The size of the streaming worker's side input cache, in megabytes.") + @Default.Integer(100) + Integer getStreamingSideInputCacheMb(); + + void setStreamingSideInputCacheMb(Integer value); + + @Description("The expiry for streaming worker's side input cache entries, in milliseconds.") + @Default.Integer(60 * 1000) // 1 minute + Integer getStreamingSideInputCacheExpirationMillis(); + + void setstreamingSideInputCacheExpirationMillis(Integer value); + /** * The amount of time before UnboundedReaders are considered idle and closed during streaming * execution. diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java index 0ddafa25f86..f68e5ba26c7 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java @@ -424,7 +424,7 @@ public class StreamingDataflowWorker { this.metricTrackingWindmillServer = new MetricTrackingWindmillServerStub(windmillServer, memoryMonitor, windmillServiceEnabled); this.metricTrackingWindmillServer.start(); -this.sideInputStateFetcher = new SideInputStateFetcher(metricTrackingWindmillServer); +this.sideInputStateFetcher = new SideInputStateFetcher(metricTrackingWindmillServer, options); this.clientId = clientIdGenerator.nextLong(); for (MapTask mapTask : mapTasks) { diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/sideinput/SideInputCache.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/sideinput/SideInputCache.java index 721c477435e..beb7c361d95 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/sideinput/SideInputCache.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/sideinput/SideInputCache.java @@ -23,6 +23,7 @@ import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import org.apache.beam.runners.dataflow.options.DataflowPipelineDebugOptions; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TypeDescriptor; @@ -40,8 +41,7 @@ import