Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba
Review: Approve I didn't really understand the reasoning for this change. I guess it's a sausalito thing. But it's ok with the simplestore, so i approve. -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/builtin-qnames-in-pool-fix-2012-06-20T17-51-51.668Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Validation queue job builtin-qnames-in-pool-fix-2012-06-20T17-51-51.668Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Ghislain Fourny has proposed merging
lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805
The builtin schema type names, in the store, are now created directly from the
pool (this is to prevent a cyclic dependency if another item factory than the
simple item factory needs to access the store to produce the QNames, because at
this point the store has not been initialized yet).
--
https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/store.cpp'
--- src/store/naive/store.cpp 2012-06-15 21:31:03 +
+++ src/store/naive/store.cpp 2012-06-18 12:46:32 +
@@ -185,77 +185,73 @@
void Store::initTypeNames()
{
const char* ns = XS_URI;
- BasicItemFactory* f = static_castBasicItemFactory*(theItemFactory);
theSchemaTypeNames.resize(store::XS_LAST);
#ifdef ZORBA_WITH_JSON
- f-createQName(JDM_NULL_QNAME, JDM_URI, jdm, null);
- f-createQName(JDM_OBJECT_QNAME, JDM_URI, jdm, object);
- f-createQName(JDM_ARRAY_QNAME, JDM_URI, jdm, array);
+ JDM_NULL_QNAME = theQNamePool-insert(JDM_URI, jdm, null);
+ JDM_OBJECT_QNAME = theQNamePool-insert(JDM_URI, jdm, object);
+ JDM_ARRAY_QNAME = theQNamePool-insert(JDM_URI, jdm, array);
#endif
- f-createQName(XS_UNTYPED_QNAME, ns, xs, untyped);
-
- f-createQName(XS_ANY_QNAME, ns, xs, anyType);
-
- f-createQName(XS_ANY_SIMPLE_QNAME, ns, xs, anySimpleType);
-
- f-createQName(theSchemaTypeNames[store::XS_ANY_ATOMIC], ns, xs, anyAtomicType);
-
- f-createQName(theSchemaTypeNames[store::XS_UNTYPED_ATOMIC], ns, xs, untypedAtomic);
-
- f-createQName(theSchemaTypeNames[store::XS_ANY_URI],ns, xs, anyURI);
-
- f-createQName(theSchemaTypeNames[store::XS_QNAME], ns, xs, QName);
-
- f-createQName(theSchemaTypeNames[store::XS_NOTATION], ns, xs, NOTATION);
-
- f-createQName(theSchemaTypeNames[store::XS_STRING], ns, xs, string);
- f-createQName(theSchemaTypeNames[store::XS_NORMALIZED_STRING], ns, xs, normalizedString);
- f-createQName(theSchemaTypeNames[store::XS_TOKEN], ns, xs, token);
- f-createQName(theSchemaTypeNames[store::XS_NMTOKEN],ns, xs, NMTOKEN);
- f-createQName(theSchemaTypeNames[store::XS_LANGUAGE], ns, xs, language);
- f-createQName(theSchemaTypeNames[store::XS_NAME], ns, xs, Name);
- f-createQName(theSchemaTypeNames[store::XS_NCNAME], ns, xs, NCName);
- f-createQName(theSchemaTypeNames[store::XS_ID], ns, xs, ID);
- f-createQName(theSchemaTypeNames[store::XS_IDREF], ns, xs, IDREF);
- f-createQName(theSchemaTypeNames[store::XS_ENTITY], ns, xs, ENTITY);
-
- f-createQName(theSchemaTypeNames[store::XS_DATETIME], ns, xs, dateTime);
- f-createQName(theSchemaTypeNames[store::XS_DATE], ns, xs, date);
- f-createQName(theSchemaTypeNames[store::XS_TIME], ns, xs, time);
- f-createQName(theSchemaTypeNames[store::XS_GYEAR_MONTH],ns, xs, gYearMonth);
- f-createQName(theSchemaTypeNames[store::XS_GYEAR], ns, xs, gYear);
- f-createQName(theSchemaTypeNames[store::XS_GMONTH_DAY], ns, xs, gMonthDay);
- f-createQName(theSchemaTypeNames[store::XS_GDAY], ns, xs, gDay);
- f-createQName(theSchemaTypeNames[store::XS_GMONTH], ns, xs, gMonth);
-
- f-createQName(theSchemaTypeNames[store::XS_DURATION], ns, xs, duration);
- f-createQName(theSchemaTypeNames[store::XS_DT_DURATION],ns, xs, dayTimeDuration);
- f-createQName(theSchemaTypeNames[store::XS_YM_DURATION],ns, xs, yearMonthDuration);
-
- f-createQName(theSchemaTypeNames[store::XS_FLOAT], ns, xs, float);
- f-createQName(theSchemaTypeNames[store::XS_DOUBLE], ns, xs, double);
- f-createQName(theSchemaTypeNames[store::XS_DECIMAL],ns, xs, decimal);
- f-createQName(theSchemaTypeNames[store::XS_INTEGER],ns, xs, integer);
- f-createQName(theSchemaTypeNames[store::XS_NON_POSITIVE_INTEGER], ns, xs, nonPositiveInteger);
- f-createQName(theSchemaTypeNames[store::XS_NON_NEGATIVE_INTEGER], ns, xs, nonNegativeInteger);
- f-createQName(theSchemaTypeNames[store::XS_NEGATIVE_INTEGER], ns, xs, negativeInteger);
- f-createQName(theSchemaTypeNames[store::XS_POSITIVE_INTEGER], ns, xs, positiveInteger);
-
- f-createQName(theSchemaTypeNames[store::XS_LONG], ns, xs, long);
- f-createQName(theSchemaTypeNames[store::XS_INT],ns, xs, int);
- f-createQName(theSchemaTypeNames[store::XS_SHORT], ns, xs, short);
- f-createQName(theSchemaTypeNames[store::XS_BYTE], ns, xs, byte);
- f-createQName(theSchemaTypeNames[store::XS_UNSIGNED_LONG], ns, xs, unsignedLong);
- f-createQName(theSchemaTypeNames[store::XS_UNSIGNED_INT], ns, xs,
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/builtin-qnames-in-pool-fix-2012-06-18T12-47-01.732Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Validation queue job builtin-qnames-in-pool-fix-2012-06-18T12-47-01.732Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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/builtin-qnames-in-pool-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/builtin-qnames-in-pool-fix into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 -- https://code.launchpad.net/~zorba-coders/zorba/builtin-qnames-in-pool-fix/+merge/110805 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
