[Zorba-coders] [Bug 867272] Re: data-cleaning bug with regex
the line is in fact 94 not 95, the error is: FORX002 invalid regular expression: G(N(ED)?)^ invalid character for an atom The tests that fail on Daniel's branch no_unicode https://code.launchpad.net/~zorba-coders/zorba/no_unicode And looking over that specific regex I would assume you wanted to G(N(ED)?)$ ? -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867272 Title: data-cleaning bug with regex Status in Zorba - The XQuery Processor: New Bug description: Regex_ascii raises error about a character in a regex in phonetic-string-similarity.xq:95. The character '^' is not allowed there. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867272/+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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug_882002 into lp:zorba
Review: Approve Ok -- https://code.launchpad.net/~zorba-coders/zorba/bug_882002/+merge/80454 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-annotations into lp:zorba
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/markos-annotations into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899
simplified and optimized the implementation for annotations
--
https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/annotations/annotations.cpp'
--- src/annotations/annotations.cpp 2011-08-11 17:19:25 +
+++ src/annotations/annotations.cpp 2011-11-01 13:50:27 +
@@ -15,21 +15,17 @@
*/
#include stdafx.h
-#include cmath
-
#include annotations/annotations.h
-#include system/globalenv.h
#include store/api/item.h
#include store/api/item_factory.h
-#include context/static_context.h
-#include context/static_context_consts.h
#include compiler/expression/expr.h
#include zorbaserialization/serialization_engine.h
#include diagnostics/assert.h
+#include diagnostics/util_macros.h
#include system/globalenv.h
@@ -38,90 +34,270 @@
SERIALIZABLE_CLASS_VERSIONS(AnnotationInternal)
END_SERIALIZABLE_CLASS_VERSIONS(AnnotationInternal)
-SERIALIZABLE_CLASS_VERSIONS(AnnotationLiteral)
-END_SERIALIZABLE_CLASS_VERSIONS(AnnotationLiteral)
-
SERIALIZABLE_CLASS_VERSIONS(AnnotationList)
END_SERIALIZABLE_CLASS_VERSIONS(AnnotationList);
-/***
-
-/
-AnnotationInternal::AnnotationInternal(const store::Item_t aExpandedQName)
+std::vectorstore::Item_t
+AnnotationInternal::theAnnotId2NameMap;
+
+ItemHandleHashMapAnnotationInternal::AnnotationId
+AnnotationInternal::theAnnotName2IdMap(0, NULL, 64, false);
+
+std::vectorAnnotationInternal::RuleBitSet
+AnnotationInternal::theRuleSet;
+
+
+/***
+ Static method, called from GlobalEnvironment::init()
+/
+void AnnotationInternal::createBuiltIn()
+{
+ store::Item_t qname;
+ AnnotationId id;
+
+ theAnnotId2NameMap.resize(zann_end);
+
+ //
+ // W3C annotations
+ //
+ GENV_ITEMFACTORY-createQName(qname, static_context::W3C_FN_NS, fn, public);
+ id = fn_public;
+ theAnnotId2NameMap[id] = qname;
+ theAnnotName2IdMap.insert(qname, id);
+
+ GENV_ITEMFACTORY-createQName(qname, static_context::W3C_FN_NS, fn, private);
+ id = fn_private;
+ theAnnotId2NameMap[id] = qname;
+ theAnnotName2IdMap.insert(qname, id);
+
+#define ZANN(a, b) \
+ GENV_ITEMFACTORY-createQName(qname, ZORBA_ANNOTATIONS_NS, , #a); \
+ id = zann_##b; \
+ theAnnotId2NameMap[id] = qname; \
+ theAnnotName2IdMap.insert(qname, id);
+
+
+ //
+ // Zorba annotations - deterministic/nondeterministic
+ //
+ ZANN(deterministic, deterministic);
+ ZANN(nondeterministic, nondeterministic);
+
+ //
+ // Zorba annotations - xquery scripting
+ //
+ ZANN(assignable, assignable);
+ ZANN(nonassignable, nonassignable);
+
+ ZANN(sequential, sequential);
+ ZANN(nonsequential, nonsequential);
+
+ //
+ // Zorba annotations - misc
+ //
+ ZANN(variadic, variadic);
+
+ ZANN(streamable, streamable);
+
+ //
+ // Zorba annotations - xqddf
+ //
+ ZANN(unique, unique);
+ ZANN(nonunique, nonunique);
+
+ ZANN(value-equality, value_equality);
+ ZANN(general-equality, general_equality);
+ ZANN(value-range, value_range);
+ ZANN(general-range, general_range);
+
+ ZANN(automatic, automatic);
+ ZANN(manual, manual);
+
+ ZANN(mutable, mutable);
+ ZANN(queue, queue);
+ ZANN(append-only, append_only);
+ ZANN(const, const);
+
+ ZANN(ordered, ordered);
+ ZANN(unordered, unordered);
+
+ ZANN(read-only-nodes, read_only_nodes);
+ ZANN(mutable-nodes, mutable_nodes);
+
+#undef ZANN
+
+ // create a set of rules to detect conflicts between annotations
+#define ZANN(a) \
+ ( 1 static_castuint64_t(AnnotationInternal::a) )
+
+ theRuleSet.push_back(
+ ZANN(zann_unique) |
+ ZANN(zann_nonunique));
+
+ theRuleSet.push_back(
+ ZANN(zann_value_equality) |
+ ZANN(zann_general_equality) |
+ ZANN(zann_value_range) |
+ ZANN(zann_general_range));
+
+ theRuleSet.push_back(
+ ZANN(zann_automatic) |
+ ZANN(zann_manual));
+
+ theRuleSet.push_back(
+ ZANN(zann_mutable) |
+ ZANN(zann_queue) |
+ ZANN(zann_append_only) |
+ ZANN(zann_const));
+
+ theRuleSet.push_back(
+ ZANN(zann_ordered) |
+ ZANN(zann_unordered));
+
+ theRuleSet.push_back(
+ ZANN(zann_assignable) |
+ ZANN(zann_nonassignable));
+
+ theRuleSet.push_back(
+ ZANN(zann_deterministic) |
+ ZANN(zann_nondeterministic));
+
+ theRuleSet.push_back(
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-annotations into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-annotations-2011-11-01T13-52-04.731Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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/markos-annotations into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-annotations 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 markos-annotations-2011-11-01T13-52-04.731Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-annotations into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-annotations-2011-11-01T15-09-08.99Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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/markos-annotations into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-annotations 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 markos-annotations-2011-11-01T15-09-08.99Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-annotations into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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 867230] Re: unit-convert test should not hit the web
The test is now passing indeed but this is part of the continuous Zorba testing infrastructure. At one point the GPS coordibates returned for this test contained more decimals than the expected result and this cause the test to fail. Instead of the expected result: 38.725735 -9.15021 something like this was returned: 38.72573501 -9.1502110 In order to avoid such problems in the future, could we change the test such that the decimals does not count? For instance we could cast the returned values to xs:integer, what do you think? -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867230 Title: unit-convert test should not hit the web Status in Zorba - The XQuery Processor: New Bug description: The unit-conversion data-cleaning library uses a web service. Currently that web service isn't responding, leading to remote queue delays and failures, so I have disabled the test on the remote queue. IMHO this library should not require the web, at least for a decent set of well-known units (the test case in question is converting miles to kilometers). To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867230/+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
Re: [Zorba-coders] [Merge] lp:~juan457/zorba/xqxq-api-changes into lp:zorba
Juan, can you please make zorba-coders be the owner of this branch. I want to make some changes to it, but I cannot because it currently belongs to you only. -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 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:~markos-za/zorba/indexes into lp:zorba
Review: Needs Fixing some parameters of the probe-index-range-general#7 function are not documented. Also, should this function be variadic? -- https://code.launchpad.net/~markos-za/zorba/indexes/+merge/79334 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:~juan457/zorba/xqxq-api-changes into lp:zorba
Done, just changed the ownership to zorba-coders 2011/11/1 Markos Zaharioudakis markos...@yahoo.com Juan, can you please make zorba-coders be the owner of this branch. I want to make some changes to it, but I cannot because it currently belongs to you only. -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 You are the owner of lp:~juan457/zorba/xqxq-api-changes. -- -JuanZa https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 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:~markos-za/zorba/indexes into lp:zorba
some parameters of the probe-index-range-general#7 function are not documented. Also, should this function be variadic? I have added the missing params. No, the function is not variadic because it applies to general indexes only, whicg have only one key column. -- https://code.launchpad.net/~markos-za/zorba/indexes/+merge/79334 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/markos-annotations into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-annotations into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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/markos-annotations into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-annotations into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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-annotations into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-annotations-2011-11-01T17-45-02.768Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-annotations/+merge/80899 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:~markos-za/zorba/indexes into lp:zorba
Review: Needs Fixing Markos, the branch is now conflicting with the trunk. I have tried to resolve it but I don't have permissions to push to this branch. -- https://code.launchpad.net/~markos-za/zorba/indexes/+merge/79334 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:~juan457/zorba/xqxq-api-changes into lp:zorba
The implementation of getExternalVariables in the xqueryimpl level is done. Juan, I fixed the implementation of the XQuery::getExternalVariables() method. The main problem there was that you were comparing QName items using their string value. This is not correct because the string value of a QName does not contain its naespece URI, so it is possible for 2 QNames to have the same string value, even though the QNames are not the same. Please take a look at the changes. -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-api-changes/+merge/79589 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:~markos-za/zorba/indexes into lp:zorba
Review: Approve -- https://code.launchpad.net/~markos-za/zorba/indexes/+merge/79334 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:~markos-za/zorba/indexes into lp:zorba
Review: Approve -- https://code.launchpad.net/~markos-za/zorba/indexes/+merge/79334 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
