Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1785 3b439d33c -> 48808a9bd
updated to newest version of files Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d484a017 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d484a017 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d484a017 Branch: refs/heads/feature/GEODE-1785 Commit: d484a017d685bb52b5699dd6b51890a959e561f0 Parents: 3b439d3 Author: Darrel Schneider <[email protected]> Authored: Wed Nov 9 14:49:01 2016 -0800 Committer: Darrel Schneider <[email protected]> Committed: Wed Nov 9 14:49:01 2016 -0800 ---------------------------------------------------------------------- dev-tools/generateRegionEntryClasses.sh | 13 ++++++++++--- .../geode/internal/cache/LeafRegionEntry.cpp | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d484a017/dev-tools/generateRegionEntryClasses.sh ---------------------------------------------------------------------- diff --git a/dev-tools/generateRegionEntryClasses.sh b/dev-tools/generateRegionEntryClasses.sh index b208a9a..ea0fe83 100755 --- a/dev-tools/generateRegionEntryClasses.sh +++ b/dev-tools/generateRegionEntryClasses.sh @@ -1,7 +1,13 @@ #!/bin/bash -# This script should only be run from the top level build directory (i.e. the one that contains build.xml). -# It reads LeafRegionEntry.cpp, preprocesses it and generates all the leaf classes that subclass AbstractRegionEntry. -# It executes cpp. It has been tested with gnu's cpp on linux and the mac. +# This script should only be run from the top level build directory +# (the one that contains the "dev-tools" subdirectory). +# It reads LeafRegionEntry.cpp, preprocesses it and generates all the leaf +# class source files that subclass AbstractRegionEntry. +# It executes cpp. It has been tested with gnu's cpp on linux. +# After using it to generate new java files, make sure and +# run 'gradle spotlessApply' to format these generated files. +# Then use 'git diff' to validate the changes you made to the +# generated java files before committing them. SRCDIR=geode-core/src/main/java/org/apache/geode/internal/cache SRCFILE=$SRCDIR/LeafRegionEntry.cpp @@ -42,3 +48,4 @@ do done done done +echo now run \'./gradle spotlessApply\' to format the generated files http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d484a017/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp index 9eaf6b1..b8122c3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp @@ -13,6 +13,7 @@ * the License. */ package org.apache.geode.internal.cache; + // DO NOT modify this class. It was generated from LeafRegionEntry.cpp #if defined(KEY_OBJECT) #define KEY_TYPE Object @@ -80,10 +81,8 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha // key string2: KEY_STRING2 /** - * Do not modify this class. It was generated. - * Instead modify LeafRegionEntry.cpp and then run - * bin/generateRegionEntryClasses.sh from the directory - * that contains your build.xml. + * Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run + * ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory). */ public class LEAF_CLASS extends PARENT_CLASS { public LEAF_CLASS (RegionEntryContext context, KEY_TYPE key, @@ -334,7 +333,7 @@ public class LEAF_CLASS extends PARENT_CLASS { /** * DiskId * - * @since 5.1 + * @since GemFire 5.1 */ protected DiskId id;//= new DiskId(); public DiskId getDiskId() { @@ -641,17 +640,17 @@ public class LEAF_CLASS extends PARENT_CLASS { @Override public void processVersionTag(EntryEvent cacheEvent) { - // this keeps Eclipse happy. without it the sender chain becomes confused + // this keeps Eclipse happy. without it the sender chain becomes confused // while browsing this code super.processVersionTag(cacheEvent); } - /** get rvv internal high byte. Used by region entries for transferring to storage */ + /** get rvv internal high byte. Used by region entries for transferring to storage */ public short getRegionVersionHighBytes() { return this.regionVersionHighBytes; } - /** get rvv internal low bytes. Used by region entries for transferring to storage */ + /** get rvv internal low bytes. Used by region entries for transferring to storage */ public int getRegionVersionLowBytes() { return this.regionVersionLowBytes; } @@ -705,8 +704,9 @@ public class LEAF_CLASS extends PARENT_CLASS { @Override public boolean isKeyEqual(Object k) { if (k instanceof UUID) { - UUID uuid = (UUID)k; - return uuid.getLeastSignificantBits() == this.keyLeastSigBits && uuid.getMostSignificantBits() == this.keyMostSigBits; + UUID uuid = (UUID) k; + return uuid.getLeastSignificantBits() == this.keyLeastSigBits + && uuid.getMostSignificantBits() == this.keyMostSigBits; } return false; }
