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 <cammcken...@apache.org> Authored: Tue Sep 12 08:58:47 2017 +1000 Committer: Cam McKenzie <cammcken...@apache.org> 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()); + 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 { CuratorFramework client = createClient();
