You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/05/23 22:16:36 UTC
[1/3] incubator-geode git commit: removed unused EntriesSet
constructor
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1426 536f64dfe -> 10d13834d
removed unused EntriesSet constructor
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/53c94540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/53c94540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/53c94540
Branch: refs/heads/feature/GEODE-1426
Commit: 53c94540d4baf880851f78acf02ddce6edfa0f57
Parents: 536f64d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 23 14:30:12 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon May 23 14:30:12 2016 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/internal/cache/EntriesSet.java | 6 ------
.../java/com/gemstone/gemfire/internal/cache/LocalRegion.java | 4 +---
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53c94540/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesSet.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesSet.java
index 50add2b..109b9c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesSet.java
@@ -53,12 +53,6 @@ public class EntriesSet extends AbstractSet {
protected boolean ignoreCopyOnReadForQuery = false;
EntriesSet(LocalRegion region, boolean recursive, IteratorType viewType, boolean allowTombstones) {
- this(region, recursive, viewType, true /* rememberReads */,
- false /* skipTxCheckInIteration */, allowTombstones);
- }
-
- EntriesSet(LocalRegion region, boolean recursive, IteratorType viewType,
- final boolean rememberReads, final boolean skipTxCheckInIteration, boolean allowTombstones) {
this.topRegion = region;
this.recursive = recursive;
this.iterType = viewType;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53c94540/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index ab8a230..8be9c4b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -2012,9 +2012,7 @@ public class LocalRegion extends AbstractRegion
{
checkReadiness();
checkForNoAccess();
- return new EntriesSet(this, false, IteratorType.KEYS,
- false /* dontRememberReads */, false /* skipTxCheckInIteration */,
- false /* allowTombstones */);
+ return new EntriesSet(this, false, IteratorType.KEYS, false /* allowTombstones */);
}
public Set keys()
[3/3] incubator-geode git commit: fixed sanctionedSerializables.txt
Posted by ds...@apache.org.
fixed sanctionedSerializables.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/10d13834
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/10d13834
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/10d13834
Branch: refs/heads/feature/GEODE-1426
Commit: 10d13834d076f5c45bff2e6c8c7a4c46606e5140
Parents: 03a81fc
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 23 14:52:19 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon May 23 14:52:19 2016 -0700
----------------------------------------------------------------------
.../com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/10d13834/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index b8ef985..89305ac 100755
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -279,7 +279,7 @@ com/gemstone/gemfire/internal/cache/FilterProfile$interestType,false
com/gemstone/gemfire/internal/cache/FilterProfile$operationType,false
com/gemstone/gemfire/internal/cache/ForceReattemptException,true,-595988965679204903,hasHash:boolean,keyHash:int
com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue,true,-6903933977591709194,capacity:int,count:java/util/concurrent/atomic/AtomicInteger,notEmpty:java/util/concurrent/locks/Condition,notFull:java/util/concurrent/locks/Condition,putLock:java/util/concurrent/locks/ReentrantLock,takeLock:java/util/concurrent/locks/ReentrantLock
-com/gemstone/gemfire/internal/cache/GemFireCacheImpl$3,true,-6456778743822843838,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
+com/gemstone/gemfire/internal/cache/GemFireCacheImpl$3,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$4,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$5,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
com/gemstone/gemfire/internal/cache/GemFireCacheImpl$6,true,1,this$0:com/gemstone/gemfire/internal/cache/GemFireCacheImpl
[2/3] incubator-geode git commit: now calls txMgr.removeHostedTXState
unconditionally
Posted by ds...@apache.org.
now calls txMgr.removeHostedTXState unconditionally
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/03a81fca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/03a81fca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/03a81fca
Branch: refs/heads/feature/GEODE-1426
Commit: 03a81fcacc512ac1ff786c53209d15a0a3816010
Parents: 53c9454
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 23 14:36:03 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon May 23 14:36:03 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/TXRemoteCommitMessage.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03a81fca/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
index 03361d5..bdf6a23 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
@@ -85,7 +85,6 @@ public class TXRemoteCommitMessage extends TXMessage {
logger.debug("TX: Committing: {}", txId);
}
final TXStateProxy txState = txMgr.getTXState();
- boolean commitSuccessful = false;
TXCommitMessage cmsg = null;
try {
// do the actual commit, only if it was not done before
@@ -97,21 +96,17 @@ public class TXRemoteCommitMessage extends TXMessage {
if (txMgr.isExceptionToken(cmsg)) {
throw txMgr.getExceptionForToken(cmsg, txId);
}
- commitSuccessful = true;
} else {
// if no TXState was created (e.g. due to only getEntry/size operations
// that don't start remote TX) then ignore
if (txState != null) {
txState.setCommitOnBehalfOfRemoteStub(true);
txMgr.commit();
- commitSuccessful = true;
cmsg = txState.getCommitMessage();
}
}
} finally {
- if (commitSuccessful) {
- txMgr.removeHostedTXState(txId);
- }
+ txMgr.removeHostedTXState(txId);
}
TXRemoteCommitReplyMessage.send(getSender(), getProcessorId(), cmsg, getReplySender(dm));