Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba
Thanks Markos, I renamed the functions to attachToCollection/detachFromCollection. Tree IDs are needed in Sausalito, and I thought it would make sense in Zorba too even if it is not used yet. This keeps the diff between Zorba and Sausalito small... -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-static-casts-2012-08-29T09-15-57.932Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue job jsoniq-static-casts-2012-08-29T09-15-57.932Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-static-casts-2012-08-29T10-14-02.99Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue job jsoniq-static-casts-2012-08-29T10-14-02.99Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Thanks Matthias, I missed this one! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Ghislain, it seems that the jsoniq tree id is not currently used anywhere. Do you envision that it will ever be needed somewhere? If not, let's remove it. Also, I don't like the fix unfix names. What about addInCollection and removeFromCollection? (but this is up to you, I will approve anyway). -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Review: Approve JSONItem::unfix contains a return statement before an assertion. Not sure if that's on purpose. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-static-casts-2012-08-27T16-42-57.41Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue job jsoniq-static-casts-2012-08-27T16-42-57.41Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
I would say Zorba 2.7. I opened a but and marked it accordingly. The static casts are important as they could cause crashes. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
If it's done and working, no reason not to merge it immediately. Releases sometimes have to wait for features, but the reverse is not usually true unless the feature includes a backwards-incompatible change. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/jsoniq-static-casts
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961
Simplified JSON items class and fixed some Xml Node static casts to handle JSON
items as well.
--
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/json_items.cpp'
--- src/store/naive/json_items.cpp 2012-07-11 15:38:39 +
+++ src/store/naive/json_items.cpp 2012-08-09 13:45:44 +
@@ -76,6 +76,119 @@
/
// //
+// JSON Item //
+// //
+/
+/**
+
+***/
+JSONItem::~JSONItem()
+{
+ delete theTree;
+}
+
+/**
+
+***/
+const simplestore::Collection* JSONItem::getCollection() const
+{
+ if (theTree == NULL)
+ {
+return NULL;
+ }
+ return theTree-getCollection();
+}
+
+
+/**
+
+***/
+const TreeId JSONItem::getTreeId() const
+{
+ ZORBA_ASSERT(theTree);
+ return theTree-getTreeId();
+}
+
+
+/**
+
+***/
+JSONItem* JSONItem::getRoot() const
+{
+ ZORBA_ASSERT(theTree);
+ return theTree-getRoot();
+}
+
+/**
+
+***/
+void JSONItem::free()
+{
+ destroy();
+}
+
+/**
+
+***/
+void JSONItem::destroy()
+{
+ delete this;
+}
+
+/***
+
+/
+void JSONItem::fix(Collection* aCollection, const TreeId aTreeId)
+{
+ ASSERT_INVARIANT();
+
+ assert(aCollection);
+
+ // Attach
+ assert(getTree() == NULL);
+ setTree(new JSONTree());
+ getTree()-setRoot(this);
+ getTree()-setCollection(aCollection);
+ getTree()-setTreeId(aTreeId);
+
+ ASSERT_INVARIANT();
+}
+
+/***
+
+/
+void JSONItem::unfix()
+{
+ ASSERT_INVARIANT();
+
+ JSONTree* lTree = getTree();
+ // Detach
+ assert(lTree);
+ delete lTree;
+ setTree(NULL);
+ return;
+
+ ASSERT_INVARIANT();
+}
+
+#ifndef NDEBUG
+/**
+
+***/
+void JSONItem::assertInvariant() const
+{
+ if (theTree != NULL)
+ {
+assert(theTree-getCollection() != NULL);
+assert(theTree-getRoot() != NULL);
+assert(isThisTreeOfAllDescendants(theTree));
+assert(theTree-getRoot()-isThisJSONItemInDescendance(this));
+ }
+}
+#endif
+
+/
+// //
// Object //
// //
/
@@ -93,36 +206,6 @@
/**
***/
-void setJSONRoot(store::Item* aJSONItem, const JSONItem* aRoot)
-{
- if (aJSONItem-isJSONObject())
- {
-assert(dynamic_castSimpleJSONObject*(aJSONItem));
-SimpleJSONObject* lObject = static_castSimpleJSONObject*(aJSONItem);
-
-// Only attach or detach allowed - no direct reattach.
-assert(aRoot == NULL || lObject-theRoot == NULL);
-lObject-setRoot(aRoot);
- }
- else if
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-static-casts-2012-08-09T13-50-04.515Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Validation queue job jsoniq-static-casts-2012-08-09T13-50-04.515Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts 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/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-static-casts into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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/jsoniq-static-casts into lp:zorba
Ghislain, has this been scheduled for a release? If so, which one? -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-static-casts/+merge/118961 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
