DESCRIPTION

CBD-363: improved performance of merge algorithm (query stats)

Change-Id: I62413b066d5c4c5ec89ada84d5ce43d8fa128d36


COMMENTS

author: Hugo Blankenship
date: 2012-06-13 17:37:19.851000000

Patch Set 1:

Build Started http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/876/ 

-------------------------------------
author: Hugo Blankenship
date: 2012-06-13 17:46:12.316000000

Patch Set 1: Verified

Build Successful 

http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/876/ : SUCCESS

-------------------------------------
author: Nora Conway
date: 2012-06-13 19:25:25.544000000

Patch Set 1: (1 inline comment)



Line:148, pytests/performance/eperf.py -> indexes	= [0, 0]
for i in xrange(num_steps):
   ...
   for idx, ops_array in enumerate([base_ops[indexes[0]:, new_ops[indexes[1]]])\
:
     for ops in	_ops_arraY:
       if ...:
      	  indexes[idx] += 1
       else:
      	  break

-------------------------------------
author: Tate Garrett
date: 2012-06-13 22:46:33.204000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
