[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487
small optimization of the group by
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/context/static_context_consts.h'
--- src/context/static_context_consts.h 2011-07-21 23:02:27 +
+++ src/context/static_context_consts.h 2011-12-05 15:36:30 +
@@ -120,40 +120,6 @@
decl_manual
};
- enum annotations_t
- {
-fn_public = 0,
-fn_private,
-zann_deterministic,
-zann_nondeterministic,
-zann_assignable,
-zann_nonassignable,
-zann_sequential,
-zann_nonsequential,
-zann_variadic,
-zann_streamable,
-zann_unique,
-zann_nonunique,
-zann_value_equality,
-zann_general_equality,
-zann_value_range,
-zann_general_range,
-zann_automatic,
-zann_manual,
-zann_mutable,
-zann_queue,
-zann_append_only,
-zann_const,
-zann_ordered,
-zann_unordered,
-zann_read_only_nodes,
-zann_mutable_nodes,
-
-// must be at the end
-zann_end
-
- };
-
enum node_modifier_t
{
read_only,
=== modified file 'src/runtime/core/gflwor/common.cpp'
--- src/runtime/core/gflwor/common.cpp 2011-10-22 15:44:45 +
+++ src/runtime/core/gflwor/common.cpp 2011-12-05 15:36:30 +
@@ -187,14 +187,15 @@
{
uint32_t hash = 0;
- csize numCols = theGroupingSpecs-size();
+ std::vectorstore::Item_t::const_iterator ite = t-theTypedValues.begin();
+ std::vectorstore::Item_t::const_iterator end = t-theTypedValues.end();
+ std::vectorGroupingSpec::const_iterator ite2 = theGroupingSpecs-begin();
- for (csize i = 0; i numCols; i++)
+ for (; ite != end; ++ite, ++ite2)
{
-if (t-theTypedValues[i] != NULL)
+if (*ite)
{
- hash += t-theTypedValues[i]-hash(theTimezone,
- (*theGroupingSpecs)[i].theCollator);
+ hash += (*ite)-hash(theTimezone, (*ite2).theCollator);
}
}
@@ -207,46 +208,49 @@
assert(theGroupingSpecs-size() == t1-theTypedValues.size());
assert(t2-theTypedValues.size() == t1-theTypedValues.size());
+ std::vectorstore::Item_t::const_iterator end1 = t1-theTypedValues.end();
std::vectorstore::Item_t::const_iterator iter1 = t1-theTypedValues.begin();
std::vectorstore::Item_t::const_iterator iter2 = t2-theTypedValues.begin();
- std::vectorstore::Item_t::const_iterator end = t1-theTypedValues.end();
- long i = 0;
+ std::vectorGroupingSpec::const_iterator iter3 = theGroupingSpecs-begin();
- while(iter1 != end)
+ while (iter1 != end1)
{
-if(*iter1 == NULL)
+const store::Item* item1 = (*iter1).getp();
+const store::Item* item2 = (*iter2).getp();
+
+if (item1 == NULL)
{
- if(*iter2 != NULL)
+ if (item2 != NULL)
{
return false;
}
}
-else if(*iter2 == NULL)
+else if (item2 == NULL)
{
return false;
}
else
{
- store::Item_t item1 = *iter1;
- store::Item_t item2 = *iter2;
-
try
{
-if ((*theGroupingSpecs)[i].theDoFastComparison)
+if ((*iter3).theDoFastComparison)
{
- if (!item1-equals(item2, theTimezone, (*theGroupingSpecs)[i].theCollator))
+ if (!item1-equals(item2, theTimezone, (*iter3).theCollator))
{
return false;
}
}
else
{
+ store::Item_t tmp1 = (*iter1);
+ store::Item_t tmp2 = (*iter2);
+
if (!CompareIterator::valueEqual(theLocation,
- item1,
- item2,
+ tmp1,
+ tmp2,
theTypeManager,
theTimezone,
- (*theGroupingSpecs)[i].theCollator))
+ (*iter3).theCollator))
{
return false;
}
@@ -262,7 +266,7 @@
}
}
-++i;
+++iter3;
++iter1;
++iter2;
}
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2011-12-05T15-38-21.876Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/84487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/virtual into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/virtual into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509
made destructors of Item subclasses virtual
--
https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/atomic_items.h'
--- src/store/naive/atomic_items.h 2011-11-02 17:19:09 +
+++ src/store/naive/atomic_items.h 2011-12-05 17:42:19 +
@@ -73,7 +73,7 @@
public:
AtomicItem() : store::Item(ATOMIC) { }
- ~AtomicItem() {}
+ virtual ~AtomicItem() {}
SYNC_CODE(RCLock* getRCLock() const { return theRCLock; })
@@ -350,7 +350,7 @@
uint16_t thePrevFree;
public:
- ~QNameItem();
+ virtual ~QNameItem();
QNameItem* getNormalized() const;
@@ -815,7 +815,7 @@
void setStreamReleaser(StreamReleaser aReleaser);
- ~StreamableStringItem()
+ virtual ~StreamableStringItem()
{
if (theStreamReleaser)
{
@@ -2322,7 +2322,7 @@
}
public:
- ~ErrorItem();
+ virtual ~ErrorItem();
ZorbaException* getError() const { return theError; }
=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h 2011-11-02 17:19:09 +
+++ src/store/naive/node_items.h 2011-12-05 17:42:19 +
@@ -1210,7 +1210,7 @@
TextNode() {}
public:
- ~TextNode()
+ virtual ~TextNode()
{
if (isTyped())
{
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/virtual into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/virtual-2011-12-05T17-44-02.441Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/virtual into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/virtual into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509 -- https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/virtual into lp:zorba
Validation queue job virtual-2011-12-05T17-44-02.441Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/virtual/+merge/84509 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-897800-2011-12-05T18-17-03.87Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bool-opt into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515
optimization: only have exactly two instances of boolean items in the simple
store
--
https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2011-10-15 10:41:19 +
+++ src/store/naive/simple_item_factory.cpp 2011-12-05 18:26:25 +
@@ -43,15 +43,19 @@
BasicItemFactory::BasicItemFactory(UriPool* uriPool, QNamePool* qnPool)
:
theUriPool(uriPool),
- theQNamePool(qnPool)
+ theQNamePool(qnPool),
+ theTrueItem(NULL),
+ theFalseItem(NULL)
{
}
BasicItemFactory::~BasicItemFactory()
{
+ theFalseItem = NULL;
+ theTrueItem = NULL;
theQNamePool = NULL;
- theUriPool = NULL;
+ theUriPool = NULL;
}
@@ -421,7 +425,22 @@
bool BasicItemFactory::createBoolean(store::Item_t result, xs_boolean value)
{
- result = new BooleanItem(value);
+ if (value)
+ {
+if (!theTrueItem)
+{
+ theTrueItem = new BooleanItem(true);
+}
+result = theTrueItem;
+ }
+ else
+ {
+if (!theFalseItem)
+{
+ theFalseItem = new BooleanItem(false);
+}
+result = theFalseItem;
+ }
return true;
}
=== modified file 'src/store/naive/simple_item_factory.h'
--- src/store/naive/simple_item_factory.h 2011-10-15 10:41:19 +
+++ src/store/naive/simple_item_factory.h 2011-12-05 18:26:25 +
@@ -50,6 +50,13 @@
UriPool* theUriPool;
QNamePool * theQNamePool;
+ // boolean items
+ // we don't need to create more than two, hence
+ // they are cached here. createBoolean always
+ // returns one of them
+ store::Item_t theTrueItem;
+ store::Item_t theFalseItem;
+
public:
BasicItemFactory(UriPool* uriPool, QNamePool* qnPool);
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bool-opt into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-897800-2011-12-05T18-17-03.87Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T18-38-13.116Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue job bool-opt-2011-12-05T18-38-13.116Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-897800-2011-12-05T18-58-04.34Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-897800-2011-12-05T18-58-04.34Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-897800 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/83882 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bool-opt into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T19-42-06.548Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue job bool-opt-2011-12-05T19-42-06.548Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bool-opt into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bool-opt into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T20-11-08.647Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900462] [NEW] json:serialize returns invalid json
Public bug reported:
The json:serialize function returns syntactically incorrect json.
For example, the existing test query serialize_json_18.xq fails because
it's missing an ending curly '}' as follows:
import module namespace json =
http://www.zorba-xquery.com/modules/converters/json;;
import schema namespace
html-options=http://www.zorba-xquery.com/modules/converters/json-options;;
declare variable $tmp := json type=objectpair name=phoneNumbers
type=arrayitem type=string212 732-1234/itemitem type=string646
123-4567/item/pairpair name=firstName type=stringJohn/pairpair
name=lastName type=stringSmith/pairpair name=address
type=objectpair name=postalCode type=number10021/pairpair
name=city type=stringNew York/pairpair name=streetAddress
type=string21 2nd Street/pairpair name=state
type=stringNY/pair/pair/json;
json:serialize($tmp)
Actual: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}/root
Expected: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}}
** Affects: zorba
Importance: Critical
Assignee: Paul J. Lucas (paul-lucas)
Status: New
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/900462
Title:
json:serialize returns invalid json
Status in Zorba - The XQuery Processor:
New
Bug description:
The json:serialize function returns syntactically incorrect json.
For example, the existing test query serialize_json_18.xq fails
because it's missing an ending curly '}' as follows:
import module namespace json =
http://www.zorba-xquery.com/modules/converters/json;;
import schema namespace
html-options=http://www.zorba-xquery.com/modules/converters/json-options;;
declare variable $tmp := json type=objectpair name=phoneNumbers
type=arrayitem type=string212 732-1234/itemitem type=string646
123-4567/item/pairpair name=firstName type=stringJohn/pairpair
name=lastName type=stringSmith/pairpair name=address
type=objectpair name=postalCode type=number10021/pairpair
name=city type=stringNew York/pairpair name=streetAddress
type=string21 2nd Street/pairpair name=state
type=stringNY/pair/pair/json;
json:serialize($tmp)
Actual: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}/root
Expected: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}}
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/900462/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-check-core-uris
into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
--
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2011-12-05 16:02:16 +
+++ cmake_modules/ZorbaModule.cmake 2011-12-05 20:15:28 +
@@ -524,14 +524,20 @@
# Targets and dependencies:
# ALL depends on check_uris; check_uris depends on check_core_uris;
# zorbacmd depends on check_core_uris.
-ADD_CUSTOM_TARGET (check_core_uris
- DEPENDS ${_core_output_files} VERBATIM)
ADD_CUSTOM_TARGET (check_uris ALL
DEPENDS ${_noncore_output_files} VERBATIM)
-ADD_DEPENDENCIES(check_uris check_core_uris)
-ADD_DEPENDENCIES(zorbacmd check_core_uris)
-SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER Modules)
SET_TARGET_PROPERTIES(check_uris PROPERTIES FOLDER Modules)
+# Only create check_core_uris target and associated dependencies if
+# there are any core URIs; there should never be any when building a
+# standalone module project.
+LIST (LENGTH _core_output_files _num_core)
+IF (_num_core GREATER 0)
+ ADD_CUSTOM_TARGET (check_core_uris
+DEPENDS ${_core_output_files} VERBATIM)
+ ADD_DEPENDENCIES(check_uris check_core_uris)
+ ADD_DEPENDENCIES(zorbacmd check_core_uris)
+ SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER Modules)
+ENDIF (_num_core GREATER 0)
SET_PROPERTY (GLOBAL PROPERTY ZORBA_URI_FILES)
#add 'xqdoc' and 'xqdoc-xml' targets
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
Validation queue job bool-opt-2011-12-05T20-11-08.647Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bool-opt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bool-opt into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 -- https://code.launchpad.net/~zorba-coders/zorba/bool-opt/+merge/84515 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900462] Re: json:serialize returns invalid json
Why is this my bug? I'm not going to spend any time fixing the old JSON
parser.
** Changed in: zorba
Status: New = Won't Fix
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/900462
Title:
json:serialize returns invalid json
Status in Zorba - The XQuery Processor:
Won't Fix
Bug description:
The json:serialize function returns syntactically incorrect json.
For example, the existing test query serialize_json_18.xq fails
because it's missing an ending curly '}' as follows:
import module namespace json =
http://www.zorba-xquery.com/modules/converters/json;;
import schema namespace
html-options=http://www.zorba-xquery.com/modules/converters/json-options;;
declare variable $tmp := json type=objectpair name=phoneNumbers
type=arrayitem type=string212 732-1234/itemitem type=string646
123-4567/item/pairpair name=firstName type=stringJohn/pairpair
name=lastName type=stringSmith/pairpair name=address
type=objectpair name=postalCode type=number10021/pairpair
name=city type=stringNew York/pairpair name=streetAddress
type=string21 2nd Street/pairpair name=state
type=stringNY/pair/pair/json;
json:serialize($tmp)
Actual: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}/root
Expected: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}}
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/900462/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-897800 into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #897800 in Zorba: Full-text regressions
https://bugs.launchpad.net/zorba/+bug/897800
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/84530
Fixed.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/84530
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/full_text/icu_tokenizer.cpp'
--- src/runtime/full_text/icu_tokenizer.cpp 2011-12-01 11:02:25 +
+++ src/runtime/full_text/icu_tokenizer.cpp 2011-12-05 21:03:27 +
@@ -69,7 +69,7 @@
void send( void *payload, Tokenizer::Callback callback ) {
if ( !empty() ) {
# if DEBUG_TOKENIZER
- cout TOKEN: \ value_ \\n;
+ cout TOKEN: \ value_ \ ( pos_ ',' sent_ ',' para_ )\n;
# endif
callback( value_.data(), value_.size(), pos_, sent_, para_, payload );
clear();
@@ -131,7 +131,7 @@
Locale const icu_locale = get_icu_locale_for( lang );
UErrorCode status = U_ZERO_ERROR;
- word_.reset(
+ word_it_.reset(
dynamic_castRuleBasedBreakIterator*(
BreakIterator::createWordInstance( icu_locale, status )
)
@@ -139,7 +139,7 @@
if ( U_FAILURE( status ) )
throw ZORBA_EXCEPTION( zerr::ZXQP0036_BREAKITERATOR_CREATION_FAILED );
- sent_.reset(
+ sent_it_.reset(
dynamic_castRuleBasedBreakIterator*(
BreakIterator::createSentenceInstance( Locale::getUS(), status )
)
@@ -199,11 +199,12 @@
// This unicode::string wraps the existing buffer: no copy is made.
unicode::string const utf16_s( false, utf16_buf, utf16_len );
- word_-setText( utf16_s );
- unicode::size_type word_start = word_-first(), word_end = word_-next();
+ word_it_-setText( utf16_s );
+ unicode::size_type word_start = word_it_-first();
+ unicode::size_type word_end = word_it_-next();
- sent_-setText( utf16_s );
- unicode::size_type sent_end = sent_-first(); sent_end = sent_-next();
+ sent_it_-setText( utf16_s );
+ unicode::size_type sent_end = sent_it_-first(); sent_end = sent_it_-next();
temp_token t;
@@ -227,10 +228,11 @@
}
unique_ptrutf8::storage_type[] const auto_utf8_buf( utf8_buf );
-zstring_b utf8_word;
+zstring_b utf8_word; // used only for debugging error reporting
utf8_word.wrap_memory( utf8_buf, utf8_len );
-
-unicode::size_type const rule_status = word_-getRuleStatus();
+# if DEBUG_TOKENIZER
+cout GOT: \ utf8_word \ ;
+# endif
//
// Junk tokens are whitespace and punctuation -- except some punctuation
@@ -238,10 +240,7 @@
//
bool is_junk = false;
-# if DEBUG_TOKENIZER
-cout GOT: \ utf8_word \ ;
-# endif
-
+int32_t const rule_status = word_it_-getRuleStatus();
if ( IS_WORD_BREAK( NONE, rule_status ) ) {
//
// NONE tokens are what ICU calls whitespace and punctuation.
@@ -289,7 +288,7 @@
default:
in_wild = false;
}
- }
+ } // if ( wildcards )
is_junk = true;
}
@@ -350,10 +349,16 @@
t.send( payload, callback );
set_token:
+# if DEBUG_TOKENIZER
+cout at set_token endl;
+# endif
if ( !is_junk ) {
if ( in_wild || got_backslash )
t.append( utf8_buf, utf8_len );
else {
+# if DEBUG_TOKENIZER
+cout setting token endl;
+# endif
t.set(
utf8_buf, utf8_len, numbers().token, numbers().sent, numbers().para
);
@@ -362,9 +367,14 @@
}
next:
-word_start = word_end, word_end = word_-next();
+# if DEBUG_TOKENIZER
+cout at next endl;
+# endif
+word_start = word_end, word_end = word_it_-next();
if ( word_end = sent_end sent_end != BreakIterator::DONE ) {
- sent_end = sent_-next();
+ sent_end = sent_it_-next();
+ // The addition of the if fixes:
+ // https://bugs.launchpad.net/bugs/863320
if ( sent_end != BreakIterator::DONE )
++numbers().sent;
}
@@ -375,6 +385,9 @@
err::FTDY0020, ERROR_PARAMS( , ZED( UnbalancedChar_3 ), '}' )
);
t.send( payload, callback );
+ // Incrementing sent here fixes:
+ // https://bugs.launchpad.net/bugs/897800
+ ++numbers().sent;
}
///
=== modified file 'src/runtime/full_text/icu_tokenizer.h'
--- src/runtime/full_text/icu_tokenizer.h 2011-09-05 02:06:22 +
+++ src/runtime/full_text/icu_tokenizer.h 2011-12-05 21:03:27 +
@@ -55,8 +55,8 @@
typedef std::unique_ptrRuleBasedBreakIterator rbbi_ptr;
locale::iso639_1::type const lang_;
- rbbi_ptr word_;
- rbbi_ptr sent_;
+ rbbi_ptr word_it_;
+ rbbi_ptr sent_it_;
};
///
=== added file
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-897800 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-897800/+merge/84530 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900462] Re: json:serialize returns invalid json
** Changed in: zorba
Status: Won't Fix = New
** Changed in: zorba
Assignee: Paul J. Lucas (paul-lucas) = Sorin Marian Nasoi
(sorin.marian.nasoi)
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/900462
Title:
json:serialize returns invalid json
Status in Zorba - The XQuery Processor:
New
Bug description:
The json:serialize function returns syntactically incorrect json.
For example, the existing test query serialize_json_18.xq fails
because it's missing an ending curly '}' as follows:
import module namespace json =
http://www.zorba-xquery.com/modules/converters/json;;
import schema namespace
html-options=http://www.zorba-xquery.com/modules/converters/json-options;;
declare variable $tmp := json type=objectpair name=phoneNumbers
type=arrayitem type=string212 732-1234/itemitem type=string646
123-4567/item/pairpair name=firstName type=stringJohn/pairpair
name=lastName type=stringSmith/pairpair name=address
type=objectpair name=postalCode type=number10021/pairpair
name=city type=stringNew York/pairpair name=streetAddress
type=string21 2nd Street/pairpair name=state
type=stringNY/pair/pair/json;
json:serialize($tmp)
Actual: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}/root
Expected: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}}
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/900462/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-check-core-uris-2011-12-05T21-19-12.051Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
Validation queue job bug-check-core-uris-2011-12-05T21-19-12.051Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 -- https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/windowing-tests into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Till Westmann (tillw) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 Added more Windowing tests (some of them fail and have an associated bug). Those tests will probably make it into the W3C test suite and might be removed again then. -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 Your team Zorba Coders is subscribed to branch lp:zorba. === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1/windowwindow2/windowwindow3/windowwindow4/windowwindow5/windowwindow6/windowwindow7/windowwindow8/windowwindow9/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding05.xml.res' === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1 2 3 4 5 6 7 8 9 10/windowwindow2 3 4 5 6 7 8 9 10/windowwindow3 4 5 6 7 8 9 10/windowwindow4 5 6 7 8 9 10/windowwindow5 6 7 8 9 10/windowwindow6 7 8 9 10/windowwindow7 8 9 10/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window1 2 3 4 5 6 7 8 9 10 1 1 2 10 10 9/windowwindow2 3 4 5 6 7 8 9 10 2 2 1 3 10 10 9/windowwindow3 4 5 6 7 8 9 10 3 3 2 4 10 10 9/windowwindow4 5 6 7 8 9 10 4 4 3 5 10 10 9/windowwindow5 6 7 8 9 10 5 5 4 6 10 10 9/windowwindow6 7 8 9 10 6 6 5 7 10 10 9/windowwindow7 8 9 10 7 7 6 8 10 10 9/windowwindow8 9 10 8 8 7 9 10 10 9/windowwindow9 10 9 9 8 10 10 10 9/windowwindow10 10 10 9 10 10 9/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +true === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +1 2 3 4 5 6 7 8 9 10 1 1 2 10 10 9 2 3 4 5 6 7 8 9 10 2 2 1 3 10 10 9 3 4 5 6 7 8 9 10 3 3 2 4 10 10 9 4 5 6 7 8 9 10 4 4 3 5 10 10 9 5 6 7 8 9 10 5 5 4 6 10 10 9 6 7 8 9 10 6 6 5 7 10 10 9 7 8 9 10 7 7 6 8 10 10 9 8 9 10 8 8 7 9 10 10 9 9 10 9 9 8 10 10 10 9 10 10 10 9 10 10 9 === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res 2011-12-05 23:59:26 + @@ -0,0 +1,1 @@ +window num=11 2 3/windowwindow num=22 3 4/windowwindow num=33 4 5/windowwindow num=44 5 6/windowwindow num=55 6 7/windowwindow num=66 7 8/windowwindow num=77 8 9/windowwindow num=88 9 10/windowwindow num=99 10/windowwindow num=1010/window === added file
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/windowing-tests-2011-12-06T00-00-32.964Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-897800 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-897800 into lp:zorba has been updated. Commit Message changed to: undo previous changes and mark bug as expected to fail. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-897800/+merge/84539 -- https://code.launchpad.net/~zorba-coders/zorba/bug-897800/+merge/84539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/windowing-tests into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job windowing-tests-2011-12-06T00-00-32.964Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/windowing-tests into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84538 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-897800 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-897800-2011-12-06T00-28-21.462Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-897800/+merge/84539 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/windowing-tests into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Till Westmann (tillw) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 Added more Windowing tests (some of them fail and have an associated bug). Those tests will probably make it into the W3C test suite and might be removed again then. -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 Your team Zorba Coders is subscribed to branch lp:zorba. === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding01.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1/windowwindow2/windowwindow3/windowwindow4/windowwindow5/windowwindow6/windowwindow7/windowwindow8/windowwindow9/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding02.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding03.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding04.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1 2 3/windowwindow2 3 4/windowwindow3 4 5/windowwindow4 5 6/windowwindow5 6 7/windowwindow6 7 8/windowwindow7 8 9/windowwindow8 9 10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding05.xml.res' === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding06.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1 2 3 4 5 6 7 8 9 10/windowwindow2 3 4 5 6 7 8 9 10/windowwindow3 4 5 6 7 8 9 10/windowwindow4 5 6 7 8 9 10/windowwindow5 6 7 8 9 10/windowwindow6 7 8 9 10/windowwindow7 8 9 10/windowwindow8 9 10/windowwindow9 10/windowwindow10/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding07.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window1 2 3 4 5 6 7 8 9 10 1 1 2 10 10 9/windowwindow2 3 4 5 6 7 8 9 10 2 2 1 3 10 10 9/windowwindow3 4 5 6 7 8 9 10 3 3 2 4 10 10 9/windowwindow4 5 6 7 8 9 10 4 4 3 5 10 10 9/windowwindow5 6 7 8 9 10 5 5 4 6 10 10 9/windowwindow6 7 8 9 10 6 6 5 7 10 10 9/windowwindow7 8 9 10 7 7 6 8 10 10 9/windowwindow8 9 10 8 8 7 9 10 10 9/windowwindow9 10 9 9 8 10 10 10 9/windowwindow10 10 10 9 10 10 9/window === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding09.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +true === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding10.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +1 2 3 4 5 6 7 8 9 10 1 1 2 10 10 9 2 3 4 5 6 7 8 9 10 2 2 1 3 10 10 9 3 4 5 6 7 8 9 10 3 3 2 4 10 10 9 4 5 6 7 8 9 10 4 4 3 5 10 10 9 5 6 7 8 9 10 5 5 4 6 10 10 9 6 7 8 9 10 6 6 5 7 10 10 9 7 8 9 10 7 7 6 8 10 10 9 8 9 10 8 8 7 9 10 10 9 9 10 9 9 8 10 10 10 9 10 10 10 9 10 10 9 === added file 'test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res' --- test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/windowing/sliding11.xml.res 2011-12-06 00:30:33 + @@ -0,0 +1,1 @@ +window num=11 2 3/windowwindow num=22 3 4/windowwindow num=33 4 5/windowwindow num=44 5 6/windowwindow num=55 6 7/windowwindow num=66 7 8/windowwindow num=77 8 9/windowwindow num=88 9 10/windowwindow num=99 10/windowwindow num=1010/window === added file
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
Added more Windowing tests (some of them fail and have an associated bug). Those tests will probably make it into the W3C test suite and might be removed again then. -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/windowing-tests into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/windowing-tests into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/windowing-tests/+merge/84540 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900552] [NEW] Full-text regressions, part 2
Public bug reported: For some reason, the a file didn't commit properly, so this bug/branch is an attempt to fix that. The original bug was bug 897800. ** Affects: zorba Importance: Undecided Assignee: Paul J. Lucas (paul-lucas) Status: In Progress ** Tags: full-text ** Changed in: zorba Status: New = In Progress ** Description changed: For some reason, the a file didn't commit properly, so this bug/branch - is an attempt to fix that. + is an attempt to fix that. The original bug was bug 897800. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/900552 Title: Full-text regressions, part 2 Status in Zorba - The XQuery Processor: In Progress Bug description: For some reason, the a file didn't commit properly, so this bug/branch is an attempt to fix that. The original bug was bug 897800. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/900552/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900552] Re: Full-text regressions, part 2
** Branch linked: lp:~paul-lucas/zorba/bug-900552 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/900552 Title: Full-text regressions, part 2 Status in Zorba - The XQuery Processor: In Progress Bug description: For some reason, the a file didn't commit properly, so this bug/branch is an attempt to fix that. The original bug was bug 897800. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/900552/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-900552 into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #900552 in Zorba: Full-text regressions, part 2
https://bugs.launchpad.net/zorba/+bug/900552
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555
Things should be reverted now.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/full_text/icu_tokenizer.cpp'
--- src/runtime/full_text/icu_tokenizer.cpp 2011-12-06 00:48:10 +
+++ src/runtime/full_text/icu_tokenizer.cpp 2011-12-06 03:30:30 +
@@ -329,10 +329,10 @@
}
}
-else {
+else /* if ( IS_WORD_BREAK( OTHER, rule_status ) ) */ {
//
- // OTHER tokens are for non-whitespace, non-digits, and non-numbers,
- // i.e., word tokens.
+ // OTHER tokens are for non-whitespace, non-punctuation, and
+ // non-numbers, i.e., word tokens.
//
# if DEBUG_TOKENIZER
cout (OTHER) endl;
@@ -375,7 +375,9 @@
sent_end = sent_it_-next();
// The addition of the if fixes:
// https://bugs.launchpad.net/bugs/863320
+#if 0
if ( sent_end != BreakIterator::DONE )
+#endif
++numbers().sent;
}
} // while
@@ -387,7 +389,12 @@
t.send( payload, callback );
// Incrementing sent here fixes:
// https://bugs.launchpad.net/bugs/897800
+#if 0
++numbers().sent;
+#endif
+#if DEBUG_TOKENIZER
+ cout \n;
+#endif /* DEBUG_TOKENIZER */
}
///
=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt 2011-12-06 00:06:46 +
+++ test/rbkt/Queries/CMakeLists.txt 2011-12-06 03:30:30 +
@@ -294,4 +294,4 @@
EXPECTED_FAILURE(test/rbkt/zorba/reference/reference_5 868640)
-EXPECTED_FAILURE(test/rbkt/zorba/fulltext/ft-same-sentence-false-2 897800)
+EXPECTED_FAILURE(test/rbkt/zorba/fulltext/ft-same-sentence-true-4 900552)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-900552 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-900552-2011-12-06T03-47-20.329Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
Validation queue job bug-900552-2011-12-06T03-47-20.329Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-900552 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-900552 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 -- https://code.launchpad.net/~paul-lucas/zorba/bug-900552/+merge/84555 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 900462] Re: json:serialize returns invalid json
** Branch linked: lp:~zorba-coders/zorba/bug_data_converters_json_900462
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/900462
Title:
json:serialize returns invalid json
Status in Zorba - The XQuery Processor:
New
Bug description:
The json:serialize function returns syntactically incorrect json.
For example, the existing test query serialize_json_18.xq fails
because it's missing an ending curly '}' as follows:
import module namespace json =
http://www.zorba-xquery.com/modules/converters/json;;
import schema namespace
html-options=http://www.zorba-xquery.com/modules/converters/json-options;;
declare variable $tmp := json type=objectpair name=phoneNumbers
type=arrayitem type=string212 732-1234/itemitem type=string646
123-4567/item/pairpair name=firstName type=stringJohn/pairpair
name=lastName type=stringSmith/pairpair name=address
type=objectpair name=postalCode type=number10021/pairpair
name=city type=stringNew York/pairpair name=streetAddress
type=string21 2nd Street/pairpair name=state
type=stringNY/pair/pair/json;
json:serialize($tmp)
Actual: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}/root
Expected: root{phoneNumbers: [212 732-1234, 646 123-4567],
firstName: John, lastName: Smith, address: {postalCode:
10021, city: New York, streetAddress: 21 2nd Street, state:
NY}}
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/900462/+subscriptions
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
