From 73802a5b3da896e9f4c5338e5ccbfb95f50a6382 Mon Sep 17 00:00:00 2001
From: Anthony Baker <abaker@apache.org>
Date: Fri, 21 Jul 2017 15:01:15 -0700
Subject: [PATCH] [geode] Update to apache-geode 1.2.0 release
Also fix a read serialization issue with client mode driver.
Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>
---
geode/README.md | 2 +-
.../java/com/yahoo/ycsb/db/GeodeClient.java | 23 ++++++++++---------
pom.xml | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/geode/README.md b/geode/README.md
index 59690bfe..2b93af8e 100644
--- a/geode/README.md
+++ b/geode/README.md
@@ -40,9 +40,9 @@ Start a locator and two servers:
```
gfsh> start locator --name=locator1
+gfsh> configure pdx --read-serialized=true
gfsh> start server --name=server1 --server-port=40404
gfsh> start server --name=server2 --server-port=40405
-gfsh> configure pdx --read-serialized=true
```
Create the "usertable" region required by YCSB driver:
diff --git a/geode/src/main/java/com/yahoo/ycsb/db/GeodeClient.java b/geode/src/main/java/com/yahoo/ycsb/db/GeodeClient.java
index 603b7b73..8aa2af76 100644
--- a/geode/src/main/java/com/yahoo/ycsb/db/GeodeClient.java
+++ b/geode/src/main/java/com/yahoo/ycsb/db/GeodeClient.java
@@ -17,16 +17,16 @@
package com.yahoo.ycsb.db;
-import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.pdx.JSONFormatter;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.PdxInstanceFactory;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.internal.admin.remote.DistributionLocatorId;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxInstanceFactory;
import com.yahoo.ycsb.*;
import java.util.*;
@@ -125,6 +125,7 @@ public class GeodeClient extends DB {
locator = new DistributionLocatorId(locatorStr);
}
ClientCacheFactory ccf = new ClientCacheFactory();
+ ccf.setPdxReadSerialized(true);
if (serverPort != 0) {
ccf.addPoolServer(serverHost, serverPort);
} else if (locator != null) {
@@ -207,4 +208,4 @@ public class GeodeClient extends DB {
}
return r;
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 7ba8bed4..96ea2ceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@ LICENSE file.
<hbase12.version>1.2.5</hbase12.version>
<accumulo.version>1.6.0</accumulo.version>
<cassandra.cql.version>3.0.0</cassandra.cql.version>
- <geode.version>1.0.0-incubating.M3</geode.version>
+ <geode.version>1.2.0</geode.version>
<azuredocumentdb.version>1.8.1</azuredocumentdb.version>
<googlebigtable.version>0.2.3</googlebigtable.version>
<infinispan.version>7.2.2.Final</infinispan.version>
--
GitLab