Remove BasicNode.string()

This method is not used anywhere, remove it and take all commented-out
support code with it.

Change-Id: I24720c16f562fd391894484566903f1a526ad202
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/BasicNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/BasicNode.java
index 95169802df7000aca1a7fde61f23352ab4a82f67..289d719c6e1f510d9cbb8b6697fc3c3e23dc54e2 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/BasicNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/BasicNode.java
@@ -17,5 +17,4 @@ package org.opendaylight.yangtools.triemap;
 
 abstract class BasicNode {
 
-    abstract String string(int lev);
 }
\ No newline at end of file

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
index 12a8fb74ed95152db03f955f2cd94891c4d17aec..412d9f9fde258beca824430ec7ede0e3d84919e4 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
@@ -202,37 +202,6 @@ final class CNode<K, V> extends MainNode<K, V> {
         return inodemain instanceof TNode ? ((TNode<?, ?>) inodemain).copyUntombed() : inode;
     }
 
-    @Override
-    String string(final int lev) {
-        // "CNode %x\n%s".format(bitmap, array.map(_.string(lev +
-        // 1)).mkString("\n"));
-        return "CNode";
-    }
-
-    /*
-     * quiescently consistent - don't call concurrently to anything
-     * involving a GCAS!!
-     */
-    // protected Seq<K,V> collectElems() {
-    // array flatMap {
-    // case sn: SNode[K, V] => Some(sn.kvPair)
-    // case in: INode[K, V] => in.mainnode match {
-    // case tn: TNode[K, V] => Some(tn.kvPair)
-    // case ln: LNode[K, V] => ln.listmap.toList
-    // case cn: CNode[K, V] => cn.collectElems
-    // }
-    // }
-    // }
-
-    // protected Seq<String> collectLocalElems() {
-    // // array flatMap {
-    // // case sn: SNode[K, V] => Some(sn.kvPair._2.toString)
-    // // case in: INode[K, V] => Some(in.toString.drop(14) + "(" + in.gen +
-    // ")")
-    // // }
-    // return null;
-    // }
-
     @Override
     public String toString() {
         // val elems = collectLocalElems

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
index ae292d5721c5d77c87b0dd0e7e2f83950d7ac559..726bff9490ee45b4a9d84bb83f20f7416b277314 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
@@ -23,11 +23,6 @@ final class FailedNode<K, V> extends MainNode<K, V> {
         this.p = p;
     }
 
-    @Override
-    String string(final int lev) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     int trySize() {
         throw new UnsupportedOperationException();

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 3e159173ff962799311cbd2c293b8ce22ecbcc6d..ebd6b7f3950f74cf65f3ec449bd75654c47b754c 100644 (file)
--- 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
@@ -134,7 +134,7 @@ final class INode<K, V> extends BasicNode {
     private boolean rec_insert(final K k, final V v, final int hc, final int lev, final INode<K, V> parent,
             final Gen startgen, final TrieMap<K, V> ct) {
         while (true) {
-            final MainNode<K, V> m = GCAS_READ(ct); // use -Yinline!
+            final MainNode<K, V> m = GCAS_READ(ct);
 
             if (m instanceof CNode) {
                 // 1) a multiway node
@@ -224,7 +224,7 @@ final class INode<K, V> extends BasicNode {
     private Optional<V> rec_insertif(final K k, final V v, final int hc, final Object cond, final int lev,
             final INode<K, V> parent, final Gen startgen, final TrieMap<K, V> ct) {
         while (true) {
-            final MainNode<K, V> m = GCAS_READ(ct); // use -Yinline!
+            final MainNode<K, V> m = GCAS_READ(ct);
 
             if (m instanceof CNode) {
                 // 1) a multiway node
@@ -362,7 +362,7 @@ final class INode<K, V> extends BasicNode {
     private Object rec_lookup(final K k, final int hc, final int lev, final INode<K, V> parent, final Gen startgen,
             final TrieMap<K, V> ct) {
         while (true) {
-            final MainNode<K, V> m = GCAS_READ(ct); // use -Yinline!
+            final MainNode<K, V> m = GCAS_READ(ct);
 
             if (m instanceof CNode) {
                 // 1) a multinode
@@ -448,7 +448,7 @@ final class INode<K, V> extends BasicNode {
             justification = "Returning null Optional indicates the need to restart.")
     private Optional<V> rec_remove(final K k, final Object cond, final int hc, final int lev, final INode<K, V> parent,
             final Gen startgen, final TrieMap<K, V> ct) {
-        final MainNode<K, V> m = GCAS_READ(ct); // use -Yinline!
+        final MainNode<K, V> m = GCAS_READ(ct);
 
         if (m instanceof CNode) {
             final CNode<K, V> cn = (CNode<K, V>) m;
@@ -545,15 +545,13 @@ final class INode<K, V> extends BasicNode {
 
             final int pos = Integer.bitCount(bmp & (flag - 1));
             final BasicNode sub = cn.array[pos];
-            if (sub == this) {
-                if (nonlive instanceof TNode) {
-                    final TNode<?, ?> tn = (TNode<?, ?>) nonlive;
-                    final MainNode<K, V> ncn = cn.updatedAt(pos, tn.copyUntombed(), gen).toContracted(lev - LEVEL_BITS);
-                    if (!parent.GCAS(cn, ncn, ct)) {
-                        if (ct.readRoot().gen == startgen) {
-                            // Tail recursion: cleanParent(nonlive, parent, ct, hc, lev, startgen);
-                            continue;
-                        }
+            if (sub == this && nonlive instanceof TNode) {
+                final TNode<?, ?> tn = (TNode<?, ?>) nonlive;
+                final MainNode<K, V> ncn = cn.updatedAt(pos, tn.copyUntombed(), gen).toContracted(lev - LEVEL_BITS);
+                if (!parent.GCAS(cn, ncn, ct)) {
+                    if (ct.readRoot().gen == startgen) {
+                        // Tail recursion: cleanParent(nonlive, parent, ct, hc, lev, startgen);
+                        continue;
                     }
                 }
             }
@@ -572,20 +570,4 @@ final class INode<K, V> extends BasicNode {
     int size(final ImmutableTrieMap<?, ?> ct) {
         return GCAS_READ(ct).size(ct);
     }
-
-    // /* this is a quiescent method! */
-    // def string(lev: Int) = "%sINode -> %s".format("  " * lev, mainnode
-    // match {
-    // case null => "<null>"
-    // case tn: TNode[_, _] => "TNode(%s, %s, %d, !)".format(tn.k, tn.v,
-    // tn.hc)
-    // case cn: CNode[_, _] => cn.string(lev)
-    // case ln: LNode[_, _] => ln.string(lev)
-    // case x => "<elem: %s>".format(x)
-    // })
-
-    @Override
-    String string(final int lev) {
-        return "INode";
-    }
 }

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/LNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/LNode.java
index 04d01709192c51a5b482d3793068a8a12ea1f949..1235323f99771d61fdf16baf29eb1cdc2c29d7b5 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/LNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/LNode.java
@@ -69,10 +69,4 @@ final class LNode<K, V> extends MainNode<K, V> {
     int size(final ImmutableTrieMap<?, ?> ct) {
         return size;
     }
-
-    @Override
-    String string(final int lev) {
-        // (" " * lev) + "LNode(%s)".format(listmap.mkString(", "))
-        return "LNode";
-    }
 }

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/SNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/SNode.java
index d11a592ea54196210a2d0dc9a80434d2a7a8a503..880b61ffd5b1e1a7fcbc9ee1da734fbab2a61dfb 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/SNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/SNode.java
@@ -40,12 +40,6 @@ final class SNode<K, V> extends BasicNode implements EntryNode<K, V> {
         return new SNode<>(key, value, hc);
     }
 
-    @Override
-    String string(final int lev) {
-        // ("  " * lev) + "SNode(%s, %s, %x)".format(k, v, hc);
-        return "SNode";
-    }
-
     @Override
     public K getKey() {
         return key;

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TNode.java
index 591d0b0b7996c2831d91055be2e8ce246cf98276..aa6c7d980216234f442e48772c2e7a89bc3af36c 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TNode.java
@@ -50,12 +50,6 @@ final class TNode<K, V> extends MainNode<K, V> implements EntryNode<K, V> {
         return 1;
     }
 
-    @Override
-    String string(final int lev) {
-        // ("  " * lev) + "TNode(%s, %s, %x, !)".format(k, v, hc);
-        return "TNode";
-    }
-
     @Override
     public K getKey() {
         return key;