Merge lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba

[Cezar Andrei]

Fix deep-equal bug 1090083.

Fix deep-equal bug 1090083.

[Cezar Andrei (cezar-andrei)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1090083-deepEqual-2013-04-11T23-43-00.553Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1090083-deepEqual-2013-04-11T23-43-00.553Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1090083-deepEqual-2013-04-15T13-13-51.893Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1090083-deepEqual-2013-04-15T13-13-51.893Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-03-26 18:10:32 +0000
+++ src/runtime/sequences/sequences_impl.cpp	2013-04-11 23:41:34 +0000
@@ -926,6 +926,17 @@
       if (! item1->getNodeName()->equals(item2->getNodeName()))
         return false;
 
+      TypeManager* tm = sctx->get_typemanager();
+
+      xqtref_t type1 = tm->create_value_type(item1.getp());
+      xqtref_t type2 = tm->create_value_type(item2.getp());
+
+      const NodeXQType* nodeType1 = static_cast<const NodeXQType *>(type1.getp());
+      const NodeXQType* nodeType2 = static_cast<const NodeXQType *>(type2.getp());
+
+      if ( nodeType1->get_content_type()->content_kind() != nodeType2->get_content_type()->content_kind() )
+        return false;
+
       return (DeepEqualAttributes(loc,
                                   sctx,
                                   dctx,
@@ -1093,6 +1104,13 @@
       item1->isJSONArray() != item2->isJSONArray())
     return false;
 
+
+  xqtref_t type1 = tm->create_value_type(item1.getp());
+  xqtref_t type2 = tm->create_value_type(item2.getp());
+
+  if ( type1->content_kind() != type2->content_kind() )
+    return false;
+
   if (item1->isAtomic())
   {
     assert(item2->isAtomic());
@@ -1102,9 +1120,6 @@
       collator = sctx->get_default_collator(QueryLoc::null);
 
     // check NaN
-    xqtref_t type1 = tm->create_value_type(item1.getp());
-    xqtref_t type2 = tm->create_value_type(item2.getp());
-
     if (((TypeOps::is_subtype(tm, *type1, *rtm.FLOAT_TYPE_ONE)
           &&
           item1->getFloatValue().isNaN())

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-11 18:13:48 +0000
+++ test/fots/CMakeLists.txt	2013-04-11 23:41:34 +0000
@@ -130,8 +130,6 @@
 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-36 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
-EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-38 0)
-EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-39 0)
 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)