File patch.2.4.13.2 of Package dbxml-2.4

Overview Repositories Revisions Requests Users Attributes Meta

File patch.2.4.13.2 of Package dbxml-2.4 (Revision cec0344f9ce18310f807a8ce81ae3a04)

Currently displaying revision cec0344f9ce18310f807a8ce81ae3a04 , Show latest

diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.cpp dbxml-2.4.13/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.cpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.cpp
--- dbxml-2.4.13/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.cpp
***************
*** 35,41 ****
  	  xmlDoc_(0),
  	  doingSequence_(0),
  	  writer_(0),
! 	  seq_(context->getMemoryManager())
  {
  	rootNid_.setLen(0, false);
  }
--- 35,42 ----
  	  xmlDoc_(0),
  	  doingSequence_(0),
  	  writer_(0),
! 	  seq_(context->getMemoryManager()),
! 	  nextIsRoot_(false)
  {
  	rootNid_.setLen(0, false);
  }
***************
*** 80,88 ****
  	// get the "root" of the sequence and create a node
  	NsDomElement *root = ((Document&)xmlDoc_).getElement(NsNid(&rootNid_), 0);
  	DBXML_ASSERT(root);
- 	// Tell NsDom that this is the "root" of the tree, whether it's
- 	// a Document node or not
- 	root->setIsRoot();
  	
  	seq_.addItem(((DbXmlFactoryImpl*)context_->getItemFactory())->
  		     createNode(root, xmlDoc_, context_));
--- 81,86 ----
***************
*** 98,104 ****
--- 96,104 ----
  {
  	DBXML_ASSERT(!writer_);
  	DBXML_ASSERT(!doingSequence_);
+ 	DBXML_ASSERT(!nextIsRoot_);
  	writer_ = createWriter(xmlDoc_, context_, &rootNid_);
+ 	nextIsRoot_ = true;
  	doingSequence_++;
  	((Document*)xmlDoc_)->setDocumentURI(documentURI);
  	((Document*)xmlDoc_)->getNsDocument()->
***************
*** 121,131 ****
  					     const XMLCh *uri,
  					     const XMLCh *localname)
  {
! 	bool isRoot = false;
  	if (writer_ == 0) {
  		DBXML_ASSERT(!doingSequence_);
  		writer_ = createWriter(xmlDoc_, context_, 0);
! 		isRoot = true;
  	}
  	doingSequence_++;
  	XMLChToUTF8Null pfx(prefix);
--- 121,132 ----
  					     const XMLCh *uri,
  					     const XMLCh *localname)
  {
! 	bool initRootNid = false;
  	if (writer_ == 0) {
  		DBXML_ASSERT(!doingSequence_);
  		writer_ = createWriter(xmlDoc_, context_, 0);
! 		initRootNid = true;
! 		nextIsRoot_ = true;
  	}
  	doingSequence_++;
  	XMLChToUTF8Null pfx(prefix);
***************
*** 133,139 ****
  	XMLChToUTF8Null lname(localname);
  	writer_->writeStartElementInternal(lname.ucstr(), pfx.ucstr(),
  					   turi.ucstr(),
! 					   (isRoot ? &rootNid_ : 0));
  }
  
  void DbXmlSequenceBuilder::endElementEvent(const XMLCh *prefix,
--- 134,142 ----
  	XMLChToUTF8Null lname(localname);
  	writer_->writeStartElementInternal(lname.ucstr(), pfx.ucstr(),
  					   turi.ucstr(),
! 					   (initRootNid ? &rootNid_ : 0),
! 					   nextIsRoot_);
! 	nextIsRoot_ = false; // unconditionally clear
  }
  
  void DbXmlSequenceBuilder::endElementEvent(const XMLCh *prefix,
diff dbxml-2.4.13.orig/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.hpp dbxml-2.4.13/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.hpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.hpp
--- dbxml-2.4.13/dbxml/src/dbxml/dataItem/DbXmlSequenceBuilder.hpp
53a54
>        bool nextIsRoot_;
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsDom.cpp dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsDom.cpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsDom.cpp
--- dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsDom.cpp
***************
*** 102,108 ****
  			   NsDoc *document) :
  
  	NsDomNode(document), node_(node),
! 	lname_(0), isRoot_(false)
  {
  	if (isDocumentNode()) {
  		qname_.set(_nsDomDocName, false);
--- 102,108 ----
  			   NsDoc *document) :
  
  	NsDomNode(document), node_(node),
! 	lname_(0)
  {
  	if (isDocumentNode()) {
  		qname_.set(_nsDomDocName, false);
***************
*** 120,125 ****
--- 120,137 ----
  	return new NsDomElement(*node_, doc_);
  }
  
+ void NsDomElement::setIsRoot()
+ {
+ 	DBXML_ASSERT(node_);
+ 	node_->setIsRoot();
+ }
+ 
+ bool NsDomElement::isRoot() const
+ {
+ 	DBXML_ASSERT(node_);
+ 	return node_->isRoot();
+ }
+ 
  void NsDomElement::refreshNode(OperationContext &oc,
  			       bool forWrite)
  {
***************
*** 275,281 ****
  NsDomElement *
  NsDomElement::getElemParent()
  {
! 	if (isRoot_ || isDocumentNode())
  		return 0;
  	NsDomElement *ret = new NsDomElement(getParentNode(), doc_);
  	if (!ret)
--- 287,293 ----
  NsDomElement *
  NsDomElement::getElemParent()
  {
! 	if (isRoot() || isDocumentNode())
  		return 0;
  	NsDomElement *ret = new NsDomElement(getParentNode(), doc_);
  	if (!ret)
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsDom.hpp dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsDom.hpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsDom.hpp
--- dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsDom.hpp
***************
*** 155,167 ****
  		return node_->numAttrs();
  	}
  		
- 	
  	// TBD GMF Hack to indicate that a constructed element
  	// is the "root" of its tree -- i.e. don't navigate to
  	// the parent (document) node.  A better solution is to
  	// allow trees without a document node in node storage
! 	void setIsRoot() { isRoot_ = true; }
! 	bool isRoot() const { return isRoot_; }
  
  	//
  	// Navigational methods that operate on element nodes
--- 155,166 ----
  		return node_->numAttrs();
  	}
  		
  	// TBD GMF Hack to indicate that a constructed element
  	// is the "root" of its tree -- i.e. don't navigate to
  	// the parent (document) node.  A better solution is to
  	// allow trees without a document node in node storage
! 	void setIsRoot();
! 	bool isRoot() const;
  
  	//
  	// Navigational methods that operate on element nodes
***************
*** 190,196 ****
  	mutable NsString baseUri_;
  	mutable NsString uri_;
  	mutable NsString prefix_;
- 	bool isRoot_;
  };
  
  //
--- 189,194 ----
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsEventWriter.cpp dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsEventWriter.cpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsEventWriter.cpp
--- dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsEventWriter.cpp
***************
*** 576,582 ****
  void NsEventWriter::writeStartElementInternal(const unsigned char *localName,
  					      const unsigned char *prefix,
  					      const unsigned char *uri,
! 					      NsFullNid *nid)
  {
  	DBXML_ASSERT(!writer_);
  	DBXML_ASSERT(!_ewriter);
--- 576,582 ----
  void NsEventWriter::writeStartElementInternal(const unsigned char *localName,
  					      const unsigned char *prefix,
  					      const unsigned char *uri,
! 					      NsFullNid *nid, bool setIsRoot)
  {
  	DBXML_ASSERT(!writer_);
  	DBXML_ASSERT(!_ewriter);
***************
*** 589,594 ****
--- 589,596 ----
  		node->acquire();
  		if (nid)
  			nid->copyNid(node->getFullNid());
+ 		if (setIsRoot)
+ 			node->setIsRoot();
  		startElem(node, localName, (const char *)uri,
  			  (const char *)prefix, false);
  		isEmpty_ = false; // don't know if empty or not
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsEventWriter.hpp dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsEventWriter.hpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsEventWriter.hpp
--- dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsEventWriter.hpp
***************
*** 130,136 ****
  	void writeStartElementInternal(const unsigned char *localName,
  				       const unsigned char *prefix,
  				       const unsigned char *uri,
! 				       NsFullNid *nid);
  	void writeEndElementInternal();
  	void writeAttributeInternal(const unsigned char *localName,
  				    const unsigned char *prefix,
--- 130,136 ----
  	void writeStartElementInternal(const unsigned char *localName,
  				       const unsigned char *prefix,
  				       const unsigned char *uri,
! 				       NsFullNid *nid, bool setIsRoot);
  	void writeEndElementInternal();
  	void writeAttributeInternal(const unsigned char *localName,
  				    const unsigned char *prefix,
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsNode.hpp dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsNode.hpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/nodeStore/NsNode.hpp
--- dbxml-2.4.13/dbxml/src/dbxml/nodeStore/NsNode.hpp
***************
*** 279,285 ****
  	NS_HASTEXTCHILD =  0x00000008, /**< has a text child attached */
  	NS_HASNEXT =       0x00000010, /**< has next sibling */
  	NS_HASPREV =       0x00000020, /**< has prev sibling */
! 	NS_NOT_USED_1 =    0x00000040, /**< NOT USED */
  	NS_LAST_IS_LAST_DESC = 0x00000080, /**< last child is a leaf */
  	NS_NAMEPREFIX =    0x00000100, /**< name has a prefix */
  	NS_HASURI =        0x00000200, /**< has a namespace URI */
--- 279,286 ----
  	NS_HASTEXTCHILD =  0x00000008, /**< has a text child attached */
  	NS_HASNEXT =       0x00000010, /**< has next sibling */
  	NS_HASPREV =       0x00000020, /**< has prev sibling */
! 	NS_ISROOT =        0x00000040, /**< only set for constructed XML where node is the
! 					  root element */
  	NS_LAST_IS_LAST_DESC = 0x00000080, /**< last child is a leaf */
  	NS_NAMEPREFIX =    0x00000100, /**< name has a prefix */
  	NS_HASURI =        0x00000200, /**< has a namespace URI */
***************
*** 373,378 ****
--- 374,382 ----
  	bool isDoc() const {
  		return ((nd_header.nh_flags & NS_ISDOCUMENT) != 0);
  	}
+ 	bool isRoot() const {
+ 		return ((nd_header.nh_flags & NS_ISROOT) != 0);
+ 	}
  	bool hasChildElem() const {
  		return ((nd_header.nh_flags & NS_HASCHILD) != 0);
  	}
***************
*** 653,658 ****
--- 657,666 ----
  	void setIsDocument() {
  		setFlag(NS_ISDOCUMENT);
  	}
+ 
+ 	void setIsRoot() {
+ 		setFlag(NS_ISROOT);
+ 	}
  	
  	void setHasChildElem() {
  		setFlag(NS_HASCHILD);
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/Modify.hpp dbxml-2.4.13/dbxml/src/dbxml/Modify.hpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/Modify.hpp
--- dbxml-2.4.13/dbxml/src/dbxml/Modify.hpp
***************
*** 19,24 ****
--- 19,25 ----
  #include "ReferenceCounted.hpp"
  #include "nodeStore/NsDom.hpp"
  #include "UTF8.hpp"
+ #include "QueryExpression.hpp"
  
  #include <xercesc/parsers/XercesDOMParser.hpp>
  
diff -c dbxml-2.4.13.orig/dbxml/src/dbxml/RawNodeValue.cpp dbxml-2.4.13/dbxml/src/dbxml/RawNodeValue.cpp
*** dbxml-2.4.13.orig/dbxml/src/dbxml/RawNodeValue.cpp
--- dbxml-2.4.13/dbxml/src/dbxml/RawNodeValue.cpp
***************
*** 520,528 ****
  		doc->setID(did_);
  		doc->setContainerID(cid_);
  		doc->setTransaction(GET_RESULTS().getOperationContext().txn());
! 		if(cid_ == 0)
  			doc->setDbMinder(GET_RESULTS().getDbMinder());
! 		else
  			doc->setAsNotMaterialized();
  	}
  	return xdoc_;
--- 520,533 ----
  		doc->setID(did_);
  		doc->setContainerID(cid_);
  		doc->setTransaction(GET_RESULTS().getOperationContext().txn());
! 		if (cid_ == 0) {
  			doc->setDbMinder(GET_RESULTS().getDbMinder());
! 			//Set query constructed documents as DOM
! 			if(!doc->getDbMinder().isNull()) { 
! 				doc->getDocDb();
! 				doc->setContentAsNsDom(did_, doc->getCacheDatabase());
! 			}
! 		} else
  			doc->setAsNotMaterialized();
  	}
  	return xdoc_;
diff -c dbxml-2.4.13.orig/dbxml/src/java/dbxml_java_wrap.cpp dbxml-2.4.13/dbxml/src/java/dbxml_java_wrap.cpp
*** dbxml-2.4.13.orig/dbxml/src/java/dbxml_java_wrap.cpp
--- dbxml-2.4.13/dbxml/src/java/dbxml_java_wrap.cpp
***************
*** 464,470 ****
  	#include "../dbxml/RawNodeValue.hpp"
  	#include "../dbxml/Results.hpp"
  	#include "../dbxml/Document.hpp"
! 	#include "../dbxml/ScopedDbt.hpp"
  
  	using namespace DbXml;
      typedef struct
--- 464,471 ----
  	#include "../dbxml/RawNodeValue.hpp"
  	#include "../dbxml/Results.hpp"
  	#include "../dbxml/Document.hpp"
!         #include "../dbxml/ScopedDbt.hpp"
! 	#include "../dbxml/Modify.hpp"
  
  	using namespace DbXml;
      typedef struct
***************
*** 1309,1316 ****
  			    break;
  		    }
  		    default:
! 			    if(docid != 0)
! 				    (*cdoc).setAsNotMaterialized();
  		    }
  		    
  		    createCPPMetaData(jenv, jdoc, cdoc);
--- 1310,1324 ----
  			    break;
  		    }
  		    default:
! 			    if (docid != 0 && cid != 0)
!                                     (*cdoc).setAsNotMaterialized();
! 			    else if (!(*cdoc).getDbMinder().isNull() &&
! 				     cid == 0) {
! 				    //set query constructed documents as DOM
! 				    (*cdoc).getDocDb();
! 				    (*cdoc).setContentAsNsDom(
! 					    docid, (*cdoc).getCacheDatabase());
! 			    }
  		    }
  		    
  		    createCPPMetaData(jenv, jdoc, cdoc);
diff -ru dbxml-2.4.13-orig/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp
--- dbxml-2.4.13-orig/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp	2008-04-25 15:46:28.000000000 +0100
+++ dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp	2008-05-16 17:10:50.000000000 +0100
@@ -1321,7 +1321,7 @@
 		}
 	}

-	return ast;
+	return optimize(ast);
 }

QueryPlanGenerator::ReverseResult QueryPlanGenerator::reverseNav(XQNav::Steps::iterator i, XQNav::Steps::iterator end, const ReverseResult &context, const QName &contextName)
@@ -1450,7 +1450,7 @@

QueryPlanGenerator::ReverseResult QueryPlanGenerator::reverseVariable(XQVariable *item, const ReverseResult &context, const QName &contextName)
 {
-	if(!XPath2Utils::equals(item->getName(), contextName.name) ||
+	if(context.ast != 0 || !XPath2Utils::equals(item->getName(), contextName.name) ||
 		!XPath2Utils::equals(item->getURI(), contextName.uri))
 		return ReverseResult(reverseJoin(context, item, item), contextName);

diff -ru dbxml-2.4.13-orig/dbxml/src/dbxml/query/DecisionPointQP.cpp dbxml-2.4.13/dbxml/src/dbxml/query/DecisionPointQP.cpp
--- dbxml-2.4.13-orig/dbxml/src/dbxml/query/DecisionPointQP.cpp	2008-01-09 14:49:45.000000000 +0000
+++ dbxml-2.4.13/dbxml/src/dbxml/query/DecisionPointQP.cpp	2008-05-16 17:10:50.000000000 +0100
@@ -19,6 +19,7 @@
 #include "../optimizer/QueryPlanOptimizer.hpp"

#include <xqilla/context/DynamicContext.hpp>
+#include <xqilla/framework/XPath2MemoryManagerImpl.hpp>

#include <sstream>

@@ -151,8 +152,10 @@

// Save the compile time mutex, in case we need to just-in-time
 	// optimise at runtime
-	compileTimeMinder_ = GET_CONFIGURATION(opt.getContext())->getMinder();
-	compileTimeContext_ = opt.getContext();
+	if(compileTimeMinder_ == 0) {
+		compileTimeMinder_ = GET_CONFIGURATION(opt.getContext())->getMinder();
+		compileTimeContext_ = opt.getContext();
+	}

bool unknownContainers = true;
 	if(!qpListDone_ && opt.getPhase() == OptimizationContext::RESOLVE_INDEXES) {
@@ -246,21 +249,43 @@
 	combinations.push_back(result);
 }

+class AutoMemoryManagerReset
+{
+public:
+  AutoMemoryManagerReset(StaticContext* context, XPath2MemoryManager *mm)
+  {
+    context_ = context;
+    mm_ = context->getMemoryManager();
+    context->setMemoryManager(mm);
+  }
+
+  ~AutoMemoryManagerReset()
+  {
+    context_->setMemoryManager(mm_);
+  }
+
+protected:
+  StaticContext* context_;
+  XPath2MemoryManager *mm_;
+};
+
 DecisionPointQP::ListItem *DecisionPointQP::justInTimeOptimize(int contID, DynamicContext *context)
 {
 	// **** IMPORTANT - This algorithm is very carefully arranged to avoid
 	// **** deadlocks and race-conditions. Don't rearrange things unless you
 	// **** know what you are doing!

-	// Get the runtime memory manager and configuration
-	XPath2MemoryManager *mm = context->getMemoryManager();
+	// Get the runtime configuration
 	DbXmlConfiguration *conf = GET_CONFIGURATION(context);

// Lookup the container
 	ScopedContainer scont((Manager&)conf->getManager(), contID, /*mustExist*/true);

-	// Just-in-time optimise the QueryPlan, using the runtime memory manager for thread safety
-	QueryPlan *qp = arg_->copy(mm);
+	// Just-in-time optimise the QueryPlan, using a temporary memory manager for thread safety
+	XPath2MemoryManagerImpl tmpMM;
+	AutoMemoryManagerReset resetMM(context, &tmpMM);
+
+	QueryPlan *qp = arg_->copy(&tmpMM);
 	try {
 		AutoDecisionPointReset reset(conf, this);
 		justInTimeOptimize(qp, scont.get(), context);

Places

File patch.2.4.13.2 of Package dbxml-2.4 (Revision cec0344f9ce18310f807a8ce81ae3a04)

Places