From 931f1de5c4f72b71e96ea2071add297194e053bd Mon Sep 17 00:00:00 2001 From: Cam McKenzie Date: Tue, 12 Sep 2017 08:58:47 +1000 Subject: [PATCH 1/2] CURATOR-431 - Fixed stat population during create -The stat object was not being populated if the create failed due to the node already existing. --- .../framework/imps/CreateBuilderImpl.java | 16 +++++++++- .../imps/TestCreateReturningStat.java | 30 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) 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 11050f3cd5..f79658424c 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 String call() throws Exception { 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 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 67a960fb3b..034791d7d8 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 @@ -53,6 +53,36 @@ private void compare(CuratorFramework client, String path, Assert.assertEquals(queriedStat, expected); } + @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()); + Assert.assertEquals(versionZeroStat.getCtime(), versionOneStat.getCtime()); + Assert.assertEquals(versionZeroStat.getCversion(), versionOneStat.getCversion()); + Assert.assertEquals(versionZeroStat.getCzxid(), versionOneStat.getCzxid()); + Assert.assertEquals(versionZeroStat.getDataLength(), versionOneStat.getDataLength()); + Assert.assertEquals(versionZeroStat.getEphemeralOwner(), versionOneStat.getEphemeralOwner()); + Assert.assertTrue(versionZeroStat.getMtime() <= versionOneStat.getMtime()); + Assert.assertNotEquals(versionZeroStat.getMzxid(), versionOneStat.getMzxid()); + Assert.assertEquals(versionZeroStat.getNumChildren(), versionOneStat.getNumChildren()); + Assert.assertEquals(versionZeroStat.getPzxid(), versionOneStat.getPzxid()); + Assert.assertEquals(1, versionOneStat.getVersion()); + } + } + @Test public void testCreateReturningStat() throws Exception { From c86ca97326bc68e63b6b10c913cd8e73c0d57d7e Mon Sep 17 00:00:00 2001 From: Cam McKenzie Date: Wed, 13 Sep 2017 09:48:18 +1000 Subject: [PATCH 2/2] CURATOR-431 - Clean up stat population -Modified the population of the stat object to use DataTree#copyStat() --- .../framework/imps/CreateBuilderImpl.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) 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 f79658424c..b2a3fbc10b 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.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 void processResult(int rc, String path, Object ctx, String name, Stat sta 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 String call() throws Exception 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; }