You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/03/14 17:36:52 UTC
[geode] branch feature/GEODE-4834 updated (d096e0e -> d2598bb)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-4834
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit d096e0e GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl
add 2f1fe57 GEODE-4768: Close the socket to the locator in the experimental driver
add 9223b16 GEODE-4527: get rid of static getAnyInstance or getInstance call to get the cache. (#1596)
add 9e0c8d5 [GEODE-4835] Add python3 to ci docker image.
add 963ba03 Merge pull request #1610 from smgoller/GEODE-4835
add 736742d GEODE-4669: Fall back on file controller if mbean controller fails
add 2f2a73c GEODE-4384: gfsh command to destroy jndi binding (#1588)
add 140118d GEODE-4823: OQL index not updated for tombstone (#1603)
add b8d16ee GEODE-4829: Categorized AEQ tests (#1605)
add 7c936ca GEODE-4797: Categorized WanTest (#1604)
add 29eff01 GEODE-3891: Cannot enable ciphers for REST interface (#1613)
add 7a3da49 Revert "GEODE-2999: Add PutIfAbsent to the Protobuf protocol. (#1578)"
add 39a81f4 GEODE-4785: Add test category annotation to Pulse tests (#1595)
add d621b47 GEODE-4689: Colocation complete listeners added (#1565)
new d2598bb GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d096e0e)
\
N -- N -- N refs/heads/feature/GEODE-4834 (d2598bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/docker/Dockerfile | 2 +-
ci/scripts/concourse_job_performance.sh | 1 -
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 19 ++-
.../geode/tools/pulse/PulseConnectivityTest.java | 3 +-
.../geode/tools/pulse/PulseDataExportTest.java | 3 +-
.../tools/pulse/PulseJmxPasswordFileTest.java | 4 +-
.../tools/pulse/PulseSecurityIntegrationTest.java | 4 +-
.../geode/tools/pulse/PulseSecurityTest.java | 4 +-
.../tools/pulse/PulseSecurityWithSSLTest.java | 4 +-
.../geode/internal/cache/ColocationListener.java | 15 +-
.../internal/cache/PartitionRegionConfig.java | 5 +-
.../geode/internal/cache/PartitionedRegion.java | 23 ++-
.../cache/entries/AbstractRegionEntry.java | 51 ++++---
.../process/MBeanOrFileProcessController.java | 64 ++++++++
.../internal/process/ProcessControllerFactory.java | 10 +-
.../geode/management/internal/JettyHelper.java | 6 +-
.../apache/geode/management/internal/SSLUtil.java | 12 +-
.../cli/commands/ChangeLogLevelCommand.java | 136 ++++++++---------
.../cli/commands/CreateJndiBindingCommand.java | 2 +-
.../cli/commands/DestroyJndiBindingCommand.java | 12 +-
.../internal/cli/commands/QueryCommand.java | 3 +-
.../StatusClusterConfigServiceCommand.java | 3 +-
...ncEventQueueEvictionAndExpirationJUnitTest.java | 13 +-
.../SerialAsyncEventQueueImplJUnitTest.java | 4 +-
...st.java => PartitionRegionConfigJUnitTest.java} | 12 +-
.../cache/PartitionedRegionCreationJUnitTest.java | 1 +
.../cache/entries/AbstractRegionEntryTest.java | 23 ++-
...yncEventQueueEntrySynchronizationDUnitTest.java | 3 +-
...ewayReceiverXmlParsingValidationsJUnitTest.java | 3 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 3 +-
.../AsyncEventListenerOffHeapDUnitTest.java | 8 +-
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 7 +-
.../AsyncEventQueueValidationsJUnitTest.java | 11 +-
.../ConcurrentAsyncEventQueueDUnitTest.java | 7 +-
.../ConcurrentAsyncEventQueueOffHeapDUnitTest.java | 8 +-
.../CommonParallelAsyncEventQueueDUnitTest.java | 7 +-
...monParallelAsyncEventQueueOffHeapDUnitTest.java | 8 +-
...elGatewaySenderFlushedCoordinatorJUnitTest.java | 11 +-
.../ProcessControllerFactoryIntegrationTest.java | 2 +-
.../process/ProcessControllerFactoryTest.java | 2 +-
.../commands/DestroyJndiBindingCommandTest.java | 32 +++-
.../geode/experimental/driver/ProtobufChannel.java | 8 +-
.../geode/experimental/driver/ProtobufRegion.java | 14 --
.../apache/geode/experimental/driver/Region.java | 11 --
.../experimental/driver/RegionIntegrationTest.java | 23 ---
.../categories/{WanTest.java => AEQTest.java} | 4 +-
.../categories/{LuceneTest.java => PulseTest.java} | 5 +-
.../lucene/internal/IndexRepositoryFactory.java | 25 ++-
.../LuceneFileRegionColocationListener.java | 47 ++++++
.../cache/lucene/internal/LuceneServiceImpl.java | 4 +-
.../internal/PartitionedRepositoryManager.java | 2 +-
.../lucene/internal/RawIndexRepositoryFactory.java | 4 +-
.../internal/RawLuceneRepositoryManager.java | 2 +-
.../cache/lucene/test/IndexRepositorySpy.java | 8 +-
.../src/main/proto/v1/basicTypes.proto | 1 -
.../src/main/proto/v1/clientProtocol.proto | 3 -
.../src/main/proto/v1/region_API.proto | 9 --
.../protocol/protobuf/v1/ProtobufOpsProcessor.java | 6 +-
.../protobuf/v1/ProtobufStreamProcessor.java | 1 +
.../PutIfAbsentRequestOperationHandler.java | 83 ----------
.../registry/ProtobufOperationContextRegistry.java | 38 ++---
.../protobuf/v1/utilities/ProtobufUtilities.java | 14 ++
.../internal/protocol/protobuf/v1/MessageUtil.java | 17 ---
.../protobuf/v1/ProtobufRequestUtilities.java | 19 +--
.../v1/acceptance/CacheConnectionJUnitTest.java | 15 +-
.../v1/acceptance/CacheOperationsJUnitTest.java | 20 ++-
.../PutIfAbsentRequestIntegrationTest.java | 168 --------------------
...utIfAbsentRequestOperationHandlerJUnitTest.java | 169 ---------------------
.../controllers/PulseControllerJUnitTest.java | 13 +-
gradle/test.gradle | 12 ++
70 files changed, 524 insertions(+), 772 deletions(-)
copy geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/package-info.java => geode-core/src/main/java/org/apache/geode/internal/cache/ColocationListener.java (73%)
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/process/MBeanOrFileProcessController.java
copy geode-core/src/test/java/org/apache/geode/internal/cache/{ExpiryTaskTest.java => PartitionRegionConfigJUnitTest.java} (72%)
copy geode-junit/src/main/java/org/apache/geode/test/junit/categories/{WanTest.java => AEQTest.java} (90%)
mode change 100755 => 100644
copy geode-junit/src/main/java/org/apache/geode/test/junit/categories/{LuceneTest.java => PulseTest.java} (90%)
create mode 100644 geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneFileRegionColocationListener.java
delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandler.java
delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.
[geode] 01/01: GEODE-4834: Remove the newly added
isConcurrencyConflict from GatewaySenderEventImpl
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4834
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d2598bb80bec1494b02b3b658bafb00452d65ec5
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Mar 13 14:49:59 2018 -0700
GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl
---
.../internal/cache/wan/GatewaySenderEventImpl.java | 33 +++-------------------
.../codeAnalysis/sanctionedDataSerializables.txt | 8 ++----
2 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index 3a1ecd0..a391238 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataSerializable;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.Conflatable;
@@ -62,8 +61,8 @@ import org.apache.geode.internal.size.Sizeable;
* @since GemFire 7.0
*
*/
-public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixedID, Conflatable,
- Sizeable, Releasable, VersionedDataSerializable {
+public class GatewaySenderEventImpl
+ implements AsyncEvent, DataSerializableFixedID, Conflatable, Sizeable, Releasable {
private static final long serialVersionUID = -5690172020872255422L;
protected static final Object TOKEN_NULL = new Object();
@@ -172,8 +171,6 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
protected boolean isInitialized;
- private transient boolean isConcurrencyConflict = false;
-
/**
* Is this thread in the process of serializing this event?
*/
@@ -315,7 +312,6 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
if (initialize) {
initialize();
}
- this.isConcurrencyConflict = event.isConcurrencyConflict();
}
/**
@@ -677,13 +673,7 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
return GATEWAY_SENDER_EVENT_IMPL;
}
- @Override
public void toData(DataOutput out) throws IOException {
- toDataPre_GEODE_1_5_0_0(out);
- DataSerializer.writeBoolean(this.isConcurrencyConflict, out);
- }
-
- public void toDataPre_GEODE_1_5_0_0(DataOutput out) throws IOException {
// Make sure we are initialized before we serialize.
initialize();
out.writeShort(VERSION);
@@ -707,13 +697,7 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
DataSerializer.writeObject(this.key, out);
}
- @Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GEODE_1_5_0_0(in);
- this.isConcurrencyConflict = DataSerializer.readBoolean(in);
- }
-
- public void fromDataPre_GEODE_1_5_0_0(DataInput in) throws IOException, ClassNotFoundException {
short version = in.readShort();
if (version != VERSION) {
// warning?`
@@ -760,8 +744,7 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
.append(";creationTime=").append(this.creationTime).append(";shadowKey=")
.append(this.shadowKey).append(";timeStamp=").append(this.versionTimeStamp)
.append(";acked=").append(this.isAcked).append(";dispatched=").append(this.isDispatched)
- .append(";bucketId=").append(this.bucketId).append(";isConcurrencyConflict=")
- .append(this.isConcurrencyConflict).append("]");
+ .append(";bucketId=").append(this.bucketId).append("]");
return buffer.toString();
}
@@ -1145,14 +1128,6 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
return bucketId;
}
- public boolean isConcurrencyConflict() {
- return isConcurrencyConflict;
- }
-
- public boolean setConcurrencyConflict(boolean isConcurrencyConflict) {
- return this.isConcurrencyConflict = isConcurrencyConflict;
- }
-
/**
* @param tailKey the tailKey to set
*/
@@ -1169,7 +1144,7 @@ public class GatewaySenderEventImpl implements AsyncEvent, DataSerializableFixed
@Override
public Version[] getSerializationVersions() {
- return new Version[] {Version.GEODE_150};
+ return null;
}
public int getSerializedValueSize() {
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 513737b..2d41576 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1988,11 +1988,9 @@ org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
fromData,63,2a2bb700182a2bb80019b60017b500032abb00075905b7000ab500062bb9001a01003d033e1d1ca200172ab400062bb9001a0100b6001b57840301a7ffeab1
toData,87,2a2bb700112ab40003b800122bb800132ab40006c6003b2b2ab40006b60014b9001502002ab40006b600164d2cb9000c010099001a2cb9000d0100c0000e4e2b2db60017b900150200a7ffe3a7000a2b03b900150200b1
-org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,4
-fromData,17,2a2bb600772a2bb80078b60079b50006b1
-fromDataPre_GEODE_1_5_0_0,183,2bb9007a01003d1c10119f00032a04b5002d2a2bb9007b0100b5002a2a2bb9007b0100b5002b1c1011a200232bc1007c99001c2bb8007db2007ea60012bb007f592bc0007cb20080b700814c2a2bb80082c00083b5002c2a2bb80084b500112a2bb900850100b500302a2bb600862a2bb80087b500322a2bb80082c00021b500222a2bb900880100b500142a2bb900890100b500182a2bb9007b0100b5000a2a2bb900890100b80004b500052a2bb900890100b5001cb1
-toData,17,2a2bb600692ab40006b8006a2bb8006bb1
-toDataPre_GEODE_1_5_0_0,133,2ab600282b1011b9006c02002b2ab4002ab9006d02002b2ab4002bb9006d02002ab4002c2bb8006e2ab400112bb8006f2b2ab40030b9007002002a2bb600712ab600312bb800722ab400222bb8006e2b2ab40014b9007302002b2ab40018b9007403002b2ab4000ab9006d02002b2ab40005b60075b9007403002b2ab60076b900740300b1
+org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,2
+fromData,183,2bb9007201003d1c10119f00032a04b5002b2a2bb900730100b500282a2bb900730100b500291c1011a200232bc1007499001c2bb80075b20076a60012bb0077592bc00074b20078b700794c2a2bb8007ac0007bb5002a2a2bb8007cb500102a2bb9007d0100b5002e2a2bb6007e2a2bb8007fb500302a2bb8007ac00020b500212a2bb900800100b500132a2bb900810100b500172a2bb900730100b500092a2bb900810100b80004b500052a2bb900810100b5001bb1
+toData,133,2ab600272b1011b9006702002b2ab40028b9006802002b2ab40029b9006802002ab4002a2bb800692ab400102bb8006a2b2ab4002eb9006b02002a2bb6006c2ab6002f2bb8006d2ab400212bb800692b2ab40013b9006e02002b2ab40017b9006f03002b2ab40009b9006802002b2ab40005b60070b9006f03002b2ab60071b9006f0300b1
org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationEntry,2
fromData,20,2a2bb80006b500022a2bb80006c00007b50001b1
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.