You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2018/04/24 22:59:39 UTC
[beam] branch master updated (2bcc606 -> cae963a)
This is an automated email from the ASF dual-hosted git repository.
tgroh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.
from 2bcc606 Merge pull request #4947: [BEAM-3983] Add utils for converting to BigQuery types
add 86d052e Add a CollectionT to Bundle
add 4adf454 Use Bundle in WatermarkManager
new cae963a Merge pull request #5181: Use Generic types in Bundle
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:
.../beam/runners/direct/BundleProcessor.java | 3 +-
.../beam/runners/direct/CommittedBundle.java | 16 +++--
.../beam/runners/direct/EvaluationContext.java | 5 +-
.../direct/ExecutorServiceParallelExecutor.java | 4 +-
.../beam/runners/direct/QuiescenceDriver.java | 9 ++-
.../beam/runners/direct/WatermarkManager.java | 80 +++++++++++-----------
.../beam/runners/direct/WatermarkManagerTest.java | 7 +-
.../java/org/apache/beam/runners/local/Bundle.java | 27 +++++++-
8 files changed, 93 insertions(+), 58 deletions(-)
--
To stop receiving notification emails like this one, please contact
tgroh@apache.org.
[beam] 01/01: Merge pull request #5181: Use Generic types in Bundle
Posted by tg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tgroh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit cae963a810224ba6ce6c9623ee70fbaa57de9c11
Merge: 2bcc606 4adf454
Author: Thomas Groh <tg...@users.noreply.github.com>
AuthorDate: Tue Apr 24 15:59:30 2018 -0700
Merge pull request #5181: Use Generic types in Bundle
[BEAM-4153]
.../beam/runners/direct/BundleProcessor.java | 3 +-
.../beam/runners/direct/CommittedBundle.java | 16 +++--
.../beam/runners/direct/EvaluationContext.java | 5 +-
.../direct/ExecutorServiceParallelExecutor.java | 4 +-
.../beam/runners/direct/QuiescenceDriver.java | 9 ++-
.../beam/runners/direct/WatermarkManager.java | 80 +++++++++++-----------
.../beam/runners/direct/WatermarkManagerTest.java | 7 +-
.../java/org/apache/beam/runners/local/Bundle.java | 27 +++++++-
8 files changed, 93 insertions(+), 58 deletions(-)
diff --cc runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
index 5c4fdf9,d105efe..b8aef85
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
@@@ -67,8 -65,10 +67,7 @@@ import org.apache.beam.sdk.util.Windowe
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionList;
- import org.apache.beam.sdk.values.PValue;
import org.apache.beam.sdk.values.TimestampedValue;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.joda.time.Duration;
import org.joda.time.Instant;
--
To stop receiving notification emails like this one, please contact
tgroh@apache.org.