commit 47718298f8236e5a7dceec89b695265a27ce282d
author Michal Vasko <mvasko@cesnet.cz> Fri Feb 26 10:12:44 2021 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Fri Feb 26 12:48:19 2021 +0100
tree e7b89cfd7466d8c01a959c8df7767d050ea1c442
parent 2b5344cb15aaa0e6950d164442227e3e6639cc3a

data tree BUGFIX key-less list hash handling

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index 0b70249..6a1235c 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -2334,7 +2334,9 @@
         /* check for keyless list and update its hash */
         for (iter = lyd_parent(node); iter; iter = lyd_parent(iter)) {
             if (iter->schema && (iter->schema->flags & LYS_KEYLESS)) {
+                lyd_unlink_hash(iter);
                 lyd_hash(iter);
+                lyd_insert_hash(iter);
             }
         }
 

src/tree_data_hash.c

diff --git a/src/tree_data_hash.c b/src/tree_data_hash.c
index 622ce22..39c5fea 100644
--- a/src/tree_data_hash.c
+++ b/src/tree_data_hash.c
@@ -116,6 +116,17 @@
 }
 
 /**
+ * @brief Comparison callback for hash table that never considers 2 values equal.
+ *
+ * Implementation of ::lyht_value_equal_cb.
+ */
+static ly_bool
+lyd_not_equal_value_cb(void *UNUSED(val1_p), void *UNUSED(val2_p), ly_bool UNUSED(mod), void *UNUSED(cb_data))
+{
+    return 0;
+}
+
+/**
  * @brief Add single node into children hash table.
  *
  * @param[in] ht Children hash table.
@@ -126,6 +137,8 @@
 static LY_ERR
 lyd_insert_hash_add(struct hash_table *ht, struct lyd_node *node, ly_bool empty_ht)
 {
+    LY_ERR rc = LY_SUCCESS;
+    lyht_value_equal_cb orig_cb = NULL;
     uint32_t hash;
 
     assert(ht && node && node->schema);
@@ -133,7 +146,8 @@
     /* add node itself */
     if (lyht_insert(ht, &node, node->hash, NULL)) {
         LOGINT(LYD_CTX(node));
-        return LY_EINT;
+        rc = LY_EINT;
+        goto cleanup;
     }
 
     /* add first instance of a (leaf-)list */
@@ -148,18 +162,32 @@
         if (!empty_ht && node->next && (node->next->schema == node->schema)) {
             if (lyht_remove(ht, &node->next, hash)) {
                 LOGINT(LYD_CTX(node));
-                return LY_EINT;
+                rc = LY_EINT;
+                goto cleanup;
             }
         }
 
+        if (hash == node->hash) {
+            /* special case, key-less list with no children hash is equal to the first instance list hash */
+            assert((node->schema->nodetype == LYS_LIST) && (node->schema->flags & LYS_KEYLESS) && !lyd_child(node));
+
+            /* we must allow exact duplicates in the hash table */
+            orig_cb = lyht_set_cb(ht, lyd_not_equal_value_cb);
+        }
+
         /* insert this instance as the first (leaf-)list instance */
         if (lyht_insert(ht, &node, hash, NULL)) {
             LOGINT(LYD_CTX(node));
-            return LY_EINT;
+            rc = LY_EINT;
+            goto cleanup;
         }
     }
 
-    return LY_SUCCESS;
+cleanup:
+    if (orig_cb) {
+        lyht_set_cb(ht, orig_cb);
+    }
+    return rc;
 }
 
 LY_ERR