commit 63b79c8c2575277bf911dfed5164d85eef59643a
author Radek Krejci <rkrejci@cesnet.cz> Wed Aug 10 10:09:33 2016 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Wed Aug 10 10:09:33 2016 +0200
tree 45846015025f931ffdbbaf473264ece3c0628446
parent 49d4617bf326253ccbce1afe87f2cece441b0da7

validation CHANGE checking list/leaflist duplicities

Optimize implementation and instead of comparing nodes to each other,
use hashtable to detect duplicities. To minimize memory consumption,
the hash tables are not stored permanently, but build when validating
the data tree.

src/parser_xml.c

diff --git a/src/parser_xml.c b/src/parser_xml.c
index 7d26988..ad2e7d1 100644
--- a/src/parser_xml.c
+++ b/src/parser_xml.c
@@ -463,7 +463,12 @@
     }
 
     /* validation successful */
-    (*result)->validity = LYD_VAL_OK;
+    if ((*result)->schema->nodetype & (LYS_LIST | LYS_LEAFLIST)) {
+        /* postpone checking when there will be all list/leaflist instances */
+        (*result)->validity = LYD_VAL_UNIQUE;
+    } else {
+        (*result)->validity = LYD_VAL_OK;
+    }
 
     return ret;
 
@@ -488,11 +493,12 @@
 lyd_parse_xml(struct ly_ctx *ctx, struct lyxml_elem **root, int options, ...)
 {
     va_list ap;
-    int r;
+    int r, i;
     struct unres_data *unres = NULL;
     struct lys_node *rpc_act = NULL;
     struct lyd_node *result = NULL, *iter, *last, *reply_parent = NULL, *action = NULL;
     struct lyxml_elem *xmlstart, *xmlelem, *xmlaux;
+    struct ly_set *set;
 
     ly_errno = LY_SUCCESS;
 
@@ -573,6 +579,28 @@
         }
     }
 
+    /* check for uniquness of top-level lists/leaflists because
+     * only the inner instances were tested in lyv_data_content() */
+    set = ly_set_new();
+    LY_TREE_FOR(result, iter) {
+        if (!(iter->schema->nodetype & (LYS_LIST | LYS_LEAFLIST)) || !(iter->validity & LYD_VAL_UNIQUE)) {
+            continue;
+        }
+
+        /* check each list/leaflist only once */
+        i = set->number;
+        if (ly_set_add(set, iter->schema, 0) != i) {
+            /* already checked */
+            continue;
+        }
+
+        if (lyv_data_unique(iter, result)) {
+            ly_set_free(set);
+            goto error;
+        }
+    }
+    ly_set_free(set);
+
     /* check for missing top level mandatory nodes */
     if (!(options & LYD_OPT_TRUSTED) && lyd_check_topmandatory(result, ctx, options)) {
         goto error;