Merge lp:~zorba-coders/zorba/msb-misc into lp:zorba

[Matthias Brantner]

performance improvements for json array construction

[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/msb-misc-2013-03-11T19-50-38.426Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job msb-misc-2013-03-11T19-50-38.426Z 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, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending.

[lp:~zorba-coders/zorba/msb-misc]

11282. By [u'Paul J. Lucas <email address hidden>'] on 2013-03-12

Fixed warnings, mostly. Approved: Matthias Brantner, Paul J. Lucas

[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/msb-misc-2013-03-12T09-01-51.999Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job msb-misc-2013-03-12T09-01-51.999Z is finished. The final status was:

All tests succeeded!

[lp:~zorba-coders/zorba/msb-misc]

11283. By [u'Matthias Brantner <[e-mail]>'] on 2013-03-12

performance improvements for json array construction Approved: Markos Zaharioudakis, Matthias Brantner

=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h	2013-02-26 04:12:43 +0000
+++ src/store/naive/json_items.h	2013-03-11 19:47:36 +0000
@@ -407,6 +407,11 @@
   SimpleJSONArray()
   {}
 
+  SimpleJSONArray(size_t aReservedSize)
+  {
+    theContent.reserve(aReservedSize);
+  }
+
   virtual ~SimpleJSONArray();
 
   // store API

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2013-03-07 10:10:10 +0000
+++ src/store/naive/simple_item_factory.cpp	2013-03-11 19:47:36 +0000
@@ -2172,13 +2172,13 @@
     const std::vector<store::Iterator_t>& sources,
     const std::vector<store::CopyMode>& copyModes)
 {
-  result = new json::SimpleJSONArray();
+  csize numSources = sources.size();
+
+  result = new json::SimpleJSONArray(numSources);
 
   json::JSONArray* array = static_cast<json::JSONArray*>(result.getp());
 
   store::Item_t item;
-
-  csize numSources = sources.size();
   for (csize i = 0; i < numSources; ++i)
   {
     store::Iterator* source = sources[i].getp();
@@ -2233,12 +2233,8 @@
 
   json::JSONArray* array = static_cast<json::JSONArray*>(result.getp());
 
-  std::vector<store::Item_t>::const_iterator ite = items.begin();
-  std::vector<store::Item_t>::const_iterator end = items.end();
-  for (; ite != end; ++ite)
-  {
-    array->push_back(*ite);
-  }
+  array->push_back(items);
+
   return true;
 }