You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2018/08/08 18:57:48 UTC
[geode] branch featrue/GEODE-5541 updated: change a method
signature.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch featrue/GEODE-5541
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/featrue/GEODE-5541 by this push:
new 41119d6 change a method signature.
41119d6 is described below
commit 41119d66bafe9275f185a237472a3a294ecbbda0
Author: eshu <es...@pivotal.io>
AuthorDate: Wed Aug 8 11:53:07 2018 -0700
change a method signature.
---
.../geode/internal/cache/TXCommitMessage.java | 16 +++++++---
.../geode/internal/cache/RegionCommitTest.java | 36 +++++++++-------------
2 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index 550d5bf..bea1930 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -1298,7 +1298,7 @@ public class TXCommitMessage extends PooledDistributionMessage
}
if (entryOp.op.isDestroy()) {
boolean invokeCallbacks =
- isOpDestroyEvent(internalRegion, entryOp.op.isDestroy(), entryOp.key);
+ isOpDestroyEvent(internalRegion, entryOp);
List<EntryEventImpl> whichPendingCallbacks =
invokeCallbacks ? pendingCallbacks : new ArrayList<EntryEventImpl>();
this.internalRegion.txApplyDestroy(entryOp.key, this.msg.txIdent, this.txEvent,
@@ -1320,11 +1320,11 @@ public class TXCommitMessage extends PooledDistributionMessage
}
}
- boolean isOpDestroyEvent(InternalRegion internalRegion, boolean isOpDestroy, Object key) {
+ boolean isOpDestroyEvent(InternalRegion internalRegion, FarSideEntryOp entryOp) {
// Note that if the region is a proxy(empty) then we go ahead and add
// the destroy callback because we may need to forward the event to clients.
- RegionEntry regionEntry = internalRegion.basicGetEntry(key);
- return isOpDestroy && (internalRegion.isProxy()
+ RegionEntry regionEntry = internalRegion.basicGetEntry(entryOp.key);
+ return entryOp.op.isDestroy() && (internalRegion.isProxy()
|| (regionEntry != null && !Token.isRemoved(regionEntry.getValue())));
}
@@ -1543,6 +1543,14 @@ public class TXCommitMessage extends PooledDistributionMessage
*/
public FarSideEntryOp() {}
+ public void setOp(Operation op) {
+ this.op = op;
+ }
+
+ public void setKey(Object key) {
+ this.key = key;
+ }
+
/**
* Creates and returns a new instance of a tx entry op on the far side. The "toData" that this
* should match is {@link TXEntryState#toFarSideData}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
index 4f91dfd..c43e076 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.cache.Operation;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.TXCommitMessage.RegionCommit;
@@ -31,6 +32,9 @@ public class RegionCommitTest {
private String path;
private LocalRegion region;
private TXCommitMessage txCommitMessage;
+ private RegionCommit regionCommit;
+ private final Object key = new Object();
+ private RegionCommit.FarSideEntryOp entryOp;
@Before
public void setUp() {
@@ -41,6 +45,10 @@ public class RegionCommitTest {
dm = mock(ClusterDistributionManager.class);
region = mock(LocalRegion.class);
txCommitMessage = mock(TXCommitMessage.class);
+ regionCommit = new RegionCommit(txCommitMessage);
+ entryOp = regionCommit.new FarSideEntryOp();
+ entryOp.setOp(Operation.DESTROY);
+ entryOp.setKey(key);
when(dm.getCache()).thenReturn(cache);
when(cache.getRegionByPath(path)).thenReturn(region);
@@ -49,66 +57,52 @@ public class RegionCommitTest {
@Test
public void getsRegionFromCacheFromDM() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
assertThat(regionCommit.getRegionByPath(dm, path)).isEqualTo(region);
}
@Test
public void isOpDestroyedEventReturnsFalseIfNotDestroyOperation() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
+ entryOp.setOp(Operation.UPDATE);
- assertThat(regionCommit.isOpDestroyEvent(mock(InternalRegion.class), false, new Object()))
- .isFalse();
+ assertThat(regionCommit.isOpDestroyEvent(mock(InternalRegion.class), entryOp)).isFalse();
}
@Test
public void isOpDestroyedEventReturnsFalseIfIsDestroyOperationAndRegionEntryToBeDestroyedIsNull() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
- Object key = new Object();
when(region.basicGetEntry(key)).thenReturn(null);
- assertThat(regionCommit.isOpDestroyEvent(region, true, key)).isFalse();
+ assertThat(regionCommit.isOpDestroyEvent(region, entryOp)).isFalse();
}
@Test
public void isOpDestroyedEventReturnsFalseIfIsDestroyOperationAndRegionEntryToBeDestroyedIsRemovedToken() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
- Object key = new Object();
RegionEntry regionEntry = mock(RegionEntry.class);
- when(region.basicGetEntry(key)).thenReturn(regionEntry);
- when(regionEntry.getValue()).thenReturn(Token.DESTROYED);
- assertThat(regionCommit.isOpDestroyEvent(region, true, key)).isFalse();
+ assertThat(regionCommit.isOpDestroyEvent(region, entryOp)).isFalse();
}
@Test
public void isOpDestroyedEventReturnsFalseIfIsDestroyOperationAndRegionEntryToBeDestroyedIsTombstone() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
- Object key = new Object();
RegionEntry regionEntry = mock(RegionEntry.class);
when(region.basicGetEntry(key)).thenReturn(regionEntry);
when(regionEntry.getValue()).thenReturn(Token.TOMBSTONE);
- assertThat(regionCommit.isOpDestroyEvent(region, true, key)).isFalse();
+ assertThat(regionCommit.isOpDestroyEvent(region, entryOp)).isFalse();
}
@Test
public void isOpDestroyedEventReturnsTrueIfDestroyEntryOnEmptyRegion() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
- Object key = new Object();
when(region.isProxy()).thenReturn(true);
- assertThat(regionCommit.isOpDestroyEvent(region, true, key)).isTrue();
+ assertThat(regionCommit.isOpDestroyEvent(region, entryOp)).isTrue();
}
@Test
public void isOpDestroyedEventReturnsTrueIfIsDestroyOperationAndRegionEntryIsNotAToken() {
- RegionCommit regionCommit = new RegionCommit(txCommitMessage);
- Object key = new Object();
RegionEntry regionEntry = mock(RegionEntry.class);
when(region.basicGetEntry(key)).thenReturn(regionEntry);
when(regionEntry.getValue()).thenReturn(new Token.NotAToken());
- assertThat(regionCommit.isOpDestroyEvent(region, true, key)).isTrue();
+ assertThat(regionCommit.isOpDestroyEvent(region, entryOp)).isTrue();
}
}