You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/07 21:53:05 UTC

[06/17] incubator-geode git commit: GEODE-11: Added support for lucene index profile exchange

GEODE-11: Added support for lucene index profile exchange


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c742c4e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c742c4e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c742c4e5

Branch: refs/heads/feature/GEODE-837
Commit: c742c4e54c0b3ab16ce7845e2534e746cefbbce1
Parents: 8e21638
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Thu Jun 2 13:38:23 2016 -0700
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Mon Jun 6 09:56:48 2016 -0700

----------------------------------------------------------------------
 .../internal/DataSerializableFixedID.java       |   2 +-
 .../cache/CacheDistributionAdvisor.java         |  22 +-
 .../internal/cache/CacheServiceProfile.java     |  40 +++
 .../internal/cache/CreateRegionProcessor.java   |  23 +-
 .../internal/cache/GemFireCacheImpl.java        |   2 +-
 .../internal/cache/InternalRegionArguments.java |  16 ++
 .../gemfire/internal/cache/LocalRegion.java     |  11 +-
 .../internal/cache/PartitionedRegion.java       |   8 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |  10 +-
 .../sanctionedDataSerializables.txt             | 150 +++++-----
 .../internal/LuceneIndexCreationProfile.java    | 189 +++++++++++++
 .../lucene/internal/LuceneServiceImpl.java      |  15 +-
 .../internal/xml/LuceneIndexCreation.java       |   9 +-
 .../gemfire/cache/lucene/LuceneDUnitTest.java   |  38 +++
 .../lucene/LuceneIndexCreationDUnitTest.java    | 281 +++++++++++++++++++
 .../gemfire/cache/lucene/LuceneQueriesBase.java |  18 +-
 .../LuceneIndexCreationProfileJUnitTest.java    | 144 ++++++++++
 .../cache/lucene/test/LuceneTestUtilities.java  |  11 +
 ...ifferentFieldAnalyzerSizesFails1.1.cache.xml |  37 +++
 ...ifferentFieldAnalyzerSizesFails1.2.cache.xml |  36 +++
 ...ifferentFieldAnalyzerSizesFails2.1.cache.xml |  36 +++
 ...ifferentFieldAnalyzerSizesFails2.2.cache.xml |  37 +++
 ...ifyDifferentFieldAnalyzersFails1.1.cache.xml |  36 +++
 ...ifyDifferentFieldAnalyzersFails1.2.cache.xml |  36 +++
 ...ifyDifferentFieldAnalyzersFails2.1.cache.xml |  37 +++
 ...ifyDifferentFieldAnalyzersFails2.2.cache.xml |  37 +++
 ...ifyDifferentFieldAnalyzersFails3.1.cache.xml |  37 +++
 ...ifyDifferentFieldAnalyzersFails3.2.cache.xml |  37 +++
 ...tTest.verifyDifferentFieldsFails.1.cache.xml |  36 +++
 ...tTest.verifyDifferentFieldsFails.2.cache.xml |  37 +++
 ...t.verifyDifferentIndexNamesFails.1.cache.xml |  36 +++
 ...t.verifyDifferentIndexNamesFails.2.cache.xml |  36 +++
 ...est.verifyDifferentIndexesFails1.1.cache.xml |  36 +++
 ...est.verifyDifferentIndexesFails1.2.cache.xml |  32 +++
 ...est.verifyDifferentIndexesFails2.1.cache.xml |  36 +++
 ...est.verifyDifferentIndexesFails2.2.cache.xml |  39 +++
 36 files changed, 1531 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index beaadb1..0788503 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -848,7 +848,7 @@ public interface DataSerializableFixedID extends SerializationVersions {
   public static final short LUCENE_ENTRY_SCORE = 2174;
   public static final short LUCENE_TOP_ENTRIES = 2175;
   public static final short LUCENE_TOP_ENTRIES_COLLECTOR = 2176;
-  
+
   // NOTE, codes > 65535 will take 4 bytes to serialize
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
index 2e60c55..c4a8e27 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
@@ -99,6 +99,8 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
 
   private static final int ASYNC_EVENT_QUEUE_IDS_MASK = 0x400000;
   private static final int IS_OFF_HEAP_MASK =           0x800000;
+  private static final int CACHE_SERVICE_PROFILES_MASK = 0x1000000;
+
   
   // moved initializ* to DistributionAdvisor
 
@@ -567,6 +569,8 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
      */
     public boolean hasCacheServer = false;
 
+    public List<CacheServiceProfile> cacheServiceProfiles = new ArrayList<>();
+
     /** for internal use, required for DataSerializer.readObject */
     public CacheProfile() {
     }
@@ -619,6 +623,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
       if (!this.gatewaySenderIds.isEmpty()) s |= GATEWAY_SENDER_IDS_MASK;
       if (!this.asyncEventQueueIds.isEmpty()) s |= ASYNC_EVENT_QUEUE_IDS_MASK;
       if (this.isOffHeap) s |= IS_OFF_HEAP_MASK;
+      if (!this.cacheServiceProfiles.isEmpty()) s |= CACHE_SERVICE_PROFILES_MASK;
       Assert.assertTrue(!this.scope.isLocal());
       return s;
     }
@@ -724,6 +729,14 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
       return this.subscriptionAttributes.getInterestPolicy().isAll();
     }
 
+    public void addCacheServiceProfile(CacheServiceProfile profile) {
+      this.cacheServiceProfiles.add(profile);
+    }
+
+    private boolean hasCacheServiceProfiles(int bits) {
+      return (bits & CACHE_SERVICE_PROFILES_MASK) != 0;
+    }
+
     /**
      * Used to process an incoming cache profile.
      */
@@ -829,9 +842,12 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
         writeSet(asyncEventQueueIds, out);
       }
       DataSerializer.writeObject(this.filterProfile, out);
+      if (!cacheServiceProfiles.isEmpty()) {
+        DataSerializer.writeObject(cacheServiceProfiles, out);
+      }
     }
 
-    private void writeSet(Set<String> set, DataOutput out) throws IOException {
+    private void writeSet(Set<?> set, DataOutput out) throws IOException {
       // to fix bug 47205 always serialize the Set as a HashSet.
       out.writeByte(DSCODE.HASH_SET);
       InternalDataSerializer.writeSet(set, out);
@@ -853,6 +869,9 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
         asyncEventQueueIds = DataSerializer.readObject(in);
       }
       this.filterProfile = DataSerializer.readObject(in);
+      if (hasCacheServiceProfiles(bits)) {
+        cacheServiceProfiles = DataSerializer.readObject(in);
+      }
     }
 
     @Override
@@ -885,6 +904,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
       sb.append("; gatewaySenderIds =" + this.gatewaySenderIds);
       sb.append("; asyncEventQueueIds =" + this.asyncEventQueueIds);
       sb.append("; IsOffHeap=" + this.isOffHeap);
+      sb.append("; cacheServiceProfiles=" + this.cacheServiceProfiles);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
new file mode 100644
index 0000000..d25e92a
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServiceProfile.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Region;
+
+/**
+ * CacheServiceProfiles track additions to a {@link Region} made by a {@link CacheService}.
+ * They are added to the {@link CacheDistributionAdvisor.CacheProfile} during {@link Region}
+ * creation and are exchanged by the {@link CreateRegionProcessor}.
+ */
+public interface CacheServiceProfile {
+
+  /**
+   * Return the id of this profile
+   * @return the id of this profile
+   */
+  String getId();
+
+  /**
+   * @param regionPath The path of the region to which this profile is associated
+   * @param profile The CacheServiceProfile to check compatibility against
+   * @return A string message of incompatibility or null if the profiles are compatible
+   */
+  String checkCompatibility(String regionPath, CacheServiceProfile profile);
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
index d063a54..bc44c1c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CreateRegionProcessor.java
@@ -572,8 +572,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
         if (!rgn.getFullPath().contains( 
             DynamicRegionFactoryImpl.dynamicRegionListName)) { 
           result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_1_GATEWAY_SENDER_IDS_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_REGION_WITH_2_GATEWAY_SENDER_IDS
-            .toLocalizedString(new Object[] { this.regionPath,
-                otherGatewaySenderIds, myGatewaySenderIds });
+            .toLocalizedString(this.regionPath, myGatewaySenderIds, otherGatewaySenderIds);
         }
       }
       
@@ -582,8 +581,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
       if (!isLocalOrRemoteAccessor(rgn, profile) && !otherAsynEventQueueIds
           .equals(myAsyncEventQueueIds)) {
         result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_1_ASYNC_EVENT_IDS_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_REGION_WITH_2_ASYNC_EVENT_IDS
-            .toLocalizedString(new Object[] { this.regionPath,
-                otherAsynEventQueueIds, myAsyncEventQueueIds });
+            .toLocalizedString(this.regionPath, myAsyncEventQueueIds, otherAsynEventQueueIds);
       }
       
       final PartitionAttributes pa = rgn.getAttributes()
@@ -611,7 +609,22 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
         result = LocalizedStrings.CreateRegionProcessor_CANNOT_CREATE_REGION_0_WITH_OFF_HEAP_EQUALS_1_BECAUSE_ANOTHER_CACHE_2_HAS_SAME_THE_REGION_WITH_OFF_HEAP_EQUALS_3
             .toLocalizedString(new Object[] { this.regionPath, profile.isOffHeap, myId, otherIsOffHeap });
       }
-      
+
+      String cspResult = null;
+      // TODO Compares set sizes and equivalent entries.
+      if (profile.cacheServiceProfiles != null) {
+        for (CacheServiceProfile remoteProfile : profile.cacheServiceProfiles) {
+          CacheServiceProfile localProfile = ((LocalRegion) rgn).getCacheServiceProfile(remoteProfile.getId());
+          cspResult = remoteProfile.checkCompatibility(rgn.getFullPath(), localProfile);
+          if (cspResult != null) {
+            break;
+          }
+        }
+        // Don't overwrite result with null in case it has already been set in a previous compatibility check.
+        if (cspResult != null) {
+          result = cspResult;
+        }
+      }
       if (logger.isDebugEnabled()) {
         logger.debug("CreateRegionProcessor.checkCompatibility: this={}; other={}; result={}", rgn, profile, result);
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index b08c480..5355a2b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -1066,7 +1066,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
       this.services.put(service.getInterface(), service);
     }
   }
-  
+
   private boolean isNotJmxManager(){
     return (this.system.getConfig().getJmxManagerStart() != true);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
index 7974418..3a254d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
@@ -17,7 +17,10 @@
 package com.gemstone.gemfire.internal.cache;
 
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import com.gemstone.gemfire.cache.query.internal.IndexUpdater;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
@@ -66,6 +69,7 @@ public final class InternalRegionArguments
   private List indexes;
   private boolean declarativeIndexCreation;
 
+  private Map<String,CacheServiceProfile> cacheServiceProfiles;
 
   /* methods that set and retrieve internal state used to configure a Region */
 
@@ -317,4 +321,16 @@ public final class InternalRegionArguments
   public boolean getDeclarativeIndexCreation() {
     return this.declarativeIndexCreation;
   }
+
+  public InternalRegionArguments addCacheServiceProfile(CacheServiceProfile profile) {
+    if(this.cacheServiceProfiles == null) {
+      this.cacheServiceProfiles = new HashMap<>();
+    }
+    this.cacheServiceProfiles.put(profile.getId(), profile);
+    return this;
+  }
+
+  public Map<String,CacheServiceProfile> getCacheServiceProfiles() {
+    return this.cacheServiceProfiles;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/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 31a0aae..6b664fe 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
@@ -452,6 +452,8 @@ public class LocalRegion extends AbstractRegion
     return this.stopper;
   }
 
+  protected Map<String,CacheServiceProfile> cacheServiceProfiles;
+
   ////////////////// Public Methods ///////////////////////////////////////////
 
   static String calcFullPath(String regionName, LocalRegion parentRegion) {
@@ -550,7 +552,10 @@ public class LocalRegion extends AbstractRegion
     this.isUsedForSerialGatewaySenderQueue = internalRegionArgs.isUsedForSerialGatewaySenderQueue();
     this.isUsedForParallelGatewaySenderQueue = internalRegionArgs.isUsedForParallelGatewaySenderQueue();
     this.serialGatewaySender = internalRegionArgs.getSerialGatewaySender();
-    
+    this.cacheServiceProfiles = internalRegionArgs.getCacheServiceProfiles() == null
+        ? null
+        : Collections.unmodifiableMap(internalRegionArgs.getCacheServiceProfiles());
+
     if (!isUsedForMetaRegion && !isUsedForPartitionedRegionAdmin
         && !isUsedForPartitionedRegionBucket
         && !isUsedForSerialGatewaySenderQueue
@@ -10989,6 +10994,10 @@ public class LocalRegion extends AbstractRegion
            || isUsedForPartitionedRegionBucket();
   }
 
+  public CacheServiceProfile getCacheServiceProfile(String id) {
+    return this.cacheServiceProfiles.get(id);
+  }
+
   public LoaderHelper createLoaderHelper(Object key, Object callbackArgument,
       boolean netSearchAllowed, boolean netLoadAllowed,
       SearchLoadAndWriteProcessor searcher)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index 667c765..9375d04 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -5181,7 +5181,13 @@ public class PartitionedRegion extends LocalRegion implements
     }
     
     fillInProfile((PartitionProfile) profile);
-    
+
+    if (cacheServiceProfiles != null) {
+      for (CacheServiceProfile csp : cacheServiceProfiles.values()) {
+        profile.addCacheServiceProfile(csp);
+      }
+    }
+
     profile.isOffHeap = getOffHeap();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 954d2c8..13eca56 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3761,7 +3761,15 @@ public class LocalizedStrings {
   public static final StringId SwaggerConfig_DOC_TITLE = new StringId(6621, "Apache Geode Documentation");
   public static final StringId SwaggerConfig_DOC_LINK = new StringId(6622, "http://geode.incubator.apache.org/docs/");
 
-  public static final StringId LuceneXmlParser_CLASS_0_IS_NOT_AN_INSTANCE_OF_ANALYZER = new StringId(6623, "Class \"{0}\" is not an instance of Analyzer.");
+  public static final StringId LuceneXmlParser_CLASS_0_IS_NOT_AN_INSTANCE_OF_ANALYZER = new StringId(6623, "Class {0} is not an instance of Analyzer.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELDS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELDS_3 = new StringId(6624, "Cannot create Lucene index {0} on region {1} with fields {2} because another member defines the same index with fields {3}.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3 = new StringId(6625, "Cannot create Lucene index {0} on region {1} with analyzer {2} because another member defines the same index with analyzer {3}.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_FIELD_ANALYZERS = new StringId(6626, "Cannot create Lucene index {0} on region {1} with field analyzers {2} because another member defines the same index with no field analyzers.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_FIELD_ANALYZERS_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_2 = new StringId(6627, "Cannot create Lucene index {0} on region {1} with no field analyzers because another member defines the same index with field analyzers {2}.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_3 = new StringId(6628, "Cannot create Lucene index {0} on region {1} with field analyzers {2} because another member defines the same index with field analyzers {3}.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_ANALYZER_ON_FIELD_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3_ON_THAT_FIELD = new StringId(6629, "Cannot create Lucene index {0} on region {1} with no analyzer on field {2} because another member defines the same index with analyzer {3} on that field.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD = new StringId(6630, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with no analyzer on that field.");
+  public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD = new StringId(6631, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with analyzer {4} on that field.");
 
   /** Testing strings, messageId 90000-99999 **/
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index d2204a0..cd659e6 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -285,12 +285,12 @@ fromData,16,2a2bb700172a2bb900180100b50008b1
 toData,16,2a2bb700192b2ab40008b9001a0200b1
 
 com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember,6
-fromData,33,2a2bb6009a2ab4001ab20090b60070a100112ab400282bb900910200a700044db1
-fromDataPre_GFE_7_1_0_0,292,2bb8009b4d2bb9009c01003e2a2bb80088b500062ab2000399000e2c2ab40006b8009da700072cb60007b500062bb9009e010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500392a2bb9009c0100b500102a2bb9009c0100b500022a2bb9009e0100b500122a2bb8008ab5001f2a2bb80088b500172ab40012100da0000e2a2bb80088b50018a700172bb800883a071907c6000c2a1907b8009fb500132bb800883a072bb8008bb6008c36082abb008d5919071508b7008eb5001dbb0033592ab400102ab400022ab400122ab400132ab400172ab4001f2ab4001db700343a092a2c1d150515062bb800a0b600701909b80027b500282ab7000b2ab400129e000704a7000403b80042b1
-fromDataPre_GFE_9_0_0_0,296,2bb8009b4d2bb9009c01003e2a2bb80088b500062ab2000399000e2c2ab40006b8009da700072cb60007b500062bb9009e010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500392a2bb9009c0100b500102a2bb9009c0100b500022a2bb9009e0100b500122a2bb8008ab5001f2a2bb80088b500172ab40012100da0000e2a2bb80088b50018a700172bb800883a071907c6000c2a1907b8009fb500132bb800883a072bb8008bb6008c36082abb008d5919071508b7008eb5001d2a15042bb7008fbb0033592ab400102ab400022ab400122ab400132ab400172ab4001f2ab4001db700343a092a2c1d150515062ab4001a1909b80027b500282ab7000b2ab400129e000704a7000403b80042b1
-toData,29,2a2bb600942ab4001ab20090b60070a1000d2ab600952bb900840200b1
-toDataPre_GFE_7_1_0_0,226,2ab400129e000704a7000403b800422ab6004e2bb800962b2ab6004db9009702002ab400062bb8007b033d2ab40028b9007c01009900071c04803d2ab40028b9006b01009900071c05803d2ab400399900071c07803d2b1c1100ff7e91b9009802002b2ab40010b9009702002b2ab40002b9009702002b2ab40012b9009802002ab4001f2bb8007e2ab400172bb8007b2ab40012100da0000e2ab400182bb8007ba7000e2ab40013b800992bb8007b2ab4001dc700081246a7000a2ab4001db6007f2bb8007b2ab4001dc7000911012ca7000a2ab4001db60080b800812bb80082b1
-toDataPre_GFE_9_0_0_0,240,2ab400129e000704a7000403b800422ab6004e2bb800962b2ab6004db9009702002ab400062bb8007b033d2ab40028b9007c01009900071c04803d2ab40028b9006b01009900071c05803d2ab400399900071c07803d1c1008803d2b1c1100ff7e91b9009802002b2ab40010b9009702002b2ab40002b9009702002b2ab40012b9009802002ab4001f2bb8007e2ab400172bb8007b2ab40012100da0000e2ab400182bb8007ba7000e2ab40013b800992bb8007b2ab4001dc700081246a7000a2ab4001db6007f2bb8007b2ab4001dc7000911012ca7000a2ab4001db60080b800812bb800822b2ab4001a04b80083b1
+fromData,33,2a2bb6009b2ab4001bb20091b60071a100112ab400292bb900920200a700044db1
+fromDataPre_GFE_7_1_0_0,292,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001ebb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062bb800a1b600711909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+fromDataPre_GFE_9_0_0_0,296,2bb8009c4d2bb9009d01003e2a2bb80089b500062ab2000399000e2c2ab40006b8009ea700072cb60007b500062bb9009f010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2a2bb9009d0100b500112a2bb9009d0100b500022a2bb9009f0100b500132a2bb8008bb500202a2bb80089b500182ab40013100da0000e2a2bb80089b50019a700172bb800893a071907c6000c2a1907b800a0b500142bb800893a072bb8008cb6008d36082abb008e5919071508b7008fb5001e2a15042bb70090bb0034592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700353a092a2c1d150515062ab4001b1909b80028b500292ab7000b2ab400139e000704a7000403b80043b1
+toData,29,2a2bb600952ab4001bb20091b60071a1000d2ab600962bb900850200b1
+toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb80083b1
+toDataPre_GFE_9_0_0_0,240,2ab400139e000704a7000403b800432ab6004f2bb800972b2ab6004eb9009802002ab400062bb8007c033d2ab40029b9007d01009900071c04803d2ab40029b9006c01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009902002b2ab40011b9009802002b2ab40002b9009802002b2ab40013b9009902002ab400202bb8007f2ab400182bb8007c2ab40013100da0000e2ab400192bb8007ca7000e2ab40014b8009a2bb8007c2ab4001ec700081247a7000a2ab4001eb600802bb8007c2ab4001ec7000911012ca7000a2ab4001eb60081b800822bb800832b2ab4001b04b80084b1
 
 com/gemstone/gemfire/distributed/internal/membership/NetView,2
 fromData,69,2a2bb8005bc00023b5000e2a2bb9005c0100b500032a2bb8005db500062abb0007592ab40006b70008b500092a2bb8005eb5000b2a2bb8005eb5000d2a2bb8005fb50002b1
@@ -687,8 +687,8 @@ fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb90
 toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1
 
 com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo,2
-fromData,106,2a2bb8002fb500032a2bb900300100b500052a2bb900310100b500072a2bb900300100b500092a2bb900300100b5000b2a2bb900300100b5000d2a2bb900300100b5000f2a2bb80032b500102a2bb80033c0001fb500112a2bb80034b500122a2bb900310100b50028b1
-toData,103,2ab400032bb800292b2ab40005b9002a02002b2ab40007b9002b02002b2ab40009b9002a02002b2ab4000bb9002a02002b2ab4000db9002a02002b2ab4000fb9002a02002ab400102bb8002c2ab400112bb8002d2ab400122bb8002e2b2ab40028b9002b0200b1
+fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1
+toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1
 
 com/gemstone/gemfire/internal/admin/remote/RemoteCacheStatistics,2
 fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1
@@ -747,8 +747,8 @@ fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
 
 com/gemstone/gemfire/internal/admin/remote/RootRegionResponse,2
-fromData,34,2a2bb700222a2bb80023c00018c00018b500192a2bb80023c00018c00018b5001ab1
-toData,22,2a2bb700202ab400192bb800212ab4001a2bb80021b1
+fromData,34,2a2bb700232a2bb80024c00019c00019b5001a2a2bb80024c00019c00019b5001bb1
+toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
 
 com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
 fromData,16,2a2bb700072a2bb900080100b50005b1
@@ -871,8 +871,8 @@ fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb600
 toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
 
 com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor$CacheProfile,2
-fromData,94,2a2bb700662bb9006701003d2a1cb6001c2a1cb700689900162abb006959b7006ab500272ab400272bb8006b2a1cb7006c99000e2a2bb8006dc0006eb5000e2a1cb7006f99000e2a2bb8006dc0006eb5000f2a2bb8006dc00070b50017b1
-toData,81,2a2bb7005e2b2ab6001bb9005f02002ab40027c6000b2ab400272bb800602ab4000eb9002d01009a000c2a2ab4000e2bb700612ab4000fb9002d01009a000c2a2ab4000f2bb700612ab400172bb80062b1
+fromData,113,2a2bb7006c2bb9006d01003d2a1cb6001f2a1cb7006e9900162abb006f59b70070b5002a2ab4002a2bb800712a1cb7007299000e2a2bb80073c00074b5000e2a1cb7007599000e2a2bb80073c00074b5000f2a2bb80073c00076b5001a2a1cb7007799000e2a2bb80073c00078b50019b1
+toData,101,2a2bb700642b2ab6001eb9006502002ab4002ac6000b2ab4002a2bb800662ab4000eb9003001009a000c2a2ab4000e2bb700672ab4000fb9003001009a000c2a2ab4000f2bb700672ab4001a2bb800682ab40019b9003401009a000b2ab400192bb80068b1
 
 com/gemstone/gemfire/internal/cache/CacheServerAdvisor$CacheServerProfile,2
 fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
@@ -891,8 +891,8 @@ fromData,6,2a2bb70007b1
 toData,6,2a2bb70006b1
 
 com/gemstone/gemfire/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
-fromData,45,2a2bb7008c2a2bb8008db5000a2a2bb8008ec00055b500432a2bb9008f0100b500032a2bb900900100b50064b1
-toData,42,2a2bb700922ab4000a2bb800932ab400432bb800942b2ab40003b9009502002b2ab40064b900960200b1
+fromData,45,2a2bb700942a2bb80095b5000a2a2bb80096c00055b500432a2bb900970100b500032a2bb900980100b50064b1
+toData,42,2a2bb7009a2ab4000a2bb8009b2ab400432bb8009c2b2ab40003b9009d02002b2ab40064b9009e0200b1
 
 com/gemstone/gemfire/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
 fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1
@@ -947,8 +947,8 @@ fromData,14,2a2bb7001a2a2bb8001bb50004b1
 toData,14,2a2bb700182ab400042bb80019b1
 
 com/gemstone/gemfire/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
-fromData,318,2bb9009501003d2bb9009501003e2a1cb500962a1c2bb600972a2bb80098b500232a2bb900990100b8009ab500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009bb500882a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001d2ab4001d9900382bb900990100360415049a000b2a03b5001ea7001b150404a0000b2a04b5001ea7000dbb009c59129db7009ebf2a2bb8009fb5001f1c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a015049900162abb00a159b700a2b5000e2ab4000e2bb800a31c1110007e99001c1c1120007e99000704a700040336052a15052bb800a4b5000a1d1104007e9900232a04b5000f2ac100a59900172ac000a51d1101007e99000704a7000403b600a6b1
-toData,202,033d033e2a1cb600a73d2a1db600a83e2b1cb900a902002b1db900a902002ab4000d9e000d2b2ab4000db900aa02002ab400232bb800ab2b2ab40009b400acb900ad02002ab40088c6000b2ab400882bb800ae2ab4001d9900542b2ab4001e99000704a7000403b900ad02002ab4001eb800af36042ab4001e9a001f2ab4001fc10020990015013a052ab4001fc00020c000203a06a7000c2ab4001f3a05013a061504190519062bb800b02ab4000ec6000b2ab4000e2bb800b12ab4000ac6000b2ab4000a2bb800b1b1
+fromData,318,2bb9009301003d2bb9009301003e2a1cb500942a1c2bb600952a2bb80096b500212a2bb900970100b80098b500072a1c1100807e99000704a7000403b500022a1c10087e99000704a7000403b500561c1102007e99000b2a2bb8009ab500862a1c1104007e99000704a7000403b500052a1c10407e99000704a7000403b5001b2ab4001b9900382bb900970100360415049a000b2a03b5001ca7001b150404a0000b2a04b5001ca7000dbb009b59129cb7009dbf2a2bb8009eb5001d1c1101007e99000704a700040336042a1c1108007e99000704a7000403b5009f15049900162abb00a059b700a1b5000c2ab4000c2bb800a21c1110007e99001c1c1120007e99000704a700040336052a15052bb800a3b500081d1104007e9900232a04b5000d2ac100a49900172ac000a41d1101007e99000704a7000403b600a5b1
+toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000b9e000d2b2ab4000bb900a902002ab400212bb800aa2b2ab40007b400abb900ac02002ab40086c6000b2ab400862bb800ad2ab4001b9900542b2ab4001c99000704a7000403b900ac02002ab4001cb800ae36042ab4001c9a001f2ab4001dc1001e990015013a052ab4001dc0001ec0001e3a06a7000c2ab4001d3a05013a061504190519062bb800af2ab4000cc6000b2ab4000c2bb800b02ab40008c6000b2ab400082bb800b0b1
 
 com/gemstone/gemfire/internal/cache/DistributedClearOperation$ClearRegionMessage,2
 fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
@@ -966,19 +966,19 @@ com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
 toData,236,2ab4000a4e2ab4000c3a042d2bb8003d1904c1003e9a00081904c700192b03b9003f02001904c0003ec0003e2bb80040a700341904c1004199001f1904c000413a052b04b9003f02001905b9004201002bb80040a700102b04b9003f020019042bb800432b2ab40012b40044b9003f02002ab4000636052ab40026c6000a150507809136052ab40017c6001d15051008809136052ab40017c1004599000b150510208091360515051080809136052b1505b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
 
 com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllMessage,2
-fromData,197,2a2bb7003e2a2bb8003fc00040b500072a2bb8004188b500172a2ab40017bd0042b500082ab400179e00722bb800434dbb004459b700454e03360415042ab40017a200202ab400081504bb0042592b2ab4000715042c2db7004653840401a7ffdd2bb9004701003604150499002f2bb800483a0503360615062ab40017a2001d2ab4000815063219051506b60049c0004ab50030840601a7ffe02ab4004b1140007e99000e2a2bb8003fc0004cb5000d2a2ab4004b1180007e99000704a7000403b5001cb1
-toData,181,2a2bb7004d2ab400072bb8004e2ab40017852bb8004f2ab400179e008bbb0050592ab40017b700514d033e2ab400080332b40052c10026360403360515052ab40017a200531d9a00122ab40008150532b40030c60005043e2ab40008150532b400303a062c1906b60053572ab4000815053201b500302ab400081505322b1504b600542ab400081505321906b50030840501a7ffaa2b1db9005502001d9900082c2bb800562ab4000dc6000b2ab4000d2bb8004eb1
+fromData,197,2a2bb7003c2a2bb8003dc0003eb500052a2bb8003f88b500152a2ab40015bd0040b500062ab400159e00722bb800414dbb004259b700434e03360415042ab40015a200202ab400061504bb0040592b2ab4000515042c2db7004453840401a7ffdd2bb9004501003604150499002f2bb800463a0503360615062ab40015a2001d2ab4000615063219051506b60047c00048b5002e840601a7ffe02ab400491140007e99000e2a2bb8003dc0004bb5000b2a2ab400491180007e99000704a7000403b5001ab1
+toData,181,2a2bb7004c2ab400052bb8004d2ab40015852bb8004e2ab400159e008bbb004f592ab40015b700504d033e2ab400060332b40051c10024360403360515052ab40015a200531d9a00122ab40006150532b4002ec60005043e2ab40006150532b4002e3a062c1906b60052572ab4000615053201b5002e2ab400061505322b1504b600532ab400061505321906b5002e840501a7ffaa2b1db9005402001d9900082c2bb800552ab4000bc6000b2ab4000b2bb8004db1
 
 com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
-fromData,171,2a2bb700622bb9006301003d1c047e9900142a2bb900640100b500092ab40009b800651c077e99000d2a2bb900640100b500061c057e99000e2a2bb80066c00067b500072bb800664e2dc100689900252a03b5000e2a2dc00068b80069b500082ab40008c7001b2a2dc00068b5004da700102a2dc0006ab500082a04b5000e2a2bb80066c0006bb5000a2a2bb8006cb5000c2a2bb8006db5000b2a1c10407e99000704a7000403b5000db1
-toData,173,2a2bb7006f033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007002002ab4000999000d2b2ab40009b9007102002ab40006029f000d2b2ab40006b9007102002ab40007c6000b2ab400072bb800722ab4000e99000e2ab400082bb80072a700102ab40008b9005801002bb800722ab4000a2bb800722ab4000cc000732bb800742ab4000b2bb80075b1
+fromData,171,2a2bb700612bb9006201003d1c047e9900142a2bb900640100b500082ab40008b800651c077e99000d2a2bb900640100b500051c057e99000e2a2bb80066c00067b500062bb800664e2dc100689900252a03b5000d2a2dc00068b80069b500072ab40007c7001b2a2dc00068b5004ca700102a2dc0006ab500072a04b5000d2a2bb80066c0006bb500092a2bb8006cb5000b2a2bb8006db5000a2a1c10407e99000704a7000403b5000cb1
+toData,173,2a2bb7006f033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000c9900091c104080933d2b1cb9007002002ab4000899000d2b2ab40008b9007102002ab40005029f000d2b2ab40005b9007102002ab40006c6000b2ab400062bb800722ab4000d99000e2ab400072bb80072a700102ab40007b9005701002bb800722ab400092bb800722ab4000bc000732bb800742ab4000a2bb80075b1
 
 com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
 toData,146,2ab4000a4e2d2bb8003f2b2ab40010b40040b9004102002ab4000636042ab40022c6000a150407809136042ab40015c6001d15041008809136042ab40015c1004299000b150410208091360415041080809136042b1504b9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
 
 com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
-fromData,197,2a2bb7003a2a2bb8003bc0003cb500052a2bb8003d88b500152a2ab40015bd003eb500062ab400159e00722bb8003f4dbb004059b700414e03360415042ab40015a200202ab400061504bb003e592b2ab4000515042c2db7004253840401a7ffdd2bb9004301003604150499002f2bb800443a0503360615062ab40015a2001d2ab4000615063219051506b60045c00046b5002d840601a7ffe02ab400471140007e99000e2a2bb8003bc00048b5000b2a2ab400471180007e99000704a7000403b5001ab1
-toData,181,2a2bb700492ab400052bb8004a2ab40015852bb8004b2ab400159e008bbb004c592ab40015b7004d4d033e2ab400060332b4004ec10028360403360515052ab40015a200531d9a00122ab40006150532b4002dc60005043e2ab40006150532b4002d3a062c1906b6004f572ab4000615053201b5002d2ab400061505322b1504b600502ab400061505321906b5002d840501a7ffaa2b1db9005102001d9900082c2bb800522ab4000bc6000b2ab4000b2bb8004ab1
+fromData,197,2a2bb700382a2bb80039c0003ab500032a2bb8003b88b500132a2ab40013bd003cb500042ab400139e00722bb8003d4dbb003e59b7003f4e03360415042ab40013a200202ab400041504bb003c592b2ab4000315042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40013a2001d2ab4000415063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00047b500092a2ab400451180007e99000704a7000403b50018b1
+toData,181,2a2bb700482ab400032bb800492ab40013852bb8004a2ab400139e008bbb004b592ab40013b7004c4d033e2ab400040332b4004dc10026360403360515052ab40013a200531d9a00122ab40004150532b4002bc60005043e2ab40004150532b4002b3a062c1906b6004e572ab4000415053201b5002b2ab400041505322b1504b6004f2ab400041505321906b5002b840501a7ffaa2b1db9005002001d9900082c2bb800512ab40009c6000b2ab400092bb80049b1
 
 com/gemstone/gemfire/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
 fromData,125,2a2bb700162ab800172bb90018010032b500192bb9001a01003d2abb001b591cb7001cb500112bb9001d01003e03360415041ca2003e1d990019bb001e59b7001f3a0619062bb8002019063a05a700092bb800213a052ab4001119052bb900220100b80023b90024030057840401a7ffc22a2bb80025c00026b50003b1
@@ -989,8 +989,8 @@ fromData,17,2a2bb80005b500022a2bb80005b50003b1
 toData,17,2ab400022bb800042ab400032bb80004b1
 
 com/gemstone/gemfire/internal/cache/EntryEventImpl,2
-fromData,214,2a2bb8001bc0001cb5001d2bb8001b4d2bb8001b4e2abb001e592c2d01b7001fb500202a2bb900210100b80022b500232a2bb900240100b500092ab400202bb8001bb600252a2bb8001bc00026b5000a2bb9002701009900112a2bb8001bc00028b50008a700322bb9002701009900212a2bb80029b5002a2a2ab4002ab500062a2ab4002ab8002bb50005a7000b2a2bb8001bb500052bb9002701009900192a2bb80029b5002c2a2ab4002cb8002bb50007a7000b2a2bb8001bb500072a2bb8002db5002e2a2bb8002fb5000b2a2bb80030b50014b1
-toData,312,2ab4001d2bb801602ab6008c2bb801602ab40020b6018d2bb801602b2ab40023b4018eb9018f02002b2ab4000911c03f7eb9019002002ab6004b2bb801602ab4000a2bb801602ab40008c6000704a70004033d2b1cb9019102001c99000e2ab400082bb80160a700682ab600414e2dc100823604150499000e2dc00082b900b8010036042b1504b901910200150499003b2ab4002ac6000e2ab4002a2bb80192a7002e2ab40006c6000e2ab400062bb80192a7001c2dc000823a051905b900c601002bb80193a700082d2bb801602ab700434d2cc100823e1d99000d2cc00082b900b801003e2b1db9019102001d9900292ab4002cc6000e2ab4002c2bb80192a7001c2cc000823a041904b900c601002bb80193a700082c2bb801602ab4002ec001942bb801952ab600582bb801602ab400142bb80196b1
+fromData,214,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500092ab4001b2bb80016b600202a2bb80016c00021b5000a2bb9002201009900112a2bb80016c00023b50008a700322bb9002201009900212a2bb80024b500252a2ab40025b500062a2ab40025b80026b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80024b500272a2ab40027b80026b50007a7000b2a2bb80016b500072a2bb80028b500292a2bb8002ab5000b2a2bb8002bb50014b1
+toData,312,2ab400182bb8015a2ab600882bb8015a2ab4001bb601872bb8015a2b2ab4001eb40188b9018902002b2ab4000911c03f7eb9018a02002ab600462bb8015a2ab4000a2bb8015a2ab40008c6000704a70004033d2b1cb9018b02001c99000e2ab400082bb8015aa700682ab6003c4e2dc1007e3604150499000e2dc0007eb900b4010036042b1504b9018b0200150499003b2ab40025c6000e2ab400252bb8018ca7002e2ab40006c6000e2ab400062bb8018ca7001c2dc0007e3a051905b900c201002bb8018da700082d2bb8015a2ab7003e4d2cc1007e3e1d99000d2cc0007eb900b401003e2b1db9018b02001d9900292ab40027c6000e2ab400272bb8018ca7001c2cc0007e3a041904b900c201002bb8018da700082c2bb8015a2ab40029c0018e2bb8018f2ab600542bb8015a2ab400142bb80190b1
 
 com/gemstone/gemfire/internal/cache/EntrySnapshot,2
 fromData,50,2a03b500052bb9004101003d1c9900112abb000759b70042b50004a7000e2abb000359b70043b500042ab400042bb60044b1
@@ -1063,8 +1063,8 @@ fromData,64,2a2bb700112a2bb900120100b5000c2a2bb900130100b5000d2a2bb900120100b500
 toData,90,2a2bb700192b2ab4000cb9001a02002b2ab4000db9001b02002b2ab40004b9001a02002ab4000e2bb8001ca7002e4d2cc1001d99000cbb001e592cb7001fbfbb0016592ab4000eb60020b60021b700224e2d2cb60018572dbfb1
 
 com/gemstone/gemfire/internal/cache/GridAdvisor$GridProfile,2
-fromData,26,2a2bb7001f2a2bb80020b500052a2bb80021b500062ab60007b1
-toData,22,2a2bb7001c2ab400052bb8001d2ab400062bb8001eb1
+fromData,26,2a2bb7001e2a2bb8001fb500052a2bb80020b500062ab60007b1
+toData,22,2a2bb7001b2ab400052bb8001c2ab400062bb8001db1
 
 com/gemstone/gemfire/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
 fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1
@@ -1139,8 +1139,8 @@ fromData,26,2a2bb700242a2bb900250100b500042a2bb900250100b50002b1
 toData,26,2a2bb700222b2ab40004b9002302002b2ab40002b900230200b1
 
 com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage,2
-fromData,163,2a2bb700512bb9005201003d1c047e9900142a2bb900530100b500082ab40008b800541c077e99000d2a2bb900530100b500051c057e99000e2a2bb80055c00056b500062bb800554e2dc1002a9900252a03b5000a2a2dc0002ab80057b500072ab40007c7001b2a2dc0002ab5001aa700102a2dc00058b500072a04b5000a2a2bb80055b500092a2bb80055c00059b500102a1c10407e99000704a7000403b5000bb1
-toData,162,2a2bb7005b033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005c02002ab4000899000d2b2ab40008b9005d02002ab40005029f000d2b2ab40005b9005d02002ab40006c6000b2ab400062bb8005e2ab4000a99000e2ab400072bb8005ea700102ab40007b9001f01002bb8005e2ab400092bb8005e2ab400102bb8005eb1
+fromData,163,2a2bb700502bb9005101003d1c047e9900142a2bb900530100b500072ab40007b800541c077e99000d2a2bb900530100b500041c057e99000e2a2bb80055c00056b500052bb800554e2dc100299900252a03b500092a2dc00029b80057b500062ab40006c7001b2a2dc00029b50019a700102a2dc00058b500062a04b500092a2bb80055b500082a2bb80055c00059b5000f2a1c10407e99000704a7000403b5000ab1
+toData,162,2a2bb7005b033d2ab400079900081c0480933d2ab40004029f00081c0780933d2ab40005c600081c0580933d2ab4000a9900091c104080933d2b1cb9005c02002ab4000799000d2b2ab40007b9005d02002ab40004029f000d2b2ab40004b9005d02002ab40005c6000b2ab400052bb8005e2ab4000999000e2ab400062bb8005ea700102ab40006b9001e01002bb8005e2ab400082bb8005e2ab4000f2bb8005eb1
 
 com/gemstone/gemfire/internal/cache/Node,2
 fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1
@@ -1171,8 +1171,8 @@ fromData,145,2a2bb80032b500032a2bb80032b500052a2bb80032b500072a2bb80032b500092a2
 toData,145,2ab400032bb8002d2ab400052bb8002d2ab400072bb8002d2ab400092bb8002d2ab4000a2bb8002d2ab4000b2bb8002d2ab4000f2bb8002d2ab4000e2bb8002e2ab400122bb8002e2ab400162bb8002d2ab400182bb8002d2ab400082bb8002f2ab400142bb8002f2ab4001b2bb800302ab4001f2bb800312ab400202bb800312ab400132bb8002d2ab4001c2bb8002fb1
 
 com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable,2
-fromData,9,2a2bb8000fb50003b1
-toData,9,2ab400032bb80010b1
+fromData,9,2a2bb8000eb50002b1
+toData,9,2ab400022bb8000fb1
 
 com/gemstone/gemfire/internal/cache/QueuedOperation,1
 toData,97,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900442ab400032bb800372ab40002b600169a000d2ab40002b600159900282b2ab40006b9003602002ab40006049f000e2ab400042bb80038a7000b2ab400052bb80037b1
@@ -1186,16 +1186,16 @@ fromData,24,2a2bb700222a2bb80023b500022a2bb900240100b50003b1
 toData,24,2a2bb700252ab400022bb800262b2ab40003b900270200b1
 
 com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage,2
-fromData,33,2a2bb700312a2bb80032b500062a2ab4003310407e99000704a7000403b50005b1
-toData,14,2a2bb700342ab400062bb80035b1
+fromData,33,2a2bb700302a2bb80031b500052a2ab4003210407e99000704a7000403b50004b1
+toData,14,2a2bb700332ab400052bb80034b1
 
 com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2
 fromData,16,2a2bb700152a2bb900160100b50003b1
 toData,16,2a2bb700172b2ab40003b900180200b1
 
 com/gemstone/gemfire/internal/cache/RemoteDestroyMessage,2
-fromData,131,2a2bb7008b2a2bb8008cb7008d2a2bb8008cb5000c2a2bb9008e0100b8008fb5000e2ab400901102007e99000e2a2bb8008cc00091b500102ab400901104007e99000e2a2bb8008cc00034b500662a2bb8008cc00092b500122ab400059900122bb9008e0100572a2bb80093b700222a2bb8008cb500082a2bb8008cc00094b50017b1
-toData,135,2a2bb700952ab6006c2bb800962ab4000c2bb800962b2ab4000eb40097b9009802002ab40010c6000b2ab400102bb800962ab40066c6000b2ab400662bb800962ab400122bb800962ab4000599002a2b2ab4000699000704a7000403b9009802002ab40006b800993d1c2ab7009a2ab600702bb8009b2ab400082bb800962ab400172bb80096b1
+fromData,131,2a2bb7008b2a2bb8008cb7008d2a2bb8008cb5000a2a2bb9008e0100b8008fb5000c2ab400901102007e99000e2a2bb8008cc00091b5000e2ab400901104007e99000e2a2bb8008cc00033b500662a2bb8008cc00092b500102ab400039900122bb9008e0100572a2bb80093b700202a2bb8008cb500062a2bb8008cc00094b50015b1
+toData,135,2a2bb700952ab6006c2bb800962ab4000a2bb800962b2ab4000cb40097b9009802002ab4000ec6000b2ab4000e2bb800962ab40066c6000b2ab400662bb800962ab400102bb800962ab4000399002a2b2ab4000499000704a7000403b9009802002ab40004b800993d1c2ab7009a2ab600702bb8009b2ab400062bb800962ab400152bb80096b1
 
 com/gemstone/gemfire/internal/cache/RemoteDestroyMessage$DestroyReplyMessage,2
 fromData,52,2a2bb700232bb9002401003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80025b50009b1
@@ -1230,20 +1230,20 @@ fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a70004
 toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1
 
 com/gemstone/gemfire/internal/cache/RemoteOperationMessage,2
-fromData,43,2a2bb700542a2bb900550100b500562a2ab400562bb600572a2bb80058b5000a2a2bb900590100b50006b1
-toData,103,2a2bb7005a2ab6005b3d2b1cb9005c02002ab4000c99000d2b2ab4000cb9005d02002ab4005e99000d2b2ab4005eb9005f02002ab60015029f000d2b2ab60015b9005d02002ab60016c6000b2ab600162bb800602ab4000a2bb800612b2ab40006b900620200b1
+fromData,43,2a2bb7005c2a2bb9005d0100b5005e2a2ab4005e2bb6005f2a2bb80060b5000a2a2bb900610100b50006b1
+toData,103,2a2bb700622ab600633d2b1cb9006402002ab4000c99000d2b2ab4000cb9006502002ab4006699000d2b2ab40066b9006702002ab60015029f000d2b2ab60015b9006502002ab60016c6000b2ab600162bb800682ab4000a2bb800692b2ab40006b9006a0200b1
 
 com/gemstone/gemfire/internal/cache/RemotePutAllMessage,2
-fromData,243,2a2bb700522a2bb80053c00054b500392a2bb80053b5003b2a2ab4005510087e99000704a7000403b500062ab4005510407e99000e2a2bb80053c00056b500502a2ab400551100807e99000704a7000403b500052a2ab400551101007e99000704a7000403b500042a2bb8005788b500082a2ab40008bd0058b500072ab400089e00722bb800594dbb005a59b7005b4e03360415042ab40008a200202ab400071504bb0058592b2ab4003915042c2db7005c53840401a7ffdd2bb9005d01003604150499002f2bb8005e3a0503360615062ab40008a2001d2ab4000715063219051506b6005fc00020b50021840601a7ffe0b1
-toData,189,2a2bb700602ab400392bb800612ab4003b2bb800612ab40050c6000b2ab400502bb800612ab40008852bb800622ab400089e008bbb0063592ab40008b700644d033e2ab400070332b40065c10066360403360515052ab40008a200531d9a00122ab40007150532b40021c60005043e2ab40007150532b400213a062c1906b60067572ab4000715053201b500212ab400071505322b1504b600682ab400071505321906b50021840501a7ffaa2b1db9006902001d9900082c2bb8006ab1
+fromData,243,2a2bb700512a2bb80052c00053b500372a2bb80052b500392a2ab4005410087e99000704a7000403b500042ab4005410407e99000e2a2bb80052c00056b5004f2a2ab400541100807e99000704a7000403b500032a2ab400541101007e99000704a7000403b500022a2bb8005788b500062a2ab40006bd0058b500052ab400069e00722bb800594dbb005a59b7005b4e03360415042ab40006a200202ab400051504bb0058592b2ab4003715042c2db7005c53840401a7ffdd2bb9005d01003604150499002f2bb8005e3a0503360615062ab40006a2001d2ab4000515063219051506b6005fc0001eb5001f840601a7ffe0b1
+toData,189,2a2bb700602ab400372bb800612ab400392bb800612ab4004fc6000b2ab4004f2bb800612ab40006852bb800622ab400069e008bbb0063592ab40006b700644d033e2ab400050332b40065c10066360403360515052ab40006a200531d9a00122ab40005150532b4001fc60005043e2ab40005150532b4001f3a062c1906b60067572ab4000515053201b5001f2ab400051505322b1504b600682ab400051505321906b5001f840501a7ffaa2b1db9006902001d9900082c2bb8006ab1
 
 com/gemstone/gemfire/internal/cache/RemotePutAllMessage$PutAllReplyMessage,2
 fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
 toData,14,2a2bb7001d2ab400012bb8001eb1
 
 com/gemstone/gemfire/internal/cache/RemotePutMessage,2
-fromData,242,2a2bb700752a2bb80076b600772bb9007801003d2a1cb200797e91b500072a2bb80076b500222a2bb9007a0100b500232a2bb9007b0100b8007cb500251cb2007d7e99000e2a2bb80076c0007eb500271cb2007f7e99000e2a2bb80076c00041b500802abb008159b70082b500292ab400292bb800832ab400841120007e99000b2a2bb80076b500112ab4000a99001e2a2bb9007b010004a0000704a7000403b500082a2bb80085b700862ab4000704a0000e2a2bb80076b70087a7000b2a2bb80085b700882ab400841104007e9900102a04b5000c2a2bb80085b500891cb2008a7e99000e2a2bb80076c0008bb5002eb1
-toData,252,2a03b5000b2a2bb7008d2ab6008e2bb8008f2ab400073d2ab40027c600091cb2007d803d2ab40080c600091cb2007f803d2ab4002ec600091cb2008a803d2b1cb9009002002ab600912bb8008f2b2ab40023b9009203002b2ab40025b40093b9009002002ab40027c6000b2ab400272bb8008f2ab40080c6000b2ab400802bb8008f2ab400292bb800942ab40011c6000b2ab400112bb8008f2ab4000a99002a2b2ab4000899000704a7000403b9009002002ab40008b800953e1d2ab700962ab600972bb800982ab400072ab400722ab600992bb800982ab4000eb6009ac6000e2ab4000eb6009a2bb8009b2ab4002ec6000b2ab4002e2bb8008fb1
+fromData,242,2a2bb700742a2bb80075b600762bb9007701003d2a1cb200787e91b500052a2bb80075b500202a2bb900790100b500212a2bb9007a0100b8007bb500231cb2007c7e99000e2a2bb80075c0007db500251cb2007e7e99000e2a2bb80075c0003fb5007f2abb008059b70081b500272ab400272bb800822ab400831120007e99000b2a2bb80075b5000f2ab4000899001e2a2bb9007a010004a0000704a7000403b500062a2bb80084b700852ab4000504a0000e2a2bb80075b70086a7000b2a2bb80084b700872ab400831104007e9900102a04b5000a2a2bb80084b500881cb200897e99000e2a2bb80075c0008ab5002cb1
+toData,252,2a03b500092a2bb7008c2ab6008d2bb8008e2ab400053d2ab40025c600091cb2007c803d2ab4007fc600091cb2007e803d2ab4002cc600091cb20089803d2b1cb9008f02002ab600902bb8008e2b2ab40021b9009103002b2ab40023b40092b9008f02002ab40025c6000b2ab400252bb8008e2ab4007fc6000b2ab4007f2bb8008e2ab400272bb800932ab4000fc6000b2ab4000f2bb8008e2ab4000899002a2b2ab4000699000704a7000403b9008f02002ab40006b800943e1d2ab700952ab600962bb800972ab400052ab400712ab600982bb800972ab4000cb60099c6000e2ab4000cb600992bb8009a2ab4002cc6000b2ab4002c2bb8008eb1
 
 com/gemstone/gemfire/internal/cache/RemotePutMessage$PutReplyMessage,2
 fromData,81,2a2bb700262bb9002701001100ff7e913d2a1c047e99000704a7000403b500032a2bb900270100b80028b500022a2bb80029b500061c057e9900181c077e99000704a70004033e2a1d2bb8002ab50007b1
@@ -1258,8 +1258,8 @@ fromData,6,2a2bb70014b1
 toData,6,2a2bb70015b1
 
 com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage,2
-fromData,203,2a2bb7004e2a2bb8004fc00050b500362a2bb8004fb500382a2ab4005110087e99000704a7000403b500032ab4005110407e99000e2a2bb8004fc00052b5004c2a2bb8005388b500052a2ab40005bd0054b500042ab400059e00722bb800554dbb005659b700574e03360415042ab40005a200202ab400041504bb0054592b2ab4003615042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40005a2001d2ab4000415063219051506b6005bc0001db5001e840601a7ffe0b1
-toData,189,2a2bb7005c2ab400362bb8005d2ab400382bb8005d2ab4004cc6000b2ab4004c2bb8005d2ab40005852bb8005e2ab400059e008bbb005f592ab40005b700604d033e2ab400040332b40061c10062360403360515052ab40005a200531d9a00122ab40004150532b4001ec60005043e2ab40004150532b4001e3a062c1906b60063572ab4000415053201b5001e2ab400041505322b1504b600642ab400041505321906b5001e840501a7ffaa2b1db9006502001d9900082c2bb80066b1
+fromData,203,2a2bb7004d2a2bb8004ec0004fb500352a2bb8004eb500372a2ab4005010087e99000704a7000403b500022ab4005010407e99000e2a2bb8004ec00052b5004b2a2bb8005388b500042a2ab40004bd0054b500032ab400049e00722bb800554dbb005659b700574e03360415042ab40004a200202ab400031504bb0054592b2ab4003515042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40004a2001d2ab4000315063219051506b6005bc0001cb5001d840601a7ffe0b1
+toData,189,2a2bb7005c2ab400352bb8005d2ab400372bb8005d2ab4004bc6000b2ab4004b2bb8005d2ab40004852bb8005e2ab400049e008bbb005f592ab40004b700604d033e2ab400030332b40061c10062360403360515052ab40004a200531d9a00122ab40003150532b4001dc60005043e2ab40003150532b4001d3a062c1906b60063572ab4000315053201b5001d2ab400031505322b1504b600642ab400031505321906b5001d840501a7ffaa2b1db9006502001d9900082c2bb80066b1
 
 com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage$RemoveAllReplyMessage,2
 fromData,17,2a2bb7001a2a2bb8001bc0001cb50001b1
@@ -1282,8 +1282,8 @@ fromData,131,2a2bb700252a2bb900260100b500072a2bb80027b500082ab40008c6000c2a2ab40
 toData,145,2a2bb7001d2b2ab40007b9001e02002ab40009c6000e2ab400092bb8001fa7000f2ab400082ab4000a2bb800202b2ab4000bb900210300033d2ab4000c9900081c0480913d2ab4000d9900081c0580913d2ab4000e9900081c0780913d2ab4000fc600091c100880913d2ab4000fc100229900091c101080913d2b1cb9002302002ab4000fc6000b2ab4000f2bb80024b1
 
 com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$NetSearchRequestMessage,2
-fromData,97,2a2bb7001c2bb9001d01003d1c047e9900142a2bb9001e0100b5000b2ab4000bb8001f2a2bb900200100b5000c2a2bb80021b5000d2a2bb9001e0100b5000e1c10407e99000c2a2bb8002288b5000f1c1100807e99000c2a2bb8002288b50010b1
-toData,131,2a2bb70016033d2ab4000b9900081c0480933d2ab4000f9900091c104080933d2ab4001099000a1c11008080933d2b1cb9001702002ab4000b99000d2b2ab4000bb9001802002b2ab4000cb9001902002ab4000d2bb8001a2b2ab4000eb9001802002ab4000f99000c2ab4000f852bb8001b2ab4001099000c2ab40010852bb8001bb1
+fromData,97,2a2bb7001c2bb9001d01003d1c047e9900142a2bb9001e0100b5000a2ab4000ab8001f2a2bb900200100b5000b2a2bb80021b5000c2a2bb9001e0100b5000d1c10407e99000c2a2bb8002288b5000e1c1100807e99000c2a2bb8002288b5000fb1
+toData,131,2a2bb70015033d2ab4000a9900081c0480933d2ab4000e9900091c104080933d2ab4000f99000a1c11008080933d2b1cb9001702002ab4000a99000d2b2ab4000ab9001802002b2ab4000bb9001902002ab4000c2bb8001a2b2ab4000db9001802002ab4000e99000c2ab4000e852bb8001b2ab4000f99000c2ab4000f852bb8001bb1
 
 com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$NetWriteReplyMessage,2
 fromData,47,2a2bb700182a2bb900190100b500072a2bb9001a0100b500082a2bb8001bc0001cb500092a2bb9001a0100b5000ab1
@@ -1294,8 +1294,8 @@ fromData,57,2a2bb700182a2bb900190100b5000a2a2bb9001a0100b5000b2a2bb900190100b500
 toData,54,2a2bb700142b2ab4000ab9001502002b2ab4000bb9001602002b2ab4000cb9001502002ab4000d2bb800172b2ab4000eb900150200b1
 
 com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$QueryMessage,2
-fromData,114,2a2bb7001f2bb9002001003d1c047e9900142a2bb900210100b5000c2ab4000cb800222a2bb900230100b5000d2a2bb80024b5000f2a2bb900210100b500101c10407e99000c2a2bb8002588b500111c1100807e99000c2a2bb8002588b500122a1c1101007e99000704a7000403b50008b1
-toData,145,2a2bb70019033d2ab4000c9900081c0480933d2ab400119900091c104080933d2ab4001299000a1c11008080933d2ab4000899000a1c11010080933d2b1cb9001a02002ab4000c99000d2b2ab4000cb9001b02002b2ab4000db9001c02002ab4000f2bb8001d2b2ab40010b9001b02002ab4001199000c2ab40011852bb8001e2ab4001299000c2ab40012852bb8001eb1
+fromData,114,2a2bb7001f2bb9002001003d1c047e9900142a2bb900210100b5000b2ab4000bb800222a2bb900230100b5000c2a2bb80024b5000e2a2bb900210100b5000f1c10407e99000c2a2bb8002588b500101c1100807e99000c2a2bb8002588b500112a1c1101007e99000704a7000403b50007b1
+toData,145,2a2bb70018033d2ab4000b9900081c0480933d2ab400109900091c104080933d2ab4001199000a1c11008080933d2ab4000799000a1c11010080933d2b1cb9001a02002ab4000b99000d2b2ab4000bb9001b02002b2ab4000cb9001c02002ab4000e2bb8001d2b2ab4000fb9001b02002ab4001099000c2ab40010852bb8001e2ab4001199000c2ab40011852bb8001eb1
 
 com/gemstone/gemfire/internal/cache/SearchLoadAndWriteProcessor$ResponseMessage,2
 fromData,83,2a2bb7001f2a2bb80020b500072a2bb900210100b500082a2bb80020b500092a2bb900220100b5000a2a2bb900230100b5000b2a2bb900230100b5000c2a2bb900230100b5000d2a2bb80020c00024b5000eb1
@@ -1322,8 +1322,8 @@ fromData,17,2a2bb7000e2a2bb8000fc00010b50002b1
 toData,14,2a2bb7000b2ab400022bb8000cb1
 
 com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable,2
-fromData,20,2a2bb8000fb500072a2ab40007b80008b50009b1
-toData,9,2ab400072bb80010b1
+fromData,20,2a2bb8000eb500062a2ab40006b80007b50008b1
+toData,9,2ab400062bb8000fb1
 
 com/gemstone/gemfire/internal/cache/TXCommitMessage,2
 fromData,211,2bb900f601003d2ab700049900122a1cb5009f2ab4009fb800f7a700082a02b5009f2a2bb800f8b500152bb900f9010099000b2a2bb800fab500162bb900f601003e2a2bb800fbb5001f2a2bb900fc0100b500202a2bb900fc0100b500212a2bb900f90100b800fdb500022bb900f6010036042abb00d9591504b700dbb500172abb00d9591db700dbb500ae03360515051504a2002fbb0025592ab700fe3a0619062bb600ffa7000c3a072a1907b600bcb12ab400171906b6004957840501a7ffd02a2bb80100b500032a2bb80101b5001bb1
@@ -1426,19 +1426,19 @@ fromData,14,2a2bb700132a2bb80014b50009b1
 toData,14,2a2bb700152ab400092bb80016b1
 
 com/gemstone/gemfire/internal/cache/VMCachedDeserializable,2
-fromData,17,2bb800214d2a2cbeb500092a2cb50007b1
-toData,9,2ab600222bb80023b1
+fromData,17,2bb800204d2a2cbeb500082a2cb50006b1
+toData,9,2ab600212bb80022b1
 
 com/gemstone/gemfire/internal/cache/WrappedCallbackArgument,2
 fromData,9,2a2bb80005b50003b1
 toData,24,2ab4000299000e2ab400032bb80004a70008012bb80004b1
 
 com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable,2
-fromData,18,2a2ab600082bb8000fb900090200b50003b1
-toData,18,2ab600082ab40003b9000d02002bb8000eb1
+fromData,18,2a2ab600072bb8000eb900080200b50002b1
+toData,18,2ab600072ab40002b9000c02002bb8000db1
 
 com/gemstone/gemfire/internal/cache/control/MemoryThresholds,1
-toData,31,2b2ab4000cb9003803002b2ab4000db9003902002b2ab40013b900390200b1
+toData,31,2b2ab4000bb9003703002b2ab4000cb9003802002b2ab40012b900380200b1
 
 com/gemstone/gemfire/internal/cache/control/MemoryThresholds$MemoryState,1
 toData,12,2ab60009b8000a2bb8000bb1
@@ -1552,8 +1552,8 @@ fromData,6,2a2bb7001db1
 toData,6,2a2bb7001bb1
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage,2
-fromData,134,2a2bb700682a2bb80069b7006a2a2bb80069b500092a2bb9006b0100b8006cb5000b2a2bb9006d0100b5000c2a2bb8006eb5000e2a2bb80069c0006fb500192a2bb80069c00070b500102a2bb80069b500052ab400711104007e99000704a70004033d1c9900162abb007259b70073b500742ab400742bb800752a2bb80069c00076b50012b1
-toData,100,2a2bb700772ab600782bb800792ab400092bb800792b2ab4000bb4007ab9007b02002b2ab4000cb9007c02002ab4000e2bb800792ab400192bb800792ab400102bb800792ab400052bb800792ab40074c6000b2ab400742bb8007d2ab400122bb80079b1
+fromData,134,2a2bb700672a2bb80068b700692a2bb80068b500082a2bb9006a0100b8006bb5000a2a2bb9006c0100b5000b2a2bb8006db5000d2a2bb80068c0006eb500182a2bb80068c0006fb5000f2a2bb80068b500042ab400701104007e99000704a70004033d1c9900162abb007259b70073b500742ab400742bb800752a2bb80068c00076b50011b1
+toData,100,2a2bb700772ab600782bb800792ab400082bb800792b2ab4000ab4007ab9007b02002b2ab4000bb9007c02002ab4000d2bb800792ab400182bb800792ab4000f2bb800792ab400042bb800792ab40074c6000b2ab400742bb8007d2ab400112bb80079b1
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2
 fromData,52,2a2bb700262bb9002701003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80028b5000bb1
@@ -1584,8 +1584,8 @@ fromData,67,2a2bb700282a2bb80029b6002ab500082ab4000804a0000e2a2bb8002bb50004a700
 toData,67,2a2bb7002f2ab40008b800302bb800312ab4000804a0000e2ab400042bb80032a700122ab400089a000b2ab400052bb800332ab400062bb800342ab400092bb80035b1
 
 com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage$FetchBulkEntriesReplyMessage,2
-fromData,40,2a2bb700542a2bb900550100b500062a2bb80056b500022a2bb80057b500582a2bb80059b50001b1
-toData,40,2a2bb7004f2b2ab40006b9005002002ab400022bb800312ab400072bb800512ab400012bb80052b1
+fromData,40,2a2bb700552a2bb900560100b500062a2bb80057b500022a2bb80058b500592a2bb8005ab50001b1
+toData,40,2a2bb700502b2ab40006b9005102002ab400022bb800322ab400072bb800522ab400012bb80053b1
 
 com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage,2
 fromData,16,2a2bb7002e2a2bb9002f0100b50004b1
@@ -1596,8 +1596,8 @@ fromData,74,2a2bb700522a2bb900530100b500062a2bb900530100b500072a2bb900530100b500
 toData,74,2a2bb7004d2b2ab40006b9004e02002b2ab40007b9004e02002b2ab40008b9004e02002b2ab40009b9004e02002b2ab4000ab9004f02002ab4000b2bb800502b2ab40001b9004f0200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage,2
-fromData,14,2a2bb7003b2a2bb8003cb50005b1
-toData,14,2a2bb7003e2ab400052bb8003fb1
+fromData,14,2a2bb7003a2a2bb8003bb50004b1
+toData,14,2a2bb7003d2ab400042bb8003eb1
 
 com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage$FetchEntryReplyMessage,2
 fromData,58,2a2bb700202bb9002101003d1c9a002c2ab40003b80022c000234e2dc7000dbb0024591225b70026bf2abb0027592b2db40028b70029b50004b1
@@ -1624,8 +1624,8 @@ fromData,36,2a2bb700252a2bb900260100b500022a2bb900260100b500032a2bb900260100b500
 toData,36,2a2bb700272b2ab40002b9002802002b2ab40003b9002802002b2ab40004b900280200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage,2
-fromData,43,2a2bb700542a2bb80055b500052a2bb80055b500062a2bb80055c00056b500072a2bb900570100b50008b1
-toData,40,2a2bb700582ab400052bb800592ab400062bb800592ab400072bb800592b2ab40008b9005a0200b1
+fromData,43,2a2bb700532a2bb80054b500042a2bb80054b500052a2bb80054c00055b500062a2bb900560100b50007b1
+toData,40,2a2bb700572ab400042bb800582ab400052bb800582ab400062bb800582b2ab40007b900590200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage$GetReplyMessage,2
 fromData,77,2a2bb7002a2bb9002b01003d1c10087e99000704a7000403593e9900091c10f77e913d2a1cb500072a2bb8002cb5002d1c049f000b2a2bb8002eb5002f1d99000e2a2bb80030c00031b5000ab1
@@ -1712,8 +1712,8 @@ fromData,49,2a2bb700392a2bb8003ab500062a2bb9003b0100b8003cb500082a2bb8003ac0003d
 toData,43,2a2bb7003f2ab700122bb800402b2ab40008b40041b9004202002ab4000a2bb800402ab4000c2bb80040b1
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage,2
-fromData,58,2a2bb700742a2bb900750100b500052a2ab400052bb600762a2bb900770100b5000e2bb80078b20079b6007a9b000d2a2bb9007b0100b5000ab1
-toData,104,2a2bb7007f033d2a1cb600803d2b1cb9008102002ab4001099000d2b2ab40010b9008202002ab40008029f000d2b2ab40008b9008202002ab40006c6000b2ab400062bb800832b2ab4000eb9008202002bb80084b20079b6007a9b000d2b2ab4000ab900850200b1
+fromData,58,2a2bb7007b2a2bb9007c0100b500032a2ab400032bb6007d2a2bb9007e0100b5000c2bb8007fb20080b600819b000d2a2bb900820100b50008b1
+toData,104,2a2bb70088033d2a1cb600893d2b1cb9008a02002ab4000e99000d2b2ab4000eb9008b02002ab40006029f000d2b2ab40006b9008b02002ab40004c6000b2ab400042bb8008c2b2ab4000cb9008b02002bb8008db20080b600819b000d2b2ab40008b9008e0200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2
 fromData,17,2a2bb7003c2a2bb8003dc0003eb50003b1
@@ -1728,16 +1728,16 @@ fromData,16,2a2bb700092a2bb9000a0100b50007b1
 toData,16,2a2bb7000b2b2ab40007b9000c0200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage,2
-fromData,183,2a2bb7003f2a2bb8004088b80009b5000a2ab400411110007e99000e2a2bb80042c00043b5003d2a2bb80042b500102a2bb8004488b500052a2ab40005bd000bb5000c2ab400059e006f2bb800454dbb004659b700474e03360415042ab40005a2001d2ab4000c1504bb000b592b0115042c2db7004853840401a7ffe02bb9004901003604150499002f2bb8004a3a0503360615062ab40005a2001d2ab4000c15063219051506b6004bc0004cb5004d840601a7ffe0b1
-toData,210,2a2bb7004e2ab4000ac7000d14004f2bb80051a7000f2ab4000ab60052852bb800512ab4003dc6000b2ab4003d2bb800532ab400102bb800532ab40005852bb800542ab400059e008bbb0055592ab40005b700564d033e2ab4000c0332b60022c10057360403360515052ab40005a200531d9a00122ab4000c150532b4004dc60005043e2ab4000c150532b4004d3a062c1906b60058572ab4000c15053201b5004d2ab4000c1505322b1504b600592ab4000c1505321906b5004d840501a7ffaa2b1db9005a02001d9900082c2bb8005bb1
+fromData,183,2a2bb7003d2a2bb8003e88b80007b500082ab4003f1110007e99000e2a2bb80041c00042b5003b2a2bb80041b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e006f2bb800444dbb004559b700464e03360415042ab40003a2001d2ab4000a1504bb0009592b0115042c2db7004753840401a7ffe02bb9004801003604150499002f2bb800493a0503360615062ab40003a2001d2ab4000a15063219051506b6004ac0004bb5004c840601a7ffe0b1
+toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003bc6000b2ab4003b2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b60020c10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
 
 com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage$PutAllReplyMessage,2
 fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
 toData,24,2a2bb7001f2b2ab40003b9002002002ab400022bb80021b1
 
 com/gemstone/gemfire/internal/cache/partitioned/PutMessage,2
-fromData,260,2a2bb7005d2bb9005e01003d2a2bb8005fb600602a2bb8005fb500172a2bb900610100b500182a2bb900620100b80063b500191cb200647e99000b2a2bb80065b5001a1cb200667e99000e2a2bb8005fc00067b5001c2abb006859b70069b5001d2ab4001d2bb8006a2ab4006b1120007e99000b2a2bb8005fb500222ab4006c9900162abb006d59b7006eb500282ab400282bb8006a2a1cb2006f7e91b500072ab4000999000e2a2bb80070b5000da7002e2ab4000704a0000e2a2bb8005fb70071a7000b2a2bb80070b700721cb200737e99000b2a2bb80070b5000d2ab4006b1140007e99000e2a2bb8005fc00074b500252ab4006b1180007e9900082a04b50075b1
-toData,358,014d2ab40021b60076b9007701003e2ab4000cb60078c600161d9900122ab4000b99000b2a04b50009a700082a03b50009a7000d4ebb007a592db7007bbf2a2bb7007c2ab400073e2ab4001ac600091db20064803e2ab400079900282ab40011c7000a2ab6007dc6001a2ab4007e9900132ab4000cb60078c600091db20073803e2ab4001cc600091db20066803e2b1db9007f02002ab600802bb800812ab600822bb800812b2ab40018b9008303002b2ab40019b40084b9007f02002ab4001ac6000b2ab4001a2bb800812ab4001cc6000b2ab4001c2bb800812ab4001d2bb800852ab40022c6000b2ab400222bb800812ab4006c99000b2ab400282bb800852ab4000999002f2ab40086b800874da7000f3a04bb008959128ab7008bbf2ab4000cb600782bb8008c2cb6008db6008ea700262ab400072ab400112ab6007d2bb8008f1db200737e99000e2ab4000cb600782bb8008c2ab40025c6000b2ab400252bb80081b1
+fromData,260,2a2bb7005c2bb9005d01003d2a2bb8005eb6005f2a2bb8005eb500152a2bb900600100b500162a2bb900610100b80062b500171cb200637e99000b2a2bb80064b500181cb200657e99000e2a2bb8005ec00066b5001a2abb006759b70068b5001b2ab4001b2bb800692ab4006a1120007e99000b2a2bb8005eb500202ab4006b9900162abb006c59b7006db500262ab400262bb800692a1cb2006e7e91b500052ab4000799000e2a2bb8006fb5000ba7002e2ab4000504a0000e2a2bb8005eb70070a7000b2a2bb8006fb700711cb200727e99000b2a2bb8006fb5000b2ab4006a1140007e99000e2a2bb8005ec00073b500232ab4006a1180007e9900082a04b50074b1
+toData,358,014d2ab4001fb60075b9007601003e2ab4000ab60077c600161d9900122ab4000999000b2a04b50007a700082a03b50007a7000d4ebb0079592db7007abf2a2bb7007b2ab400053e2ab40018c600091db20063803e2ab400059900282ab4000fc7000a2ab6007cc6001a2ab4007d9900132ab4000ab60077c600091db20072803e2ab4001ac600091db20065803e2b1db9007e02002ab6007f2bb800802ab600812bb800802b2ab40016b9008203002b2ab40017b40083b9007e02002ab40018c6000b2ab400182bb800802ab4001ac6000b2ab4001a2bb800802ab4001b2bb800842ab40020c6000b2ab400202bb800802ab4006b99000b2ab400262bb800842ab4000799002f2ab40085b800864da7000f3a04bb0088591289b7008abf2ab4000ab600772bb8008b2cb6008cb6008da700262ab400052ab4000f2ab6007c2bb8008e1db200727e99000e2ab4000ab600772bb8008b2ab40023c6000b2ab400232bb80080b1
 
 com/gemstone/gemfire/internal/cache/partitioned/PutMessage$PutReplyMessage,2
 fromData,48,2a2bb700252a2bb900260100b500032a2bb900270100b80028b500022a2bb80029b500062a2bb80029c0002ab50007b1
@@ -1772,8 +1772,8 @@ fromData,16,2a2bb7001e2a2bb9001f0100b50003b1
 toData,16,2a2bb7001b2b2ab40003b9001c0200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage,2
-fromData,190,2a2bb7003e2a2bb8003f88b80009b5000a2ab400401110007e99000e2a2bb80041c00042b5003c2bb800434d2a2bb80041b500102a2bb8004488b500052a2ab40005bd000bb5000c2ab400059e00712bb800454ebb004659b700473a0403360515052ab40005a2001e2ab4000c1505bb000b592b0115052d1904b7004853840501a7ffdf2bb9004901003605150599002f2bb8004a3a0603360715072ab40005a2001d2ab4000c15073219061507b6004bc0004cb5004d840701a7ffe0b1
-toData,210,2a2bb7004e2ab4000ac7000d14004f2bb80051a7000f2ab4000ab60052852bb800512ab4003cc6000b2ab4003c2bb800532ab400102bb800532ab40005852bb800542ab400059e008bbb0055592ab40005b700564d033e2ab4000c0332b60021c10057360403360515052ab40005a200531d9a00122ab4000c150532b4004dc60005043e2ab4000c150532b4004d3a062c1906b60058572ab4000c15053201b5004d2ab4000c1505322b1504b600592ab4000c1505321906b5004d840501a7ffaa2b1db9005a02001d9900082c2bb8005bb1
+fromData,190,2a2bb7003c2a2bb8003d88b80007b500082ab4003e1110007e99000e2a2bb80040c00041b5003a2bb800424d2a2bb80040b5000e2a2bb8004388b500032a2ab40003bd0009b5000a2ab400039e00712bb800444ebb004559b700463a0403360515052ab40003a2001e2ab4000a1505bb0009592b0115052d1904b7004753840501a7ffdf2bb9004801003605150599002f2bb800493a0603360715072ab40003a2001d2ab4000a15073219061507b6004ac0004bb5004c840701a7ffe0b1
+toData,210,2a2bb7004d2ab40008c7000d14004e2bb80050a7000f2ab40008b60051852bb800502ab4003ac6000b2ab4003a2bb800522ab4000e2bb800522ab40003852bb800532ab400039e008bbb0054592ab40003b700554d033e2ab4000a0332b6001fc10056360403360515052ab40003a200531d9a00122ab4000a150532b4004cc60005043e2ab4000a150532b4004c3a062c1906b60057572ab4000a15053201b5004c2ab4000a1505322b1504b600582ab4000a1505321906b5004c840501a7ffaa2b1db9005902001d9900082c2bb8005ab1
 
 com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage$RemoveAllReplyMessage,2
 fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1
@@ -1796,8 +1796,8 @@ fromData,36,2a2bb700082a2bb900090100b500032a2bb9000a0100b500042a2bb9000a0100b500
 toData,36,2a2bb7000b2b2ab40003b9000c02002b2ab40004b9000d02002b2ab40005b9000d0200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/SizeMessage,2
-fromData,14,2a2bb700362a2bb80037b50006b1
-toData,14,2a2bb700382ab400062bb80039b1
+fromData,14,2a2bb700352a2bb80036b50005b1
+toData,14,2a2bb700372ab400052bb80038b1
 
 com/gemstone/gemfire/internal/cache/partitioned/SizeMessage$SizeReplyMessage,2
 fromData,17,2a2bb7001d2a2bb8001ec0001fb50003b1
@@ -1904,8 +1904,8 @@ fromData,1,b1
 toData,1,b1
 
 com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID,2
-fromData,19,2a2bb8004fb500082a2bb900500100b5000ab1
-toData,19,2ab400082bb8004d2b2ab4000ab9004e0200b1
+fromData,19,2a2bb80051b500092a2bb900520100b5000bb1
+toData,19,2ab400092bb8004f2b2ab4000bb900500200b1
 
 com/gemstone/gemfire/internal/cache/tier/sockets/ClientTombstoneMessage,2
 fromData,63,2ab800222bb90023010032b500072a2bb900230100b80024b5001c2a2bb80025b6000a2a2bb80026b500082a2bb80027b500202a2bb80026c00028b50021b1
@@ -2001,8 +2001,8 @@ fromData,6,2a2bb7001fb1
 toData,6,2a2bb7001db1
 
 com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage,2
-fromData,14,2a2bb700582a2bb80059b50002b1
-toData,14,2a2bb700562ab400022bb80057b1
+fromData,14,2a2bb700592a2bb8005ab50002b1
+toData,14,2a2bb700572ab400022bb80058b1
 
 com/gemstone/gemfire/internal/cache/wan/serial/BatchDestroyOperation$DestroyMessage,2
 fromData,45,2a2bb700452a2bb80046c00047b500022a2bb80046b5000d2bb800484d2cb6004999000b2a2bb8004ab50005b1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
new file mode 100644
index 0000000..ceb7aa9
--- /dev/null
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.CacheServiceProfile;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.lucene.analysis.Analyzer;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.*;
+
+public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSerializable {
+
+  private String indexName;
+
+  private String[] fieldNames;
+
+  private Class<? extends Analyzer> analyzerClass;
+
+  private Map<String, Class<? extends Analyzer>> fieldAnalyzers;
+
+  /* Used by DataSerializer */
+  public LuceneIndexCreationProfile() {}
+
+  public LuceneIndexCreationProfile(String indexName, String[] fieldNames, Analyzer analyzer,
+      Map<String, Analyzer> fieldAnalyzers) {
+    this.indexName = indexName;
+    this.fieldNames = fieldNames;
+    this.analyzerClass = analyzer.getClass();
+    initializeFieldAnalyzers(fieldAnalyzers);
+  }
+
+  public String getIndexName() {
+    return this.indexName;
+  }
+
+  public String[] getFieldNames() {
+    return this.fieldNames;
+  }
+
+  public Class<? extends Analyzer> getAnalyzerClass() {
+    return this.analyzerClass;
+  }
+
+  public Map<String, Class<? extends Analyzer>> getFieldAnalyzers() {
+    return this.fieldAnalyzers;
+  }
+
+  protected void initializeFieldAnalyzers(Map<String, Analyzer> fieldAnalyzers) {
+    if (fieldAnalyzers != null && !fieldAnalyzers.isEmpty()) {
+      this.fieldAnalyzers = new HashMap<>();
+      for (Map.Entry<String, Analyzer> entry : fieldAnalyzers.entrySet()) {
+        // Null values are allowed in analyzers which means the default Analyzer is used
+        this.fieldAnalyzers.put(entry.getKey(), entry.getValue() == null ? null : entry.getValue().getClass());
+      }
+    }
+  }
+
+  @Override
+  public String getId() {
+    return this.indexName;
+  }
+
+  @Override
+  public String checkCompatibility(String regionPath, CacheServiceProfile profile) {
+    String result = null;
+    LuceneIndexCreationProfile myProfile = (LuceneIndexCreationProfile) profile;
+    if (myProfile == null) {
+      // TODO This can occur if one member defines no indexes but another one does. Currently this is caught by the async event id checks.
+    } else {
+      // Verify fields are the same
+      if (!Arrays.equals(myProfile.getFieldNames(), getFieldNames())) {
+        result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELDS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELDS_3
+            .toString(myProfile.getIndexName(), regionPath, Arrays.toString(getFieldNames()),
+                Arrays.toString(myProfile.getFieldNames()));
+      }
+
+      // Verify the analyzer class is the same
+      // Note: This test will currently only fail if per-field analyzers are used in one member but not another,
+      // This condition will be caught in the tests below so this test is commented out. If we ever allow the user
+      // to configure a single analyzer for all fields, then this test will be useful again.
+      /*
+      if (!remoteLuceneIndexProfile.getAnalyzerClass().isInstance(getAnalyzer())) {
+        result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3
+            .toString(indexName, regionPath, remoteLuceneIndexProfile.getAnalyzerClass().getName(), analyzer.getClass().getName());
+      }
+      */
+
+      // Verify the field analyzer fields and classes are the same if either member sets field analyzers
+      if (myProfile.getFieldAnalyzers() != null || getFieldAnalyzers() != null) {
+        // Check for one member defining field analyzers while the other member does not
+        if (myProfile.getFieldAnalyzers() == null) {
+          result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_FIELD_ANALYZERS
+              .toString(myProfile.getIndexName(), regionPath, getFieldAnalyzers());
+        } else if (getFieldAnalyzers() == null) {
+          result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_FIELD_ANALYZERS_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_2
+              .toString(myProfile.getIndexName(), regionPath, myProfile.getFieldAnalyzers());
+        } else {
+          // Both local and remote analyzers are set. Verify the sizes of the field analyzers are identical
+          if (myProfile.getFieldAnalyzers().size() != getFieldAnalyzers().size()) {
+            result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_FIELD_ANALYZERS_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_FIELD_ANALYZERS_3
+                .toString(myProfile.getIndexName(), regionPath, getFieldAnalyzers(),
+                    myProfile.getFieldAnalyzers());
+          }
+
+          // Iterate the existing analyzers and compare them to the input analyzers
+          // Note: This is currently destructive to the input field analyzers map which should be ok since its a transient object.
+          for (Iterator<Map.Entry<String, Class<? extends Analyzer>>> i = myProfile.getFieldAnalyzers().entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry<String, Class<? extends Analyzer>> entry = i.next();
+            // Remove the existing field's analyzer from the input analyzers
+            Class<? extends Analyzer> analyzerClass = getFieldAnalyzers().remove(entry.getKey());
+
+            // Verify the input field analyzer matches the current analyzer
+            if (analyzerClass == null && entry.getValue() != null) {
+              // The input field analyzers do not include the existing field analyzer
+              result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_NO_ANALYZER_ON_FIELD_2_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_3_ON_THAT_FIELD
+                  .toString(myProfile.getIndexName(), regionPath, entry.getKey(), entry.getValue().getName());
+              break;
+            } else if (analyzerClass != null && entry.getValue() == null) {
+              // The existing field analyzers do not include the input field analyzer
+              result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD
+                  .toString(myProfile.getIndexName(), regionPath, analyzerClass.getName(), entry.getKey());
+              break;
+            } else {
+              if (analyzerClass != entry.getValue()) {
+                // The class of the input analyzer does not match the existing analyzer for the field
+                result = LocalizedStrings.LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD
+                    .toString(myProfile.getIndexName(), regionPath, analyzerClass.getName(), entry.getKey(), entry.getValue().getName());
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+    DataSerializer.writeString(this.indexName, out);
+    DataSerializer.writeStringArray(this.fieldNames, out);
+    DataSerializer.writeClass(this.analyzerClass, out);
+    DataSerializer.writeHashMap(this.fieldAnalyzers, out);
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    this.indexName = DataSerializer.readString(in);
+    this.fieldNames = DataSerializer.readStringArray(in);
+    this.analyzerClass = (Class<? extends Analyzer>) DataSerializer.readClass(in);
+    this.fieldAnalyzers = DataSerializer.readHashMap(in);
+  }
+
+  public String toString() {
+    return new StringBuilder()
+        .append(getClass().getSimpleName())
+        .append("[")
+        .append("indexName=")
+        .append(this.indexName)
+        .append("; fieldNames=")
+        .append(Arrays.toString(this.fieldNames))
+        .append("; analyzerClass=")
+        .append(this.analyzerClass)
+        .append("; fieldAnalyzers=")
+        .append(this.fieldAnalyzers)
+        .append("]")
+        .toString();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c742c4e5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 67edc6d..47c4d76 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -47,12 +47,12 @@ import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
 import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
 import com.gemstone.gemfire.internal.DSFIDFactory;
 import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.cache.extension.Extensible;
 import com.gemstone.gemfire.internal.cache.CacheService;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.RegionListener;
-import com.gemstone.gemfire.internal.cache.extension.Extensible;
 import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
@@ -65,10 +65,10 @@ import com.gemstone.gemfire.internal.logging.LogService;
  */
 public class LuceneServiceImpl implements InternalLuceneService {
   private static final Logger logger = LogService.getLogger();
-  
+
   private GemFireCacheImpl cache;
   private final HashMap<String, LuceneIndex> indexMap = new HashMap<String, LuceneIndex>();;
-  
+
   public LuceneServiceImpl() {
     
   }
@@ -116,7 +116,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
     createIndex(indexName, regionPath, analyzer, fieldAnalyzers, fields);
   }
 
-  private void createIndex(final String indexName, String regionPath,
+  public void createIndex(final String indexName, String regionPath,
       final Analyzer analyzer, final Map<String, Analyzer> fieldAnalyzers,
       final String... fields) {
 
@@ -127,7 +127,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
     if(region != null) {
       throw new IllegalStateException("The lucene index must be created before region");
     }
-    
+
     final String dataRegionPath = regionPath;
     cache.addRegionListener(new RegionListener() {
       @Override
@@ -142,6 +142,9 @@ public class LuceneServiceImpl implements InternalLuceneService {
             af.addAsyncEventQueueId(aeqId);
             updatedRA = af.create();
           }
+
+          // Add index creation profile
+          internalRegionArgs.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, fields, analyzer, fieldAnalyzers));
         }
         return updatedRA;
       }
@@ -284,7 +287,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
     DSFIDFactory.registerDSFID(
         DataSerializableFixedID.LUCENE_TOP_ENTRIES,
         TopEntries.class);
-    
+
     DSFIDFactory.registerDSFID(
         DataSerializableFixedID.LUCENE_TOP_ENTRIES_COLLECTOR,
         TopEntriesCollector.class);