Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Reduce fn runner #613

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reduce fn runner #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d891767
Update version range dependency to exclude 2.0.0-betaX versions (#528)
davorbonaci Jan 9, 2017
c5d5fe1
Merge pull request #529 from davorbonaci/cherrypick
dhalperi Jan 9, 2017
920f8d8
Do not GC windows based on processing time timers
kennknowles Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/firebaseio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<google-cloud-dataflow-version>[1.2.0, 2.0.0)</google-cloud-dataflow-version>
<google-cloud-dataflow-version>[1.2.0, 1.99)</google-cloud-dataflow-version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion contrib/hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<google-cloud-dataflow-version>[1.2.0,2.0.0)</google-cloud-dataflow-version>
<google-cloud-dataflow-version>[1.2.0, 1.99)</google-cloud-dataflow-version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion contrib/join-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<google-cloud-dataflow-version>[1.0.0, 2.0.0)</google-cloud-dataflow-version>
<google-cloud-dataflow-version>[1.0.0, 1.99)</google-cloud-dataflow-version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion contrib/kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<version>0.1.0-SNAPSHOT</version>

<properties>
<dataflow.version>[1.6.0, 2.0.0)</dataflow.version>
<dataflow.version>[1.6.0, 1.99)</dataflow.version>
<kafka.version>0.9.0.1</kafka.version>

<guava.version>19.0</guava.version>
Expand Down
2 changes: 1 addition & 1 deletion contrib/sorter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<google-cloud-dataflow-version>[1.2.0,2.0.0)</google-cloud-dataflow-version>
<google-cloud-dataflow-version>[1.2.0, 1.99)</google-cloud-dataflow-version>
<hadoop.version>2.7.1</hadoop.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<dependency>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
<version>[1.0.0, 2.0.0)</version>
<version>[1.0.0, 1.99)</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
<version>[1.0.0, 2.0.0)</version>
<version>[1.0.0, 1.99)</version>
</dependency>

<!-- slf4j API frontend binding with JUL backend -->
Expand Down
2 changes: 1 addition & 1 deletion maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>com.google.cloud.dataflow</groupId>
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
<version>[1.0.0, 2.0.0)</version>
<version>[1.0.0, 1.99)</version>
</dependency>

<!-- slf4j API frontend binding with JUL backend -->
Expand Down
3 changes: 2 additions & 1 deletion sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,8 @@ private class EnrichedTimerData {
this.isEndOfWindow = TimeDomain.EVENT_TIME == timer.getDomain()
&& timer.getTimestamp().equals(window.maxTimestamp());
Instant cleanupTime = garbageCollectionTime(window);
this.isGarbageCollection = !timer.getTimestamp().isBefore(cleanupTime);
this.isGarbageCollection = TimeDomain.EVENT_TIME == timer.getDomain()
&& !timer.getTimestamp().isBefore(cleanupTime);
}

// Has this window had its trigger finish?
Expand Down