zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/simplestore-collection-api into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/simplestore-collection-api/+merge/95918

Introduces an abstract layer between zorba::store::collection and zorba::simplestore::SimpleCollection. In this new merge proposal, the two non-abstract functions are now non-virtual.
-- 
https://code.launchpad.net/~zorba-coders/zorba/simplestore-collection-api/+merge/95918
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/collection.h'
--- src/store/naive/collection.h	2012-03-01 14:16:27 +0000
+++ src/store/naive/collection.h	2012-03-05 15:23:26 +0000
@@ -99,14 +99,14 @@
       const store::Item* name,
       std::vector<store::Index*>& indexes);
 
-  virtual void getIndexes(std::vector<store::Index*>& indexes);
+  void getIndexes(std::vector<store::Index*>& indexes);
 
   /**** Returns active integrity constraints referencing this collection ******/
   static void getActiveICs(
       const store::Item* name,
       std::vector<store::IC*>& ics);
 
-  virtual void getActiveICs(std::vector<store::IC*>& ics);
+  void getActiveICs(std::vector<store::IC*>& ics);
 
 }; /* class Collection */
 

=== 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:23:26 +0000
@@ -47,6 +47,13 @@
 /******************************************************************************
 
 ********************************************************************************/
+IndexImpl::IndexImpl()
+{
+}
+
+/******************************************************************************
+
+********************************************************************************/
 IndexImpl::IndexImpl(
     const store::Item_t& qname,
     const store::IndexSpecification& spec)

=== 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:23:26 +0000
@@ -199,6 +199,16 @@
 /******************************************************************************
 
 ********************************************************************************/
+ValueIndex::ValueIndex()
+  :
+theCompFunction(0, 0, std::vector<std::string>())
+{
+}
+
+
+/******************************************************************************
+
+********************************************************************************/
 ValueIndex::~ValueIndex()
 {
 }
@@ -289,6 +299,17 @@
 /******************************************************************************
 
 ********************************************************************************/
+ValueHashIndex::ValueHashIndex()
+  :
+  ValueIndex(),
+  theMap(theCompFunction, 0, false)
+{
+}
+  
+
+/******************************************************************************
+
+********************************************************************************/
 ValueHashIndex::~ValueHashIndex()
 {
   IndexMap::iterator ite = theMap.begin();
@@ -559,6 +580,17 @@
 /******************************************************************************
 
 ********************************************************************************/
+ValueTreeIndex::ValueTreeIndex()
+  :
+  ValueIndex(),
+  theMap(theCompFunction)
+{
+}
+
+
+/******************************************************************************
+
+********************************************************************************/
 ValueTreeIndex::~ValueTreeIndex()
 {
   IndexMap::iterator ite = theMap.begin();

=== 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:23:26 +0000
@@ -80,6 +80,8 @@
 
 protected:
   ValueIndex(const store::Item_t& qname, const store::IndexSpecification& spec);
+  
+  ValueIndex();
 
   virtual ~ValueIndex();
 
@@ -134,6 +136,8 @@
   ValueHashIndex(
       const store::Item_t& qname,
       const store::IndexSpecification& spec);
+      
+  ValueHashIndex();
 
   ~ValueHashIndex();
 
@@ -217,6 +221,8 @@
   ValueTreeIndex(
         const store::Item_t& qname,
         const store::IndexSpecification& spec);
+        
+  ValueTreeIndex();
 
   ~ValueTreeIndex();