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:43:36 UTC
[geode] branch release/1.5.0 updated: GEODE-4834: Remove the newly
added isConcurrencyConflict from GatewaySenderEventImpl (#1609)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch release/1.5.0
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.5.0 by this push:
new 3c88526 GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl (#1609)
3c88526 is described below
commit 3c88526c35b2e308a826504626645eaa60fe2eba
Author: Xiaojian Zhou <ge...@users.noreply.github.com>
AuthorDate: Wed Mar 14 10:37:19 2018 -0700
GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl (#1609)
(cherry picked from commit 662fb51b5f0de734191251e0ad84c1cb362a9505)
---
.../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 5abf7ae..0e0fe97 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.