Merge lp:~zorba-coders/zorba/bool-opt into lp:zorba

[Matthias Brantner]

optimization: only have exactly two instances of boolean items in the simple store

optimization: only have exactly two instances of boolean items in the simple store

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T18-38-13.116Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bool-opt-2011-12-05T18-38-13.116Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T19-42-06.548Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bool-opt-2011-12-05T19-42-06.548Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bool-opt-2011-12-05T20-11-08.647Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bool-opt-2011-12-05T20-11-08.647Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2011-10-15 10:41:19 +0000
+++ src/store/naive/simple_item_factory.cpp	2011-12-05 18:30:31 +0000
@@ -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 +0000
+++ src/store/naive/simple_item_factory.h	2011-12-05 18:30:31 +0000
@@ -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);