schema compile UPDATE fix disabled list unique nodes

... instead of producing an error. The error could
be avoided for nodes diabled by a deviation but not
when disabled by a feature.

Refs #2217

Author: michalvasko

src/schema_compile.c

@@ -1218,8 +1218,9 @@ static LY_ERR
 lys_compile_unres_check_disabled(const struct lysc_node *node)
 {
     const struct lysc_node *parent;
-    const struct lysc_node_list *slist;
+    struct lysc_node_list *slist;
     LY_ARRAY_COUNT_TYPE u, v;
+    int found;
 
     if (node->flags & LYS_KEY) {
         LOG_LOCSET(node, NULL);
@@ -1233,16 +1234,42 @@ lys_compile_unres_check_disabled(const struct lysc_node *node)
             continue;
         }
 
-        /* check list uniques */
+        /* check and fix list uniques */
         slist = (struct lysc_node_list *)parent;
+        found = 0;
         LY_ARRAY_FOR(slist->uniques, u) {
             LY_ARRAY_FOR(slist->uniques[u], v) {
                 if (slist->uniques[u][v] == (struct lysc_node_leaf *)node) {
-                    LOG_LOCSET(node, NULL);
-                    LOGVAL(node->module->ctx, LYVE_REFERENCE, "Disabled node \"%s\" is referenced as unique in the list \"%s\".",
-                            node->name, slist->name);
-                    LOG_LOCBACK(1, 0);
-                    return LY_EVALID;
+                    found = 1;
+                    break;
+                }
+            }
+
+            if (found) {
+                break;
+            }
+        }
+
+        if (found) {
+            if (LY_ARRAY_COUNT(slist->uniques[u]) > 1) {
+                /* remove the item */
+                if (v < LY_ARRAY_COUNT(slist->uniques[u]) - 1) {
+                    memmove(&slist->uniques[u][v], &slist->uniques[u][v + 1],
+                            (LY_ARRAY_COUNT(slist->uniques[u]) - v - 1) * sizeof slist->uniques[u][v]);
+                }
+                LY_ARRAY_DECREMENT(slist->uniques[u]);
+            } else {
+                /* remove the whole unique array */
+                LY_ARRAY_FREE(slist->uniques[u]);
+                if (LY_ARRAY_COUNT(slist->uniques) > 1) {
+                    if (u < LY_ARRAY_COUNT(slist->uniques) - 1) {
+                        memmove(&slist->uniques[u], &slist->uniques[u + 1],
+                                (LY_ARRAY_COUNT(slist->uniques) - u - 1) * sizeof slist->uniques[u]);
+                    }
+                    LY_ARRAY_DECREMENT(slist->uniques);
+                } else {
+                    LY_ARRAY_FREE(slist->uniques);
+                    slist->uniques = NULL;
                 }
             }
         }

tests/utests/schema/test_tree_schema_compile.c

@@ -4031,6 +4031,43 @@ test_must(void **state)
             "with context node \"/b:laa-config\".", NULL, 0);
 }
 
+static void
+test_unique_disabled(void **state)
+{
+    assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX,
+            "module list-unique {"
+            "  namespace urn:lu;"
+            "  prefix lu;"
+            "  feature f;"
+            "  list l {"
+            "    key \"k\";"
+            "    unique \"v\";"
+            "    leaf k {"
+            "      type string;"
+            "    }"
+            "    leaf v {"
+            "      if-feature f;"
+            "      type string;"
+            "    }"
+            "  }"
+            "  list l2 {"
+            "    key \"k\";"
+            "    unique \"v1 v2\";"
+            "    leaf k {"
+            "      type string;"
+            "    }"
+            "    leaf v1 {"
+            "      if-feature f;"
+            "      type string;"
+            "    }"
+            "    leaf v2 {"
+            "      type string;"
+            "    }"
+            "  }"
+            "}",
+            LYS_IN_YANG, NULL));
+}
+
 int
 main(void)
 {
@@ -4066,6 +4103,7 @@ main(void)
         UTEST(test_deviation, setup),
         UTEST(test_when, setup),
         UTEST(test_must, setup),
+        UTEST(test_unique_disabled, setup),
     };
 
     return cmocka_run_group_tests(tests, NULL, NULL);