Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

Proposed by Markos Zaharioudakis on 2013-05-25
Status: Merged
Approved by: Markos Zaharioudakis on 2013-05-25
Approved revision: 11115
Merged at revision: 11474
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 725 lines (+120/-157)
14 files modified
src/compiler/translator/translator.cpp (+17/-2)
src/diagnostics/diagnostic_en.xml (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
src/runtime/accessors/accessors_impl.cpp (+12/-5)
src/runtime/api/plan_iterator_wrapper.cpp (+10/-48)
src/runtime/api/plan_iterator_wrapper.h (+5/-8)
src/runtime/base/plan_iterator.cpp (+34/-7)
src/runtime/base/plan_iterator.h (+7/-14)
src/runtime/core/constructors.cpp (+33/-30)
src/runtime/core/fncall_iterator.h (+0/-2)
src/store/api/item.h (+0/-17)
src/store/naive/atomic_items.cpp (+0/-7)
src/store/naive/atomic_items.h (+0/-14)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve on 2013-05-25
Review via email: mp+165747@code.launchpad.net

Commit message

fixed xray performance regression + cleanup

Description of the change

fixed xray performance regression + cleanup.

To post a comment you must log in.
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job markos-scratch-2013-05-25T14-47-08.838Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

11114. By Markos Zaharioudakis on 2013-05-25

merge from trunk

11115. By Markos Zaharioudakis on 2013-05-25

merge from trunk

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job markos-scratch-2013-05-25T15-21-52.13Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-05-24 16:34:11 +0000
3+++ src/compiler/translator/translator.cpp 2013-05-25 15:17:29 +0000
4@@ -11969,8 +11969,10 @@
5 }
6 case FunctionConsts::FN_HEAD_1:
7 {
8- arguments.push_back(CREATE(const)(theRootSctx, theUDF, loc, numeric_consts<xs_integer>::one()));
9- arguments.push_back(CREATE(const)(theRootSctx, theUDF, loc, numeric_consts<xs_integer>::one()));
10+ arguments.push_back(CREATE(const)(theRootSctx, theUDF, loc,
11+ numeric_consts<xs_integer>::one()));
12+ arguments.push_back(CREATE(const)(theRootSctx, theUDF, loc,
13+ numeric_consts<xs_integer>::one()));
14
15 function* f = BUILTIN_FUNC(OP_ZORBA_SUBSEQUENCE_INT_3);
16
17@@ -12653,6 +12655,19 @@
18
19 break;
20 }
21+ case FunctionConsts::FN_MAP_2:
22+ case FunctionConsts::FN_FILTER_2:
23+ {
24+ flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc);
25+
26+ let_clause* lc = wrap_in_letclause(foArgs[0]);
27+ flworBody->add_clause(lc);
28+ foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
29+
30+ flworBody->set_return_expr(generate_fn_body(f, foArgs, loc));
31+ body = flworBody;
32+ break;
33+ }
34 case FunctionConsts::FN_FUNCTION_LOOKUP_2:
35 {
36 bool varAdded = false;
37
38=== modified file 'src/diagnostics/diagnostic_en.xml'
39--- src/diagnostics/diagnostic_en.xml 2013-05-16 22:26:07 +0000
40+++ src/diagnostics/diagnostic_en.xml 2013-05-25 15:17:29 +0000
41@@ -1641,7 +1641,7 @@
42 An argument to \c fn:data() contains a node that does not have a typed
43 value.
44 </comment>
45- <value>"$1": argument to fn:data() is function item</value>
46+ <value>"$1": function item passed as argument to fn:data()</value>
47 </diagnostic>
48
49 <diagnostic code="FOTY0014">
50
51=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
52--- src/diagnostics/pregenerated/dict_en.cpp 2013-05-16 22:26:07 +0000
53+++ src/diagnostics/pregenerated/dict_en.cpp 2013-05-25 15:17:29 +0000
54@@ -71,7 +71,7 @@
55 { "FORX0003", "\"$1\": regular expression matches zero-length string" },
56 { "FORX0004", "\"$1\": invalid replacement string${: 2}" },
57 { "FOTY0012", "\"$1\": element node of type $2 does not have a typed value" },
58- { "FOTY0013", "\"$1\": argument to fn:data() is function item" },
59+ { "FOTY0013", "\"$1\": function item passed as argument to fn:data()" },
60 { "FOTY0014", "\"$1\": argument to fn:string() is a function item" },
61 { "FOTY0015", "\"$1\": argument to fn:deep-equal() contains a function item" },
62 { "FOUP0001", "first operand of fn:put() is not a node of a supported kind" },
63
64=== modified file 'src/runtime/accessors/accessors_impl.cpp'
65--- src/runtime/accessors/accessors_impl.cpp 2013-05-04 20:20:05 +0000
66+++ src/runtime/accessors/accessors_impl.cpp 2013-05-25 15:17:29 +0000
67@@ -183,6 +183,7 @@
68 {
69 PlanIter_t iter;
70 store::Item_t itemNode;
71+ store::Item::ItemKind resKind;
72
73 FnDataIteratorState* state;
74 DEFAULT_STACK_INIT(FnDataIteratorState, state, planState);
75@@ -192,7 +193,9 @@
76 if (!consumeNext(result, theChildren[0], planState))
77 break;
78
79- if (result->isNode())
80+ resKind = result->getKind();
81+
82+ if (resKind == store::Item::NODE)
83 {
84 itemNode.transfer(result);
85
86@@ -227,22 +230,26 @@
87 }
88 }
89 }
90- else if (result->isAtomic())
91+ else if (resKind == store::Item::ATOMIC)
92 {
93 STACK_PUSH(true, state);
94 }
95- else if (result->isJSONItem())
96+ else if (resKind == store::Item::JSONIQ)
97 {
98 RAISE_ERROR(jerr::JNTY0004, loc,
99 ERROR_PARAMS(result->isJSONObject() ? "object" : "array"));
100 }
101- else //(result->isFunction())
102+ else if (resKind == store::Item::FUNCTION)
103 {
104 store::Item_t fnName = result->getFunctionName();
105 RAISE_ERROR(err::FOTY0013, loc,
106 ERROR_PARAMS(fnName.getp() ?
107 result->getFunctionName()->getStringValue() :
108- result->show()));
109+ zstring("???")));
110+ }
111+ else
112+ {
113+ ZORBA_ASSERT(false);
114 }
115 }
116
117
118=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
119--- src/runtime/api/plan_iterator_wrapper.cpp 2013-03-17 13:55:28 +0000
120+++ src/runtime/api/plan_iterator_wrapper.cpp 2013-05-25 15:17:29 +0000
121@@ -44,12 +44,6 @@
122 }
123
124
125-void PlanIteratorWrapper::reset()
126-{
127- theIterator->reset(*theStateBlock);
128-}
129-
130-
131 #ifndef NDEBUG
132 std::string PlanIteratorWrapper::toString() const
133 {
134@@ -65,25 +59,16 @@
135 ********************************************************************************/
136 SERIALIZE_INTERNAL_METHOD(PlanStateIteratorWrapper);
137
138+
139 void PlanStateIteratorWrapper::serialize(::zorba::serialization::Archiver& ar)
140 {
141 PlanIterator::serialize(ar);
142 }
143
144-PlanStateIteratorWrapper::PlanStateIteratorWrapper(PlanIterator* iter, PlanState& state, uint32_t offset)
145- :
146- PlanIterator(NULL, QueryLoc()),
147- theIterator(iter),
148- theStoreIterator(NULL),
149- theStateBlock(&state),
150- theOffset(offset)
151-{
152-}
153
154 PlanStateIteratorWrapper::PlanStateIteratorWrapper(const store::Iterator_t& iter)
155 :
156 PlanIterator(NULL, QueryLoc()),
157- theIterator(NULL),
158 theStoreIterator(iter),
159 theStateBlock(NULL)
160 {
161@@ -96,55 +81,35 @@
162 }
163
164
165-void PlanStateIteratorWrapper::open()
166-{
167- if (theIterator)
168- theIterator->open(*theStateBlock, theOffset);
169- else
170- theStoreIterator->open();
171-}
172-
173-
174-// both arguments will be ignored
175 void PlanStateIteratorWrapper::open(PlanState& planState, uint32_t& offset)
176 {
177- open();
178+ theStoreIterator->open();
179 }
180
181
182-bool PlanStateIteratorWrapper::produceNext(store::Item_t& result, PlanState& planState) const
183+bool PlanStateIteratorWrapper::produceNext(
184+ store::Item_t& result,
185+ PlanState& planState) const
186 {
187- if (theIterator)
188- return theIterator->produceNext(result, *theStateBlock);
189- else
190- return theStoreIterator->next(result);
191+ return theStoreIterator->next(result);
192 }
193
194
195 bool PlanStateIteratorWrapper::next(store::Item_t& result)
196 {
197- if (theIterator)
198- return PlanIterator::consumeNext(result, theIterator, *theStateBlock);
199- else
200- return theStoreIterator->next(result);
201+ return theStoreIterator->next(result);
202 }
203
204
205 void PlanStateIteratorWrapper::reset() const
206 {
207- if (theIterator)
208- theIterator->reset(*theStateBlock);
209- else
210- theStoreIterator->reset();
211+ theStoreIterator->reset();
212 }
213
214
215 void PlanStateIteratorWrapper::reset(PlanState& planState) const
216 {
217- if (theIterator)
218- theIterator->reset(*theStateBlock);
219- else
220- theStoreIterator->reset();
221+ theStoreIterator->reset();
222 }
223
224
225@@ -157,10 +122,7 @@
226 std::string PlanStateIteratorWrapper::toString() const
227 {
228 std::stringstream ss;
229- if (theIterator)
230- ss << getId() << " = PlanStateIteratorWrapper iterator: " << theIterator->toString();
231- else
232- ss << getId() << " = PlanStateIteratorWrapper iterator: " << theStoreIterator->toString();
233+ ss << getId() << " = PlanStateIteratorWrapper iterator: " << theStoreIterator->toString();
234 return ss.str();
235 }
236 #endif
237
238=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
239--- src/runtime/api/plan_iterator_wrapper.h 2013-03-05 02:20:27 +0000
240+++ src/runtime/api/plan_iterator_wrapper.h 2013-05-25 15:17:29 +0000
241@@ -16,8 +16,10 @@
242 #ifndef XQP_PLAN_ITERATOR_WRAPPER_H
243 #define XQP_PLAN_ITERATOR_WRAPPER_H
244
245+#include "common/shared_types.h"
246+
247 #include "store/api/iterator.h"
248-#include "common/shared_types.h"
249+
250 #include "runtime/base/plan_iterator.h"
251
252 namespace zorba {
253@@ -47,7 +49,7 @@
254
255 bool next(store::Item_t&);
256
257- void reset();
258+ void reset() {}
259
260 void close() {}
261
262@@ -56,13 +58,13 @@
263 #endif
264 };
265
266+
267 /*******************************************************************************
268
269 ********************************************************************************/
270 class PlanStateIteratorWrapper : public PlanIterator
271 {
272 protected:
273- PlanIterator * theIterator; // only one of these is used
274 const store::Iterator_t theStoreIterator;
275
276 PlanState * theStateBlock;
277@@ -76,17 +78,12 @@
278 void serialize(::zorba::serialization::Archiver& ar);
279
280 public:
281- PlanStateIteratorWrapper(PlanIterator* iterator, PlanState& planState, uint32_t offset);
282-
283 PlanStateIteratorWrapper(const store::Iterator_t& iterator);
284
285 virtual ~PlanStateIteratorWrapper();
286
287 virtual void accept(PlanIterVisitor& v) const;
288
289- virtual void open();
290-
291- // both arguments will be ignored, and the class members equivalents will be used instead
292 virtual void open(PlanState& planState, uint32_t& offset);
293
294 virtual bool produceNext(store::Item_t& result, PlanState& planState) const;
295
296=== modified file 'src/runtime/base/plan_iterator.cpp'
297--- src/runtime/base/plan_iterator.cpp 2013-05-08 20:14:47 +0000
298+++ src/runtime/base/plan_iterator.cpp 2013-05-25 15:17:29 +0000
299@@ -16,14 +16,20 @@
300 #include "stdafx.h"
301
302 #include "compiler/api/compilercb.h"
303+
304 #include "context/static_context.h"
305+
306 #include "runtime/base/plan_iterator.h"
307 #include "runtime/util/flowctl_exception.h"
308+
309 #include "store/api/item_factory.h"
310 #include "store/api/store.h"
311+
312 #include "system/globalenv.h"
313+
314 #include "zorbatypes/integer.h"
315
316+#include "diagnostics/util_macros.h"
317
318 namespace zorba
319 {
320@@ -69,11 +75,7 @@
321 void PlanState::checkDepth(const QueryLoc& loc)
322 {
323 if (theStackDepth > 256)
324- throw XQUERY_EXCEPTION(
325- zerr::ZXQP0003_INTERNAL_ERROR,
326- ERROR_PARAMS( ZED( StackOverflow ) ),
327- ERROR_LOC( loc )
328- );
329+ RAISE_ERROR(zerr::ZXQP0003_INTERNAL_ERROR, loc, ERROR_PARAMS(ZED(StackOverflow)));
330 }
331
332
333@@ -95,11 +97,12 @@
334 {
335 }
336
337-PlanIterator::PlanIterator(static_context* aContext, const QueryLoc& aLoc)
338+
339+PlanIterator::PlanIterator(static_context* sctx, const QueryLoc& aLoc)
340 :
341 theStateOffset(0),
342 loc(aLoc),
343- theSctx(aContext)
344+ theSctx(sctx)
345 {
346 // Used for debugging purposes
347 #ifndef NDEBUG
348@@ -107,6 +110,20 @@
349 #endif
350 }
351
352+
353+PlanIterator::PlanIterator(const PlanIterator& it)
354+ :
355+ SimpleRCObject(it),
356+ theStateOffset(0),
357+ loc(it.loc),
358+ theSctx(it.theSctx)
359+#ifndef NDEBUG
360+ , theId(it.theId)
361+#endif
362+{
363+}
364+
365+
366 SERIALIZE_INTERNAL_METHOD(PlanIterator)
367
368
369@@ -130,6 +147,16 @@
370 }
371
372
373+#ifndef NDEBUG
374+std::string PlanIterator::toString() const
375+{
376+ std::stringstream ss;
377+ ss << getId() << " = " << getClassName();
378+ return ss.str();
379+}
380+#endif
381+
382+
383 TypeManager* PlanIterator::getTypeManager() const
384 {
385 return theSctx->get_typemanager();
386
387=== modified file 'src/runtime/base/plan_iterator.h'
388--- src/runtime/base/plan_iterator.h 2013-03-24 20:40:03 +0000
389+++ src/runtime/base/plan_iterator.h 2013-05-25 15:17:29 +0000
390@@ -301,11 +301,14 @@
391 // Stable IDs for debugging purposes. An individual ID is assigned to each iterator
392 // and this can be used to identify it in the debug information.
393 #ifndef NDEBUG
394-public:
395 int theId;
396+
397+public:
398 int getId() const { return theId;}
399+
400 void setId(int id) { theId = id;}
401- virtual std::string toString() const { std::stringstream ss; ss << getId() << " = " << getClassName(); return ss.str(); }
402+
403+ virtual std::string toString() const;
404 #endif
405
406 public:
407@@ -316,19 +319,9 @@
408 void serialize(::zorba::serialization::Archiver& ar);
409
410 public:
411- PlanIterator(static_context* aContext, const QueryLoc& aLoc);
412+ PlanIterator(static_context* sctx, const QueryLoc& loc);
413
414- PlanIterator(const PlanIterator& it)
415- :
416- SimpleRCObject(it),
417- theStateOffset(0),
418- loc(it.loc),
419- theSctx(it.theSctx)
420-#ifndef NDEBUG
421- , theId(it.theId)
422-#endif
423- {
424- }
425+ PlanIterator(const PlanIterator& it);
426
427 virtual ~PlanIterator() {}
428
429
430=== modified file 'src/runtime/core/constructors.cpp'
431--- src/runtime/core/constructors.cpp 2013-05-08 01:05:04 +0000
432+++ src/runtime/core/constructors.cpp 2013-05-25 15:17:29 +0000
433@@ -336,7 +336,7 @@
434 if (pre == "xmlns" ||
435 ns == "http://www.w3.org/2000/xmlns/" ||
436 (pre == "xml" && ns != "http://www.w3.org/XML/1998/namespace") ||
437- (pre != "xml" && ns == "http://www.w3.org/XML/1998/namespace"))
438+ (ns == "http://www.w3.org/XML/1998/namespace" && pre != "xml"))
439 {
440 RAISE_ERROR(err::XQDY0096, loc, ERROR_PARAMS(nodeName->getStringValue()));
441 }
442@@ -832,7 +832,7 @@
443 /*******************************************************************************
444
445 ********************************************************************************/
446-PiIterator::PiIterator (
447+PiIterator::PiIterator(
448 static_context* sctx,
449 const QueryLoc& loc,
450 PlanIter_t& aTarget,
451@@ -1163,6 +1163,7 @@
452 std::stack<store::Item*>& path = planState.theNodeConstuctionPath;
453 bool haveContent = false;
454 store::Item* parent;
455+ store::Item::ItemKind resKind;
456
457 EnclosedIteratorState* state;
458 DEFAULT_STACK_INIT(EnclosedIteratorState, state, planState);
459@@ -1173,7 +1174,9 @@
460 {
461 haveContent = true;
462
463- if (result->isNode())
464+ resKind = result->getKind();
465+
466+ if (resKind == store::Item::NODE)
467 {
468 store::Item_t typedValue;
469 store::Iterator_t typedIter;
470@@ -1197,25 +1200,26 @@
471 }
472 }
473 }
474-#ifdef ZORBA_WITH_JSON
475- else if (result->isJSONItem())
476+ else if (resKind == store::Item::JSONIQ)
477 {
478 RAISE_ERROR_NO_PARAMS(jerr::JNTY0011, loc);
479 }
480-#endif
481- else
482+ else if (resKind == store::Item::ATOMIC)
483 {
484- if (result->isFunction())
485- {
486- store::Item_t fnName = result->getFunctionName();
487- RAISE_ERROR(err::FOTY0013, loc,
488- ERROR_PARAMS(fnName.getp() ? result->getFunctionName()->getStringValue() : result->show()));
489- }
490-
491- assert(result->isAtomic());
492-
493 result->getStringValue2(strval);
494 }
495+ else if (result->isFunction())
496+ {
497+ store::Item_t fnName = result->getFunctionName();
498+ RAISE_ERROR(err::FOTY0013, loc,
499+ ERROR_PARAMS(fnName.getp() ?
500+ result->getFunctionName()->getStringValue() :
501+ zstring("???")));
502+ }
503+ else
504+ {
505+ ZORBA_ASSERT(false);
506+ }
507
508 while (consumeNext(result, theChild, planState))
509 {
510@@ -1245,12 +1249,10 @@
511 }
512 }
513 }
514-#ifdef ZORBA_WITH_JSON
515 else if (result->isJSONItem())
516 {
517 RAISE_ERROR_NO_PARAMS(jerr::JNTY0011, loc);
518 }
519-#endif
520 else
521 {
522 assert(result->isAtomic());
523@@ -1291,7 +1293,9 @@
524 if (!consumeNext(result, theChild, planState))
525 break;
526
527- if (result->isNode())
528+ resKind = result->getKind();
529+
530+ if (resKind == store::Item::NODE)
531 {
532 if (result->getNodeKind() == store::StoreConsts::documentNode)
533 {
534@@ -1303,21 +1307,12 @@
535 STACK_PUSH(true, state);
536 }
537 }
538-#ifdef ZORBA_WITH_JSON
539- else if (result->isJSONItem())
540+ else if (resKind == store::Item::JSONIQ)
541 {
542 RAISE_ERROR_NO_PARAMS(jerr::JNTY0011, loc);
543 }
544-#endif
545- else
546+ else if (resKind == store::Item::ATOMIC)
547 {
548- if (result->isFunction())
549- {
550- RAISE_ERROR_NO_PARAMS(err::XQTY0105, loc);
551- }
552-
553- assert(result->isAtomic());
554-
555 result->getStringValue2(strval);
556
557 {
558@@ -1360,6 +1355,14 @@
559 STACK_PUSH(result != NULL, state);
560 }
561 }
562+ else if (resKind == store::Item::FUNCTION)
563+ {
564+ RAISE_ERROR_NO_PARAMS(err::XQTY0105, loc);
565+ }
566+ else
567+ {
568+ ZORBA_ASSERT(false);
569+ }
570 }
571 }
572 }
573
574=== modified file 'src/runtime/core/fncall_iterator.h'
575--- src/runtime/core/fncall_iterator.h 2013-04-24 01:35:58 +0000
576+++ src/runtime/core/fncall_iterator.h 2013-05-25 15:17:29 +0000
577@@ -24,8 +24,6 @@
578
579 #include "runtime/hof/function_item.h"
580
581-// TODO remove the next three includes
582-#include "api/unmarshaller.h"
583 #include "context/static_context.h"
584
585 #include "runtime/base/narybase.h"
586
587=== modified file 'src/store/api/item.h'
588--- src/store/api/item.h 2013-05-21 21:44:25 +0000
589+++ src/store/api/item.h 2013-05-25 15:17:29 +0000
590@@ -67,9 +67,7 @@
591 PUL = 0x3,
592 FUNCTION = 0x5,
593 LIST = 0x7,
594-#ifdef ZORBA_WITH_JSON
595 JSONIQ = 0x9,
596-#endif
597 ERROR_ = 0xB
598 };
599
600@@ -86,15 +84,6 @@
601 mutable long theRefCount;
602 mutable ItemUnion theUnion;
603
604-#ifndef NDEBUG
605- // This class member is set by some atomic type items to the
606- // item's value in order to aid debugging. The debug_str might
607- // not always be updated to the current value.
608-protected:
609- const char* debug_str_; // similar to zorba_string.h
610- zstring debug_holder;
611-#endif
612-
613 protected:
614
615 Item() : theRefCount(0)
616@@ -147,7 +136,6 @@
617 theUnion.treeRCPtr != 0);
618 }
619
620-#ifdef ZORBA_WITH_JSON
621 /**
622 * @return "true" if the item is a JSON item
623 */
624@@ -155,7 +143,6 @@
625 {
626 return ((theUnion.itemKind & 0xF) == JSONIQ);
627 }
628-#endif
629
630 /**
631 * @return "true" if the item is an atomic value
632@@ -212,7 +199,6 @@
633 */
634 zstring printKind() const;
635
636-#ifdef ZORBA_WITH_JSON
637 /**
638 * @return "true" if the item is a JSON object item
639 */
640@@ -224,7 +210,6 @@
641 */
642 virtual bool
643 isJSONArray() const;
644-#endif
645
646 /**
647 * @return the qname identifying the XQuery type of the item
648@@ -905,7 +890,6 @@
649 leastCommonAncestor(const store::Item_t&) const;
650
651
652-#ifdef ZORBA_WITH_JSON
653 /* -------------------- Methods for JSON items --------------------- */
654
655 /**
656@@ -962,7 +946,6 @@
657 virtual xs_integer
658 getNumObjectPairs() const;
659
660-#endif // ZORBA_WITH_JSON
661
662
663 /* -------------------- Methods for ErrorItem --------------------- */
664
665=== modified file 'src/store/naive/atomic_items.cpp'
666--- src/store/naive/atomic_items.cpp 2013-05-16 22:16:00 +0000
667+++ src/store/naive/atomic_items.cpp 2013-05-25 15:17:29 +0000
668@@ -695,13 +695,6 @@
669 initializeAsUnnormalizedQName(lNormalized, aPrefix);
670
671 theIsInPool = false;
672-
673-#ifndef NDEBUG
674- debug_holder = theLocal.c_str();
675- if (!thePrefix.empty())
676- debug_holder = thePrefix + ":" + debug_holder;
677- debug_str_ = debug_holder.c_str();
678-#endif
679 }
680
681
682
683=== modified file 'src/store/naive/atomic_items.h'
684--- src/store/naive/atomic_items.h 2013-05-16 22:16:00 +0000
685+++ src/store/naive/atomic_items.h 2013-05-25 15:17:29 +0000
686@@ -492,13 +492,6 @@
687
688 assert(isNormalized());
689 assert(isValid());
690-
691-#ifndef NDEBUG
692- debug_holder = theLocal.c_str();
693- if (!thePrefix.empty())
694- debug_holder = thePrefix + ":" + debug_holder;
695- debug_str_ = debug_holder.c_str();
696-#endif
697 }
698
699 void initializeAsUnnormalizedQName(
700@@ -515,13 +508,6 @@
701
702 assert(!isNormalized());
703 assert(isValid());
704-
705-#ifndef NDEBUG
706- debug_holder = theLocal.c_str();
707- if (!thePrefix.empty())
708- debug_holder = thePrefix + ":" + debug_holder;
709- debug_str_ = debug_holder.c_str();
710-#endif
711 }
712
713 void initializeAsQNameNotInPool(
714
715=== modified file 'test/fots/CMakeLists.txt'
716--- test/fots/CMakeLists.txt 2013-05-23 20:33:33 +0000
717+++ test/fots/CMakeLists.txt 2013-05-25 15:17:29 +0000
718@@ -108,7 +108,6 @@
719 EXPECTED_FOTS_FAILURE (SLOW fn-subsequence cbcl-subsequence-014 1069794)
720 EXPECTED_FOTS_FAILURE (SLOW fn-matches.re re00987 1131313)
721 EXPECTED_FOTS_FAILURE (SLOW app-Demos itunes 0)
722-EXPECTED_FOTS_FAILURE (SLOW app-Demos raytracer 0)
723
724 #"crashing/hanging" tests. These are not run but marked as 'tooBig' by FOTS driver.
725 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00975 1070533)

Subscribers

People subscribed via source and target branches