Merge lp:~zorba-coders/zorba/index-default-constructors into lp:zorba

Proposed by Ghislain Fourny
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 10691
Merged at revision: 10699
Proposed branch: lp:~zorba-coders/zorba/index-default-constructors
Merge into: lp:zorba
Diff against target: 104 lines (+45/-0)
3 files modified
src/store/naive/simple_index.cpp (+7/-0)
src/store/naive/simple_index_value.cpp (+32/-0)
src/store/naive/simple_index_value.h (+6/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/index-default-constructors
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Matthias Brantner Approve
Review via email: mp+95899@code.launchpad.net

Commit message

Added default constructors for index classes in simple store.

Description of the change

Added default constructors for index classes in simple store.

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job index-default-constructors-2012-03-05T19-29-08.733Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job index-default-constructors-2012-03-05T21-22-08.351Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/store/naive/simple_index.cpp'
--- src/store/naive/simple_index.cpp 2012-02-15 10:25:02 +0000
+++ src/store/naive/simple_index.cpp 2012-03-05 15:33:23 +0000
@@ -47,6 +47,13 @@
47/******************************************************************************47/******************************************************************************
4848
49********************************************************************************/49********************************************************************************/
50IndexImpl::IndexImpl()
51{
52}
53
54/******************************************************************************
55
56********************************************************************************/
50IndexImpl::IndexImpl(57IndexImpl::IndexImpl(
51 const store::Item_t& qname,58 const store::Item_t& qname,
52 const store::IndexSpecification& spec)59 const store::IndexSpecification& spec)
5360
=== modified file 'src/store/naive/simple_index_value.cpp'
--- src/store/naive/simple_index_value.cpp 2012-02-15 10:25:02 +0000
+++ src/store/naive/simple_index_value.cpp 2012-03-05 15:33:23 +0000
@@ -199,6 +199,16 @@
199/******************************************************************************199/******************************************************************************
200200
201********************************************************************************/201********************************************************************************/
202ValueIndex::ValueIndex()
203 :
204theCompFunction(0, 0, std::vector<std::string>())
205{
206}
207
208
209/******************************************************************************
210
211********************************************************************************/
202ValueIndex::~ValueIndex()212ValueIndex::~ValueIndex()
203{213{
204}214}
@@ -289,6 +299,17 @@
289/******************************************************************************299/******************************************************************************
290300
291********************************************************************************/301********************************************************************************/
302ValueHashIndex::ValueHashIndex()
303 :
304 ValueIndex(),
305 theMap(theCompFunction, 0, false)
306{
307}
308
309
310/******************************************************************************
311
312********************************************************************************/
292ValueHashIndex::~ValueHashIndex()313ValueHashIndex::~ValueHashIndex()
293{314{
294 IndexMap::iterator ite = theMap.begin();315 IndexMap::iterator ite = theMap.begin();
@@ -559,6 +580,17 @@
559/******************************************************************************580/******************************************************************************
560581
561********************************************************************************/582********************************************************************************/
583ValueTreeIndex::ValueTreeIndex()
584 :
585 ValueIndex(),
586 theMap(theCompFunction)
587{
588}
589
590
591/******************************************************************************
592
593********************************************************************************/
562ValueTreeIndex::~ValueTreeIndex()594ValueTreeIndex::~ValueTreeIndex()
563{595{
564 IndexMap::iterator ite = theMap.begin();596 IndexMap::iterator ite = theMap.begin();
565597
=== modified file 'src/store/naive/simple_index_value.h'
--- src/store/naive/simple_index_value.h 2012-02-28 20:45:43 +0000
+++ src/store/naive/simple_index_value.h 2012-03-05 15:33:23 +0000
@@ -80,6 +80,8 @@
8080
81protected:81protected:
82 ValueIndex(const store::Item_t& qname, const store::IndexSpecification& spec);82 ValueIndex(const store::Item_t& qname, const store::IndexSpecification& spec);
83
84 ValueIndex();
8385
84 virtual ~ValueIndex();86 virtual ~ValueIndex();
8587
@@ -134,6 +136,8 @@
134 ValueHashIndex(136 ValueHashIndex(
135 const store::Item_t& qname,137 const store::Item_t& qname,
136 const store::IndexSpecification& spec);138 const store::IndexSpecification& spec);
139
140 ValueHashIndex();
137141
138 ~ValueHashIndex();142 ~ValueHashIndex();
139143
@@ -217,6 +221,8 @@
217 ValueTreeIndex(221 ValueTreeIndex(
218 const store::Item_t& qname,222 const store::Item_t& qname,
219 const store::IndexSpecification& spec);223 const store::IndexSpecification& spec);
224
225 ValueTreeIndex();
220226
221 ~ValueTreeIndex();227 ~ValueTreeIndex();
222228

Subscribers

People subscribed via source and target branches