Merge lp:~zorba-coders/zorba/bug-1111487 into lp:zorba

[Ghislain Fourny]

Fixing bug 1111487 (db:edit swaps).

Fixing bug 1111487 (db:edit swaps).

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1111487-2013-01-31T14-17-24.185Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1111487-2013-01-31T14-17-24.185Z 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. Got: 2 Pending.

[Till Westmann (tillw)]

review: Approve

[Dennis Knochenwefel (dennis-knochenwefel)]

- could we add a test for this?
- could you add a Changelog entry

thanks

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1111487]

11216. By Ghislain Fourny on 2013-04-08

Merge trunk back.

11217. By Ghislain Fourny on 2013-04-08

Adding back test.

11218. By Ghislain Fourny on 2013-04-08

Fixed bug 1102997.

11219. By Ghislain Fourny on 2013-04-08

Updated ChangeLog.

[Ghislain Fourny (gislenius)]

I updated the ChangeLog.

[lp:~zorba-coders/zorba/bug-1111487]

11220. By Ghislain Fourny on 2013-04-10

Fixed conflict and merged trunk back.

[Dennis Knochenwefel (dennis-knochenwefel)]

review: Approve

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1111487-2013-04-16T09-27-11.147Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1111487-2013-04-16T09-27-11.147Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-10 10:13:31 +0000
+++ ChangeLog	2013-04-10 12:19:24 +0000
@@ -38,6 +38,8 @@
   * Extented index join  rule to general flwor expressions. 
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1102997 (Swapping referenced nodes)
+  * Fixed bug #1111487 (Swapping nodes that are in collections)
   * Fixed bug #1123836 (overflows in date/time casts now return FODT0001 and
     in durations return FODT0002)
   * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2013-03-07 10:10:10 +0000
+++ src/store/naive/node_items.cpp	2013-04-10 12:19:24 +0000
@@ -796,20 +796,12 @@
   assert(theParent == NULL);
   assert(lOtherItem->theParent == NULL);
 
-  // Swap flags expect hasReference.
-  bool lHasReference = haveReference();
-  bool lOtherHasReference = lOtherItem->haveReference();
-  std::swap(theFlags, lOtherItem->theFlags);
-  if(lHasReference)
-  {
-    setHaveReference();
-  }
-  if(lOtherHasReference)
-  {
-    setHaveReference();
-  }
-  
-  // Swap root nodes and adjust type maps.
+  // But some things must be "unswapped"
+  std::swap(getTree()->theCollectionInfo, lOtherItem->getTree()->theCollectionInfo);
+  std::swap(getTree()->theTreeId, lOtherItem->getTree()->theTreeId);
+
+  // Before unswapping root nodes as well, their references in the type maps
+  // must be erased.
   store::Item_t lRootNodeType;
   store::Item_t lOtherRootNodeType;
   bool lRootHasType = getTree()->theTypesMap->get(
@@ -825,7 +817,11 @@
     lOtherItem->getTree()->theTypesMap->erase(
         lOtherItem->getTree()->theRootNode);
   }
+
+  // Now unswapping root nodes.
   std::swap(getTree()->theRootNode, lOtherItem->getTree()->theRootNode);
+
+  // And putting references back into the type maps.
   if(lRootHasType)
   {
     getTree()->theTypesMap->insert(getTree()->theRootNode, lRootNodeType);
@@ -836,10 +832,23 @@
         lOtherItem->getTree()->theRootNode, lOtherRootNodeType);
   }
 
-  // Adjust trees.
-#ifndef EMBEDED_TYPE
-  std::swap(getTree()->theTypesMap, lOtherItem->getTree()->theTypesMap);
-#endif
+  // Swap flags expect hasReference.
+  bool lHasReference = haveReference();
+  bool lOtherHasReference = lOtherItem->haveReference();
+  std::swap(theFlags, lOtherItem->theFlags);
+  if(lHasReference)
+  {
+    setHaveReference();
+  } else {
+    resetHaveReference();
+  }
+  if(lOtherHasReference)
+  {
+    lOtherItem->setHaveReference();
+  } else {
+    lOtherItem->resetHaveReference();
+  }
+
 }
 
 

=== added file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_005.xq'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_005.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_005.xq	2013-04-10 12:19:24 +0000
@@ -0,0 +1,17 @@
+import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";
+
+import module namespace ns = "http://www.example.com/example" at "../collection_001.xqdata";
+
+ddl:create(xs:QName("ns:collection"));
+
+dml:insert(xs:QName("ns:collection"), (<a/>, <b/>, <c/>));
+
+variable $old := ref:node-reference(dml:collection(xs:QName("ns:collection"))[2]);
+
+dml:edit(dml:collection(xs:QName("ns:collection"))[2], <d/>);
+
+variable $new := ref:node-reference(dml:collection(xs:QName("ns:collection"))[2]);
+
+$old eq $new