Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #736 from metamx/fix-synchronized 

fix synchronized on field getting updated
This commit is contained in:
fjy 2014-09-16 11:06:35 -06:00
parent c1a0961f98 762485a0c9
commit 1dbb6fd4b0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/io/druid/segment/realtime/plumber/Sink.java
View File

@ -50,6 +50,7 @@ public class Sink implements Iterable<FireHydrant>
private static final Logger log = new Logger(Sink.class); private static final Logger log = new Logger(Sink.class);
private volatile FireHydrant currHydrant; private volatile FireHydrant currHydrant;
private final Object hydrantLock = new Object();
private final Interval interval; private final Interval interval;
private final DataSchema schema; private final DataSchema schema;
@ -117,7 +118,7 @@ public class Sink implements Iterable<FireHydrant>
throw new IAE("No currHydrant but given row[%s]", row); throw new IAE("No currHydrant but given row[%s]", row);
} }
synchronized (currHydrant) { synchronized (hydrantLock) {
IncrementalIndex index = currHydrant.getIndex(); IncrementalIndex index = currHydrant.getIndex();
if (index == null) { if (index == null) {
return -1; // the hydrant was swapped without being replaced return -1; // the hydrant was swapped without being replaced
@ -128,7 +129,7 @@ public class Sink implements Iterable<FireHydrant>
public boolean isEmpty() public boolean isEmpty()
{ {
synchronized (currHydrant) { synchronized (hydrantLock) {
return hydrants.size() == 1 && currHydrant.getIndex().isEmpty(); return hydrants.size() == 1 && currHydrant.getIndex().isEmpty();
} }
} }
@ -145,7 +146,7 @@ public class Sink implements Iterable<FireHydrant>
public boolean swappable() public boolean swappable()
{ {
synchronized (currHydrant) { synchronized (hydrantLock) {
return currHydrant.getIndex() != null && currHydrant.getIndex().size() != 0; return currHydrant.getIndex() != null && currHydrant.getIndex().size() != 0;
} }
} }
@ -185,17 +186,11 @@ public class Sink implements Iterable<FireHydrant>
.build() .build()
); );
FireHydrant old; final FireHydrant old;
if (currHydrant == null) { // Only happens on initialization, cannot synchronize on null synchronized (hydrantLock) {
old = currHydrant; old = currHydrant;
currHydrant = new FireHydrant(newIndex, hydrants.size(), getSegment().getIdentifier()); currHydrant = new FireHydrant(newIndex, hydrants.size(), getSegment().getIdentifier());
hydrants.add(currHydrant); hydrants.add(currHydrant);
} else {
synchronized (currHydrant) {
old = currHydrant;
currHydrant = new FireHydrant(newIndex, hydrants.size(), getSegment().getIdentifier());
hydrants.add(currHydrant);
}
} }
return old; return old;