[1/2] curator git commit: CURATOR-431 - Fixed stat population during create

2017-09-12 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master 15eb063fa -> c86ca9732


CURATOR-431 - Fixed stat population during create

-The stat object was not being populated if the create failed due to the node 
already existing.


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/931f1de5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/931f1de5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/931f1de5

Branch: refs/heads/master
Commit: 931f1de5c4f72b71e96ea2071add297194e053bd
Parents: 15eb063
Author: Cam McKenzie 
Authored: Tue Sep 12 08:58:47 2017 +1000
Committer: Cam McKenzie 
Committed: Tue Sep 12 08:58:47 2017 +1000

--
 .../framework/imps/CreateBuilderImpl.java   | 16 ++-
 .../framework/imps/TestCreateReturningStat.java | 30 
 2 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/931f1de5/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index 11050f3..f796584 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -1212,7 +1212,21 @@ public class CreateBuilderImpl implements CreateBuilder, 
CreateBuilder2, Backgro
 {
 if ( setDataIfExists )
 {
-client.getZooKeeper().setData(path, data, 
setDataIfExistsVersion);
+Stat setStat = 
client.getZooKeeper().setData(path, data, setDataIfExistsVersion);
+if(storingStat != null)
+{
+
storingStat.setAversion(setStat.getAversion());
+
storingStat.setCtime(setStat.getCtime());
+
storingStat.setCversion(setStat.getCversion());
+
storingStat.setCzxid(setStat.getCzxid());
+
storingStat.setDataLength(setStat.getDataLength());
+
storingStat.setEphemeralOwner(setStat.getEphemeralOwner());
+
storingStat.setMtime(setStat.getMtime());
+
storingStat.setMzxid(setStat.getMzxid());
+
storingStat.setNumChildren(setStat.getNumChildren());
+
storingStat.setPzxid(setStat.getPzxid());
+
storingStat.setVersion(setStat.getVersion());
+}
 createdPath = path;
 }
 else

http://git-wip-us.apache.org/repos/asf/curator/blob/931f1de5/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCreateReturningStat.java
--
diff --git 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCreateReturningStat.java
 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCreateReturningStat.java
index 67a960f..034791d 100755
--- 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCreateReturningStat.java
+++ 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestCreateReturningStat.java
@@ -54,6 +54,36 @@ public class TestCreateReturningStat extends CuratorTestBase
 }
 
 @Test
+public void testOrSetDataStoringStatIn() throws Exception {
+try (CuratorFramework client = createClient())
+{
+client.start();
+client.getZookeeperClient().blockUntilConnectedOrTimedOut();
+
+final String path = "/test";
+
+final Stat versionZeroStat = new Stat();
+
client.create().orSetData().storingStatIn(versionZeroStat).forPath(path);
+Assert.assertEquals(0, versionZeroStat.getVersion());
+
+final Stat versionOneStat = new Stat();
+
client.create().orSetData().storingStatIn(versionOneStat).forPath(path);
+
+Assert.assertEquals(versionZeroStat.getAversion(), 
versionOneStat.getAversion());
+

curator git commit: CURATOR-431 - Clean up stat population

2017-09-12 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-431 931f1de5c -> c86ca9732


CURATOR-431 - Clean up stat population

-Modified the population of the stat object to use DataTree#copyStat()


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

Branch: refs/heads/CURATOR-431
Commit: c86ca97326bc68e63b6b10c913cd8e73c0d57d7e
Parents: 931f1de
Author: Cam McKenzie 
Authored: Wed Sep 13 09:48:18 2017 +1000
Committer: Cam McKenzie 
Committed: Wed Sep 13 09:48:18 2017 +1000

--
 .../framework/imps/CreateBuilderImpl.java   | 26 +++-
 1 file changed, 4 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/c86ca973/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index f796584..b2a3fbc 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -38,6 +38,8 @@ import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Op;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.apache.zookeeper.server.DataTree;
+
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.Callable;
@@ -640,17 +642,7 @@ public class CreateBuilderImpl implements CreateBuilder, 
CreateBuilder2, Backgro
 
 if ( (stat != null) && (storingStat != null) )
 {
-storingStat.setAversion(stat.getAversion());
-storingStat.setCtime(stat.getCtime());
-storingStat.setCversion(stat.getCversion());
-storingStat.setCzxid(stat.getCzxid());
-storingStat.setDataLength(stat.getDataLength());
-
storingStat.setEphemeralOwner(stat.getEphemeralOwner());
-storingStat.setMtime(stat.getMtime());
-storingStat.setMzxid(stat.getMzxid());
-storingStat.setNumChildren(stat.getNumChildren());
-storingStat.setPzxid(stat.getPzxid());
-storingStat.setVersion(stat.getVersion());
+DataTree.copyStat(stat, storingStat);
 }
 
 if ( (rc == KeeperException.Code.NONODE.intValue()) && 
createParentsIfNeeded )
@@ -1215,17 +1207,7 @@ public class CreateBuilderImpl implements CreateBuilder, 
CreateBuilder2, Backgro
 Stat setStat = 
client.getZooKeeper().setData(path, data, setDataIfExistsVersion);
 if(storingStat != null)
 {
-
storingStat.setAversion(setStat.getAversion());
-
storingStat.setCtime(setStat.getCtime());
-
storingStat.setCversion(setStat.getCversion());
-
storingStat.setCzxid(setStat.getCzxid());
-
storingStat.setDataLength(setStat.getDataLength());
-
storingStat.setEphemeralOwner(setStat.getEphemeralOwner());
-
storingStat.setMtime(setStat.getMtime());
-
storingStat.setMzxid(setStat.getMzxid());
-
storingStat.setNumChildren(setStat.getNumChildren());
-
storingStat.setPzxid(setStat.getPzxid());
-
storingStat.setVersion(setStat.getVersion());
+DataTree.copyStat(setStat, 
storingStat);
 }
 createdPath = path;
 }