File diff.2.4.limit_results.patch of Package dbxml-2.4

Overview Repositories Revisions Requests Users Attributes Meta

File diff.2.4.limit_results.patch of Package dbxml-2.4 (Revision 9df4b193236084942f8d06a037a395c1)

Currently displaying revision 9df4b193236084942f8d06a037a395c1 , Show latest

diff -ru dbxml-2.4.13-original/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp
--- dbxml-2.4.13-original/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp	2008-06-06 14:52:23.000000000 +0100
+++ dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.cpp	2008-06-20 17:02:15.000000000 +0100
@@ -176,7 +176,7 @@
 		return item;
 
 	DecisionPointSource *dps = 0;
-	GenerateResult res = generate(item, 0, dps);
+	GenerateResult res = generate(item, 0, dps, /*addDocOrder*/false);
 	if(res.qp != 0) {
 		return toASTNode(res.qp, dps, xpc_->getMemoryManager());
 	}
@@ -276,7 +276,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-QueryPlanGenerator::GenerateResult QueryPlanGenerator::generate(ASTNode *item, QueryPlan *context, DecisionPointSource *&dps)
+QueryPlanGenerator::GenerateResult QueryPlanGenerator::generate(ASTNode *item, QueryPlan *context, DecisionPointSource *&dps, bool addDocOrder)
 {
 	AutoStackLevelReset reset(ancestors_);
 
@@ -288,7 +288,7 @@
 		return generateStep((XQStep*)item, context, dps);
 	}
 	case ASTNode::PREDICATE: {
-		return generatePredicate((XQPredicate*)item, context, dps);
+		return generatePredicate((XQPredicate*)item, context, dps, addDocOrder);
 	}
 	case ASTNode::DOCUMENT_ORDER: {
 		return generateDocumentOrder((XQDocumentOrder*)item, context, dps);
@@ -362,7 +362,7 @@
 	expr = reverseJoin(reverse(pred, ReverseResult(), contextName), expr, pred);
 }
 
-QueryPlanGenerator::GenerateResult QueryPlanGenerator::generatePredicate(XQPredicate *item, QueryPlan *context, DecisionPointSource *&dps)
+QueryPlanGenerator::GenerateResult QueryPlanGenerator::generatePredicate(XQPredicate *item, QueryPlan *context, DecisionPointSource *&dps, bool addDocOrder)
 {
 	XPath2MemoryManager *mm = xpc_->getMemoryManager();
 
@@ -374,7 +374,8 @@
 	ASTNode *exprAST = const_cast<ASTNode*>(item->getExpression());
 	ASTNode *predAST = const_cast<ASTNode*>(item->getPredicate());
 
-	if(!exprAST->getStaticAnalysis().getStaticType().isType(StaticType::NODE_TYPE)) {
+	if(!exprAST->getStaticAnalysis().getStaticType().isType(StaticType::NODE_TYPE) ||
+		(!addDocOrder && (exprAST->getStaticAnalysis().getProperties() & StaticAnalysis::DOCORDER) == 0)) {
 		return NodeVisitingOptimizer::optimize(item);
 	}
 
Only in dbxml-2.4.13/dbxml/src/dbxml/optimizer: QueryPlanGenerator.cpp.orig
diff -ru dbxml-2.4.13-original/dbxml/src/dbxml/optimizer/QueryPlanGenerator.hpp dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.hpp
--- dbxml-2.4.13-original/dbxml/src/dbxml/optimizer/QueryPlanGenerator.hpp	2008-01-09 14:49:44.000000000 +0000
+++ dbxml-2.4.13/dbxml/src/dbxml/optimizer/QueryPlanGenerator.hpp	2008-06-20 17:02:15.000000000 +0100
@@ -58,10 +58,10 @@
 	QueryPlan *generateOrWrap(const VectorOfASTNodes &args, QueryPlan *resultQP, OperationQP::Vector &resultArgs,
 		QueryPlan *context, DecisionPointSource *&dps);
 
-	GenerateResult generate(ASTNode *item, QueryPlan *context, DecisionPointSource *&dps);
+	GenerateResult generate(ASTNode *item, QueryPlan *context, DecisionPointSource *&dps, bool addDocOrder = true);
 	GenerateResult generateNav(XQNav *item, QueryPlan *context, DecisionPointSource *&dps);
 	GenerateResult generateStep(XQStep *item, QueryPlan *context, DecisionPointSource *&dps);
-	GenerateResult generatePredicate(XQPredicate *item, QueryPlan *context, DecisionPointSource *&dps);
+	GenerateResult generatePredicate(XQPredicate *item, QueryPlan *context, DecisionPointSource *&dps, bool addDocOrder);
 	GenerateResult generateDocumentOrder(XQDocumentOrder *item, QueryPlan *context, DecisionPointSource *&dps);
 	GenerateResult generateOperator(XQOperator *item, QueryPlan *context, DecisionPointSource *&dps);
 	GenerateResult generateContextItem(XQContextItem *item, QueryPlan *context, DecisionPointSource *&dps);

Places

File diff.2.4.limit_results.patch of Package dbxml-2.4 (Revision 9df4b193236084942f8d06a037a395c1)

Places