You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jk...@apache.org on 2017/09/19 20:53:15 UTC
[1/2] beam git commit: [BEAM-407] Fixes findbugs warnings in
OffsetRangeTracker
Repository: beam
Updated Branches:
refs/heads/master 5dab9e109 -> e7eefddea
[BEAM-407] Fixes findbugs warnings in OffsetRangeTracker
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/517192f7
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/517192f7
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/517192f7
Branch: refs/heads/master
Commit: 517192f749e2581a4c97a7bd5be75960818a17cc
Parents: 5dab9e1
Author: Justin Tumale <fj...@gmail.com>
Authored: Fri Sep 8 15:14:06 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Sep 19 13:37:29 2017 -0700
----------------------------------------------------------------------
.../src/main/resources/beam/findbugs-filter.xml | 36 --------------------
.../beam/sdk/io/range/OffsetRangeTracker.java | 22 ++++++++----
2 files changed, 16 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/517192f7/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
index 0c9080d..e54cd0b 100644
--- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
@@ -311,42 +311,6 @@
<!--[BEAM-398] Possible double check of field-->
</Match>
<Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="done"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="lastRecordStart"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="offsetOfLastSplitPoint"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="splitPointsSeen"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="startOffset"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
- <Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
- <Field name="stopOffset"/>
- <Bug pattern="IS2_INCONSISTENT_SYNC"/>
- <!--[BEAM-407] Inconsistent synchronization-->
- </Match>
- <Match>
<Class name="org.apache.beam.sdk.testing.WindowSupplier"/>
<Field name="windows"/>
<Bug pattern="IS2_INCONSISTENT_SYNC"/>
http://git-wip-us.apache.org/repos/asf/beam/blob/517192f7/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/OffsetRangeTracker.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/OffsetRangeTracker.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/OffsetRangeTracker.java
index 8f0083e..7b4b331 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/OffsetRangeTracker.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/OffsetRangeTracker.java
@@ -56,6 +56,8 @@ public class OffsetRangeTracker implements RangeTracker<Long> {
this.stopOffset = stopOffset;
}
+ private OffsetRangeTracker() { }
+
public synchronized boolean isStarted() {
// done => started: handles the case when the reader was empty.
return (offsetOfLastSplitPoint != -1) || done;
@@ -262,11 +264,19 @@ public class OffsetRangeTracker implements RangeTracker<Long> {
*/
@VisibleForTesting
OffsetRangeTracker copy() {
- OffsetRangeTracker res = new OffsetRangeTracker(startOffset, stopOffset);
- res.offsetOfLastSplitPoint = this.offsetOfLastSplitPoint;
- res.lastRecordStart = this.lastRecordStart;
- res.done = this.done;
- res.splitPointsSeen = this.splitPointsSeen;
- return res;
+ synchronized (this) {
+ OffsetRangeTracker res = new OffsetRangeTracker();
+ // This synchronized is not really necessary, because there's no concurrent access to "res",
+ // however it is necessary to prevent findbugs from complaining about unsynchronized access.
+ synchronized (res) {
+ res.startOffset = this.startOffset;
+ res.stopOffset = this.stopOffset;
+ res.offsetOfLastSplitPoint = this.offsetOfLastSplitPoint;
+ res.lastRecordStart = this.lastRecordStart;
+ res.done = this.done;
+ res.splitPointsSeen = this.splitPointsSeen;
+ }
+ return res;
+ }
}
}
[2/2] beam git commit: This closes #3827: [BEAM-407] fixes
inconsistent synchronization in OffsetRangeTracker.copy
Posted by jk...@apache.org.
This closes #3827: [BEAM-407] fixes inconsistent synchronization in OffsetRangeTracker.copy
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e7eefdde
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e7eefdde
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e7eefdde
Branch: refs/heads/master
Commit: e7eefddea925e9b5359468a74a5dffe75b4b55e7
Parents: 5dab9e1 517192f
Author: Eugene Kirpichov <ki...@google.com>
Authored: Tue Sep 19 13:52:54 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Sep 19 13:52:54 2017 -0700
----------------------------------------------------------------------
.../src/main/resources/beam/findbugs-filter.xml | 36 --------------------
.../beam/sdk/io/range/OffsetRangeTracker.java | 22 ++++++++----
2 files changed, 16 insertions(+), 42 deletions(-)
----------------------------------------------------------------------