tree data UPDATE different context node find support

Author: michalvasko

src/tree_data.c

@@ -1505,14 +1505,7 @@ lyd_create_attr(struct lyd_node *parent, struct lyd_attr **attr, const struct ly
     return LY_SUCCESS;
 }
 
-/**
- * @brief Check the equality of the two schemas from different contexts.
- *
- * @param schema1 of first node.
- * @param schema2 of second node.
- * @return 1 if the schemas are equal otherwise 0.
- */
-static ly_bool
+ly_bool
 lyd_compare_schema_equal(const struct lysc_node *schema1, const struct lysc_node *schema2)
 {
     if (!schema1 && !schema2) {
@@ -1521,7 +1514,9 @@ lyd_compare_schema_equal(const struct lysc_node *schema1, const struct lysc_node
         return 0;
     }
 
-    assert(schema1->module->ctx != schema2->module->ctx);
+    if (schema1->module->ctx == schema2->module->ctx) {
+        return (schema1 == schema2) ? 1 : 0;
+    }
 
     if (schema1->nodetype != schema2->nodetype) {
         return 0;
@@ -3177,10 +3172,11 @@ lyd_find_meta(const struct lyd_meta *first, const struct lys_module *module, con
 LIBYANG_API_DEF LY_ERR
 lyd_find_sibling_first(const struct lyd_node *siblings, const struct lyd_node *target, struct lyd_node **match)
 {
-    struct lyd_node **match_p, *iter, *dup = NULL, *parent;
+    struct lyd_node **match_p, *iter, *parent;
     ly_bool found;
 
     LY_CHECK_ARG_RET(NULL, target, LY_EINVAL);
+
     if (!siblings) {
         /* no data */
         if (match) {
@@ -3189,15 +3185,9 @@ lyd_find_sibling_first(const struct lyd_node *siblings, const struct lyd_node *t
         return LY_ENOTFOUND;
     }
 
-    if (LYD_CTX(siblings) != LYD_CTX(target)) {
-        /* create a duplicate in this context */
-        LY_CHECK_RET(lyd_dup_single_to_ctx(target, lyd_dup_get_top_ctx(siblings), NULL, 0, &dup));
-        target = dup;
-    }
-
-    if ((siblings->schema && target->schema && (lysc_data_parent(siblings->schema) != lysc_data_parent(target->schema)))) {
+    if ((siblings->schema && target->schema &&
+            !lyd_compare_schema_equal(lysc_data_parent(siblings->schema), lysc_data_parent(target->schema)))) {
         /* schema mismatch */
-        lyd_free_tree(dup);
         if (match) {
             *match = NULL;
         }
@@ -3214,7 +3204,9 @@ lyd_find_sibling_first(const struct lyd_node *siblings, const struct lyd_node *t
         if (lysc_is_dup_inst_list(target->schema)) {
             /* we must search the instances from beginning to find the first matching one */
             found = 0;
-            LYD_LIST_FOR_INST(siblings, target->schema, iter) {
+            for (lyd_find_sibling_val(siblings, target->schema, NULL, 0, &iter);
+                    iter && lyd_compare_schema_equal(iter->schema, target->schema);
+                    iter = iter->next) {
                 if (!lyd_compare_single(target, iter, LYD_COMPARE_FULL_RECURSION)) {
                     found = 1;
                     break;
@@ -3249,7 +3241,6 @@ lyd_find_sibling_first(const struct lyd_node *siblings, const struct lyd_node *t
         }
     }
 
-    lyd_free_tree(dup);
     if (!siblings) {
         if (match) {
             *match = NULL;

src/tree_data_hash.c

@@ -25,6 +25,7 @@
 #include "plugins_types.h"
 #include "tree.h"
 #include "tree_data.h"
+#include "tree_data_internal.h"
 #include "tree_schema.h"
 
 LY_ERR
@@ -108,7 +109,7 @@ lyd_hash_table_val_equal(void *val1_p, void *val2_p, ly_bool mod, void *UNUSED(c
         if (!lyd_compare_single(val1, val2, 0)) {
             return 1;
         }
-    } else if (val1->schema == val2->schema) {
+    } else if (lyd_compare_schema_equal(val1->schema, val2->schema)) {
         /* just schema match */
         return 1;
     }

src/tree_data_internal.h

@@ -581,6 +581,15 @@ LY_ERR lyd_create_attr(struct lyd_node *parent, struct lyd_attr **attr, const st
         uint32_t name_len, const char *prefix, uint32_t prefix_len, const char *module_key, uint32_t module_key_len,
         const char *value, uint32_t value_len, ly_bool *dynamic, LY_VALUE_FORMAT format, void *val_prefix_data, uint32_t hints);
 
+/**
+ * @brief Check the equality of the two schemas.
+ *
+ * @param schema1 Schema of first node.
+ * @param schema2 Schema of second node.
+ * @return 1 if the schemas are equal otherwise 0.
+ */
+ly_bool lyd_compare_schema_equal(const struct lysc_node *schema1, const struct lysc_node *schema2);
+
 /**
  * @brief Store and canonize the given @p value into @p val according to the schema node type rules.
  *