Repository: geode-examples Updated Branches: refs/heads/feature/GEODE-2231 9b5b0e9b2 -> 40f34dbcb
GEODE-2231 intermediate commit while developing partitioning example Project: http://git-wip-us.apache.org/repos/asf/geode-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-examples/commit/40f34dbc Tree: http://git-wip-us.apache.org/repos/asf/geode-examples/tree/40f34dbc Diff: http://git-wip-us.apache.org/repos/asf/geode-examples/diff/40f34dbc Branch: refs/heads/feature/GEODE-2231 Commit: 40f34dbcba5fc0dac02521507d712e6ee5a2b8de Parents: 9b5b0e9 Author: Karen Miller <kmil...@pivotal.io> Authored: Fri Jan 27 15:32:42 2017 -0800 Committer: Karen Miller <kmil...@pivotal.io> Committed: Fri Jan 27 15:32:42 2017 -0800 ---------------------------------------------------------------------- partitioned/README.md | 6 ++++++ partitioned/scripts/startAll.sh | 2 +- .../apache/geode/examples/partitioned/BadEmployeeKey.java | 3 ++- .../org/apache/geode/examples/partitioned/BaseClient.java | 2 +- .../java/org/apache/geode/examples/partitioned/Consumer.java | 5 ++++- .../org/apache/geode/examples/partitioned/EmployeeData.java | 8 +++----- .../org/apache/geode/examples/partitioned/EmployeeKey.java | 3 ++- .../java/org/apache/geode/examples/partitioned/Producer.java | 8 +++++++- 8 files changed, 26 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/README.md ---------------------------------------------------------------------- diff --git a/partitioned/README.md b/partitioned/README.md index 30bdf90..9c091b9 100644 --- a/partitioned/README.md +++ b/partitioned/README.md @@ -15,6 +15,12 @@ as well how to write tests using mocks for Geode applications. ## Steps 1. From the ```geode-examples/partitioned``` directory, +build the jar (with the EmployeeKey and EmployeeData classes), +which is put onto the classpath when starting the servers: + + $ ../gradlew -x rat build -x spotLessCheck -x test + +1. From the ```geode-examples/partitioned``` directory, run a script that starts a locator and two servers: $ scripts/startAll.sh http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/scripts/startAll.sh ---------------------------------------------------------------------- diff --git a/partitioned/scripts/startAll.sh b/partitioned/scripts/startAll.sh index 1bf63ca..7c72643 100755 --- a/partitioned/scripts/startAll.sh +++ b/partitioned/scripts/startAll.sh @@ -33,7 +33,7 @@ gfsh start locator --name=locator1 --mcast-port=0 --port=${GEODE_LOCATOR_PORT} # start 2 servers on a random available port for N in {1..2} do - gfsh start server --locators=localhost[${GEODE_LOCATOR_PORT}] --name=server$N --server-port=0 --mcast-port=0 + gfsh start server --locators=localhost[${GEODE_LOCATOR_PORT}] --name=server$N --server-port=0 --mcast-port=0 --classpath=${PWD}/build/libs/partitioned.jar done # create a region using GFSH http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/BadEmployeeKey.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/BadEmployeeKey.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/BadEmployeeKey.java index 3671a9e..2c83227 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/BadEmployeeKey.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/BadEmployeeKey.java @@ -17,9 +17,10 @@ package org.apache.geode.examples.partitioned; import java.util.logging.Logger; +import java.io.Serializable; import org.apache.geode.cache.client.ClientCache; -public class BadEmployeeKey { +public class BadEmployeeKey implements Serializable { static final Logger logger = Logger.getAnonymousLogger(); private String name; http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/BaseClient.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/BaseClient.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/BaseClient.java index 3b01882..c4d0e63 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/BaseClient.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/BaseClient.java @@ -46,7 +46,7 @@ public abstract class BaseClient { protected Region getRegion() { if (region == null) { region = getClientCache() - .<String, String>createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) + .<EmployeeKey, EmployeeData>createClientRegionFactory(ClientRegionShortcut.PROXY) .create(REGION_NAME); } return region; http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java index 91c6af9..6ea91df 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java @@ -45,9 +45,12 @@ public class Consumer extends BaseClient { /* for each key in setOfKeys * print the entry */ + if (setOfKeys.equals(null)) { + logger.info("setOfKeys is a null reference"); + } logger.info("Region contents:"); for (EmployeeKey key : setOfKeys) { - logger.info(getRegion().getEntry(key).toString()); + logger.info(this.getRegion().getEntry(key).toString()); } } http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java index 76979e4..b3f554f 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java @@ -17,8 +17,9 @@ package org.apache.geode.examples.partitioned; import java.util.logging.Logger; +import java.io.Serializable; -public class EmployeeData { +public class EmployeeData implements Serializable { static final Logger logger = Logger.getAnonymousLogger(); private EmployeeKey nameAndNumber; @@ -26,9 +27,6 @@ public class EmployeeData { private int hoursPerWeek; public EmployeeData() { - this.nameAndNumber = new EmployeeKey("no name", 0); - this.salary = 0; - this.hoursPerWeek = 0; } public EmployeeData(EmployeeKey k, int s, int hrs) { @@ -50,7 +48,7 @@ public class EmployeeData { } public String toString() { - return(nameAndNumber.toString() + " salary=" + this.salary + + return(this.nameAndNumber.toString() + " salary=" + this.salary + " hoursPerWeek=" + this.hoursPerWeek); } http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeKey.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeKey.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeKey.java index 1a6e06c..5445967 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeKey.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeKey.java @@ -17,9 +17,10 @@ package org.apache.geode.examples.partitioned; import java.util.logging.Logger; +import java.io.Serializable; import org.apache.geode.cache.client.ClientCache; -public class EmployeeKey { +public class EmployeeKey implements Serializable { static final Logger logger = Logger.getAnonymousLogger(); private String name; http://git-wip-us.apache.org/repos/asf/geode-examples/blob/40f34dbc/partitioned/src/main/java/org/apache/geode/examples/partitioned/Producer.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Producer.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Producer.java index e909b54..ac2b316 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Producer.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Producer.java @@ -17,6 +17,7 @@ package org.apache.geode.examples.partitioned; import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ServerOperationException; public class Producer extends BaseClient { @@ -36,7 +37,12 @@ public class Producer extends BaseClient { EmployeeKey k1 = new EmployeeKey("Alex Able", 160); EmployeeData d1 = new EmployeeData(k1, 70000, 40); logger.info("About to try put on k1,d1 "); - getRegion().put(k1, d1); + try { + getRegion().put(k1, d1); + } catch (ServerOperationException e) { + logger.info("ServerOperationException " + e.getMessage()); + logger.info("ServerOperationException " + e.getCause()); + } EmployeeKey k2 = new EmployeeKey("Bertie Bell", 170); EmployeeData d2 = new EmployeeData(k2, 72000, 40);
