You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by as...@apache.org on 2015/11/18 20:20:33 UTC
[1/3] incubator-geode git commit: GEODE-524 enque -> enqueue
correction
Repository: incubator-geode
Updated Branches:
refs/heads/develop b2e0142c2 -> 4b904ce62
GEODE-524 enque -> enqueue correction
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/12cadbee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/12cadbee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/12cadbee
Branch: refs/heads/develop
Commit: 12cadbee57a650bc100eb738008497ed12f0b09b
Parents: cfbeaf2
Author: shtykh_roman <rs...@yahoo.com>
Authored: Wed Nov 11 12:28:28 2015 +0900
Committer: shtykh_roman <rs...@yahoo.com>
Committed: Wed Nov 11 12:28:28 2015 +0900
----------------------------------------------------------------------
.../internal/ParallelAsyncEventQueueImpl.java | 2 +-
.../internal/SerialAsyncEventQueueImpl.java | 2 +-
.../cache/wan/AbstractGatewaySender.java | 20 ++++++++++----------
...rentParallelGatewaySenderEventProcessor.java | 2 +-
.../ParallelGatewaySenderEventProcessor.java | 2 +-
.../parallel/ParallelGatewaySenderQueue.java | 4 ++--
.../SerialGatewaySenderEventProcessor.java | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index f73b90f..377f8e2 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -113,7 +113,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
if (!tmpQueuedEvents.isEmpty()) {
- enqueTempEvents();
+ enqueueTempEvents();
}
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
index 71f839e..8c8342c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
@@ -121,7 +121,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
logger.info(LocalizedMessage.create(LocalizedStrings.SerialGatewaySenderImpl_STARTED__0, this));
- enqueTempEvents();
+ enqueueTempEvents();
} finally {
this.lifeCycleLock.writeLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
index f1613a3..aef2a4b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
/**
- * Abstract implementation of both Serial and Parallel GatewaySener. It handles
+ * Abstract implementation of both Serial and Parallel GatewaySender. It handles
* common functionality like initializing proxy.
*
* @author Suranjan Kumar
@@ -640,15 +640,15 @@ public abstract class AbstractGatewaySender implements GatewaySender,
logger.info(LocalizedMessage.create(LocalizedStrings.GatewayImpl_GATEWAY_0_HAS_BEEN_REBALANCED, this));
}
- public boolean beforeEnque(GatewayQueueEvent gatewayEvent) {
- boolean enque = true;
+ public boolean beforeEnqueue(GatewayQueueEvent gatewayEvent) {
+ boolean enqueue = true;
for (GatewayEventFilter filter : getGatewayEventFilters()) {
- enque = filter.beforeEnqueue(gatewayEvent);
- if (!enque) {
- return enque;
+ enqueue = filter.beforeEnqueue(gatewayEvent);
+ if (!enqueue) {
+ return enqueue;
}
}
- return enque;
+ return enqueue;
}
protected void stompProxyDead() {
@@ -809,7 +809,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
logger.info(LocalizedMessage.create(LocalizedStrings.GatewaySender_PAUSED__0, this));
- enqueTempEvents();
+ enqueueTempEvents();
} finally {
this.lifeCycleLock.writeLock().unlock();
}
@@ -832,7 +832,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
logger.info(LocalizedMessage.create(LocalizedStrings.GatewaySender_RESUMED__0, this));
- enqueTempEvents();
+ enqueueTempEvents();
} finally {
this.lifeCycleLock.writeLock().unlock();
}
@@ -1021,7 +1021,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
* The eventProcessor can be null when the method gets invoked through this flow:
* ParallelGatewaySenderImpl.start() -> ParallelGatewaySenderQueue.<init> -> ParallelGatewaySenderQueue.addPartitionedRegionForRegion
*/
- public void enqueTempEvents() {
+ public void enqueueTempEvents() {
if (this.eventProcessor != null) {//Fix for defect #47308
TmpQueueEvent nextEvent = null;
final GatewaySenderStats stats = getStatistics();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
index 970afe3..dd6ffc5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
@@ -156,7 +156,7 @@ public class ConcurrentParallelGatewaySenderEventProcessor extends AbstractGatew
int pId = bucketId % this.nDispatcher;
this.processors[pId].enqueueEvent(operation, event, substituteValue);
- /* if (getSender().beforeEnque(gatewayQueueEvent)) {
+ /* if (getSender().beforeEnqueue(gatewayQueueEvent)) {
long start = getSender().getStatistics().startTime();
try {
this.parallelQueue.put(gatewayQueueEvent);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
index f8780f4..8d11079 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
@@ -149,7 +149,7 @@ public class ParallelGatewaySenderEventProcessor extends
gatewayQueueEvent = new HDFSGatewayEventImpl(operation,
event, substituteValue, true, eventID.getBucketID());
- if (getSender().beforeEnque(gatewayQueueEvent)) {
+ if (getSender().beforeEnqueue(gatewayQueueEvent)) {
long start = getSender().getStatistics().startTime();
try {
this.queue.put(gatewayQueueEvent);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 882a99a..c82e9e5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -427,7 +427,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
* ParallelGatewaySender
*/
if ((this.index == this.nDispatcher - 1) && this.sender.isRunning()) {
- ((AbstractGatewaySender)sender).enqueTempEvents();
+ ((AbstractGatewaySender)sender).enqueueTempEvents();
}
}
finally {
@@ -583,7 +583,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
* ParallelGatewaySender
*/
if ((this.index == this.nDispatcher - 1) && this.sender.isRunning()) {
- ((AbstractGatewaySender)sender).enqueTempEvents();
+ ((AbstractGatewaySender)sender).enqueueTempEvents();
}
afterRegionAdd(userPR);
this.sender.lifeCycleLock.writeLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12cadbee/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 55e9668..a04ddd2 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -444,7 +444,7 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
if (logger.isDebugEnabled()) {
logger.debug("{}: Queueing event ({}): {}", sender.getId(), (statistics.getEventsQueued() + 1), gatewayEvent);
}
- if (!sender.beforeEnque(gatewayEvent)) {
+ if (!sender.beforeEnqueue(gatewayEvent)) {
if (logger.isDebugEnabled()) {
logger.debug("Event {} is not added to queue.", gatewayEvent);
}
@@ -683,7 +683,7 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
catch (Exception e) {
logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayImpl_EVENT_FAILED_TO_BE_INITIALIZED_0, gatewayEvent), e);
}
- if (!sender.beforeEnque(gatewayEvent)) {
+ if (!sender.beforeEnqueue(gatewayEvent)) {
statistics.incEventsFiltered();
return;
}
[3/3] incubator-geode git commit: Merge branch 'feature/GEODE-524' of
https://github.com/shroman/incubator-geode into develop
Posted by as...@apache.org.
Merge branch 'feature/GEODE-524' of https://github.com/shroman/incubator-geode into develop
This closes #33
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4b904ce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4b904ce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4b904ce6
Branch: refs/heads/develop
Commit: 4b904ce62c56b9613bcd7df301ef2e40f256496b
Parents: b2e0142 9dc7587
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Nov 18 11:07:55 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Nov 18 11:19:45 2015 -0800
----------------------------------------------------------------------
.../internal/ParallelAsyncEventQueueImpl.java | 2 +-
.../internal/SerialAsyncEventQueueImpl.java | 2 +-
.../cache/wan/AbstractGatewaySender.java | 20 ++++++++++----------
...rentParallelGatewaySenderEventProcessor.java | 2 +-
.../ParallelGatewaySenderEventProcessor.java | 2 +-
.../parallel/ParallelGatewaySenderQueue.java | 12 ++++++------
.../SerialGatewaySenderEventProcessor.java | 4 ++--
7 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4b904ce6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
[2/3] incubator-geode git commit: GEODE-524 enque -> enqueue
correction in comments
Posted by as...@apache.org.
GEODE-524 enque -> enqueue correction in comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9dc7587a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9dc7587a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9dc7587a
Branch: refs/heads/develop
Commit: 9dc7587a45cc18e10e9c58159bcc52b7e412eb41
Parents: 12cadbe
Author: shtykh_roman <rs...@yahoo.com>
Authored: Wed Nov 11 12:39:46 2015 +0900
Committer: shtykh_roman <rs...@yahoo.com>
Committed: Wed Nov 11 12:39:46 2015 +0900
----------------------------------------------------------------------
.../cache/wan/parallel/ParallelGatewaySenderQueue.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9dc7587a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index c82e9e5..2321272 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -420,10 +420,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
handleShadowPRExistsScenario(cache, prQ);
}
/*
- * Here, enqueTempEvents need to be invoked when a sender is already
+ * Here, enqueueTempEvents need to be invoked when a sender is already
* running and userPR is created later. When the flow comes here through
* start() method of sender i.e. userPR already exists and sender is
- * started later, the enqueTempEvents is done in the start() method of
+ * started later, the enqueueTempEvents is done in the start() method of
* ParallelGatewaySender
*/
if ((this.index == this.nDispatcher - 1) && this.sender.isRunning()) {
@@ -576,10 +576,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
this.userRegionNameToshadowPRMap.put(userPR.getFullPath(), prQ);
}
/*
- * Here, enqueTempEvents need to be invoked when a sender is already
+ * Here, enqueueTempEvents need to be invoked when a sender is already
* running and userPR is created later. When the flow comes here through
* start() method of sender i.e. userPR already exists and sender is
- * started later, the enqueTempEvents is done in the start() method of
+ * started later, the enqueueTempEvents is done in the start() method of
* ParallelGatewaySender
*/
if ((this.index == this.nDispatcher - 1) && this.sender.isRunning()) {