From 95261f2acd835b1c2f8ef4da96bd8ad18eec30b3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 20 Sep 2017 17:10:03 +0200 Subject: [PATCH] Rename recursive INode methods Change names to conform to Java standards: - rec_insert -> recInsert - rec_insertif -> recInsertIf - rec_lookup -> recLookup - rec_remove -> recRemove Change-Id: Ic11da9ac2ae96d8029d0bb08464033bfe027ee0b Signed-off-by: Robert Varga --- .../opendaylight/yangtools/triemap/INode.java | 34 +++++++++---------- .../yangtools/triemap/MutableTrieMap.java | 6 ++-- .../yangtools/triemap/TrieMap.java | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java index ebd6b7f395..a24584e209 100644 --- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java +++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java @@ -126,12 +126,12 @@ final class INode extends BasicNode { * * @return true if successful, false otherwise */ - boolean rec_insert(final K key, final V value, final int hc, final int lev, final INode parent, + boolean recInsert(final K key, final V value, final int hc, final int lev, final INode parent, final TrieMap ct) { - return rec_insert(key, value, hc, lev, parent, gen, ct); + return recInsert(key, value, hc, lev, parent, gen, ct); } - private boolean rec_insert(final K k, final V v, final int hc, final int lev, final INode parent, + private boolean recInsert(final K k, final V v, final int hc, final int lev, final INode parent, final Gen startgen, final TrieMap ct) { while (true) { final MainNode m = GCAS_READ(ct); @@ -151,7 +151,7 @@ final class INode extends BasicNode { if (cnAtPos instanceof INode) { final INode in = (INode) cnAtPos; if (startgen == in.gen) { - return in.rec_insert(k, v, hc, lev + LEVEL_BITS, this, startgen, ct); + return in.recInsert(k, v, hc, lev + LEVEL_BITS, this, startgen, ct); } if (GCAS(cn, cn.renewed(startgen, ct), ct)) { // Tail recursion: return rec_insert(k, v, hc, lev, parent, startgen, ct); @@ -214,14 +214,14 @@ final class INode extends BasicNode { * @return null if unsuccessful, Option[V] otherwise (indicating * previous value bound to the key) */ - Optional rec_insertif(final K k, final V v, final int hc, final Object cond, final int lev, + Optional recInsertIf(final K k, final V v, final int hc, final Object cond, final int lev, final INode parent, final TrieMap ct) { - return rec_insertif(k, v, hc, cond, lev, parent, gen, ct); + return recInsertIf(k, v, hc, cond, lev, parent, gen, ct); } @SuppressFBWarnings(value = "NP_OPTIONAL_RETURN_NULL", justification = "Returning null Optional indicates the need to restart.") - private Optional rec_insertif(final K k, final V v, final int hc, final Object cond, final int lev, + private Optional recInsertIf(final K k, final V v, final int hc, final Object cond, final int lev, final INode parent, final Gen startgen, final TrieMap ct) { while (true) { final MainNode m = GCAS_READ(ct); @@ -241,7 +241,7 @@ final class INode extends BasicNode { if (cnAtPos instanceof INode) { final INode in = (INode) cnAtPos; if (startgen == in.gen) { - return in.rec_insertif(k, v, hc, cond, lev + LEVEL_BITS, this, startgen, ct); + return in.recInsertIf(k, v, hc, cond, lev + LEVEL_BITS, this, startgen, ct); } if (GCAS(cn, cn.renewed(startgen, ct), ct)) { @@ -355,11 +355,11 @@ final class INode extends BasicNode { * @return null if no value has been found, RESTART if the operation * wasn't successful, or any other value otherwise */ - Object rec_lookup(final K k, final int hc, final int lev, final INode parent, final TrieMap ct) { - return rec_lookup(k, hc, lev, parent, gen, ct); + Object recLookup(final K k, final int hc, final int lev, final INode parent, final TrieMap ct) { + return recLookup(k, hc, lev, parent, gen, ct); } - private Object rec_lookup(final K k, final int hc, final int lev, final INode parent, final Gen startgen, + private Object recLookup(final K k, final int hc, final int lev, final INode parent, final Gen startgen, final TrieMap ct) { while (true) { final MainNode m = GCAS_READ(ct); @@ -382,7 +382,7 @@ final class INode extends BasicNode { if (sub instanceof INode) { final INode in = (INode) sub; if (ct.isReadOnly() || (startgen == in.gen)) { - return in.rec_lookup(k, hc, lev + LEVEL_BITS, this, startgen, ct); + return in.recLookup(k, hc, lev + LEVEL_BITS, this, startgen, ct); } if (GCAS(cn, cn.renewed(startgen, ct), ct)) { @@ -439,14 +439,14 @@ final class INode extends BasicNode { * @return null if not successful, an Optional indicating the previous * value otherwise */ - Optional rec_remove(final K k, final Object cond, final int hc, final int lev, final INode parent, + Optional recRemove(final K k, final Object cond, final int hc, final int lev, final INode parent, final TrieMap ct) { - return rec_remove(k, cond, hc, lev, parent, gen, ct); + return recRemove(k, cond, hc, lev, parent, gen, ct); } @SuppressFBWarnings(value = "NP_OPTIONAL_RETURN_NULL", justification = "Returning null Optional indicates the need to restart.") - private Optional rec_remove(final K k, final Object cond, final int hc, final int lev, final INode parent, + private Optional recRemove(final K k, final Object cond, final int hc, final int lev, final INode parent, final Gen startgen, final TrieMap ct) { final MainNode m = GCAS_READ(ct); @@ -465,10 +465,10 @@ final class INode extends BasicNode { if (sub instanceof INode) { final INode in = (INode) sub; if (startgen == in.gen) { - res = in.rec_remove(k, cond, hc, lev + LEVEL_BITS, this, startgen, ct); + res = in.recRemove(k, cond, hc, lev + LEVEL_BITS, this, startgen, ct); } else { if (GCAS(cn, cn.renewed(startgen, ct), ct)) { - res = rec_remove(k, cond, hc, lev, parent, startgen, ct); + res = recRemove(k, cond, hc, lev, parent, startgen, ct); } else { res = null; } diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MutableTrieMap.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MutableTrieMap.java index a93e3a11dc..adbf4997f0 100644 --- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MutableTrieMap.java +++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MutableTrieMap.java @@ -172,7 +172,7 @@ public final class MutableTrieMap extends TrieMap { private void inserthc(final K key, final int hc, final V value) { // TODO: this is called from serialization only, which means we should not be observing any races, // hence we should not need to pass down the entire tree, just equality (I think). - final boolean success = RDCSS_READ_ROOT().rec_insert(key, value, hc, 0, null, this); + final boolean success = RDCSS_READ_ROOT().recInsert(key, value, hc, 0, null, this); Verify.verify(success, "Concurrent modification during serialization of map %s", this); } @@ -180,7 +180,7 @@ public final class MutableTrieMap extends TrieMap { Optional res; do { // Keep looping as long as we do not get a reply - res = RDCSS_READ_ROOT().rec_insertif(key, value, hc, cond, 0, null, this); + res = RDCSS_READ_ROOT().recInsertIf(key, value, hc, cond, 0, null, this); } while (res == null); return res; @@ -190,7 +190,7 @@ public final class MutableTrieMap extends TrieMap { Optional res; do { // Keep looping as long as we do not get a reply - res = RDCSS_READ_ROOT().rec_remove(key, cond, hc, 0, null, this); + res = RDCSS_READ_ROOT().recRemove(key, cond, hc, 0, null, this); } while (res == null); return res; diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java index eb23f3a36b..503572bd1d 100644 --- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java +++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java @@ -220,7 +220,7 @@ public abstract class TrieMap extends AbstractMap implements Concurr Object res; do { // Keep looping as long as RESTART is being indicated - res = RDCSS_READ_ROOT().rec_lookup(key, hc, 0, null, this); + res = RDCSS_READ_ROOT().recLookup(key, hc, 0, null, this); } while (res == RESTART); return (V) res; -- 2.36.6