Add container traits interface and implementation

Implementation is provided for the standard C++ containers.

6 files changed, 580 insertions, 0 deletions

diff --git a/odb/container-traits.hxx b/odb/container-traits.hxx
new file mode 100644
index 0000000..0d88731
--- /dev/null
+++ b/odb/container-traits.hxx
@@ -0,0 +1,181 @@
+// file      : odb/container-traits.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_CONTAINER_TRAITS_HXX
+#define ODB_CONTAINER_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <odb/forward.hxx>
+
+namespace odb
+{
+  // Keep this enum synchronized with the one in odb/odb/context.hxx.
+  //
+  enum container_kind
+  {
+    ck_ordered,
+    ck_set,
+    ck_multiset,
+    ck_map,
+    ck_multimap
+  };
+
+  //
+  // Container API provided by the generated code.
+  //
+
+  // Ordered containers.
+  //
+  template <typename I, typename V>
+  struct ordered_functions
+  {
+    typedef I index_type;
+    typedef V value_type;
+
+    void
+    insert_one (I index, const V& value) const
+    {
+      insert_one_ (index, value, data_);
+    }
+
+    bool
+    load_all (I& next_index, V& next_value) const
+    {
+      return load_all_ (next_index, next_value, data_);
+    }
+
+    void
+    delete_all () const
+    {
+      delete_all_ (data_);
+    }
+
+    // Implementation details.
+    //
+  public:
+    typedef void (*insert_one_type) (I, const V&, void*);
+    typedef bool (*load_all_type) (I&, V&, void*);
+    typedef void (*delete_all_type) (void*);
+
+    ordered_functions (void* data,
+                       insert_one_type io,
+                       load_all_type la,
+                       delete_all_type da)
+        : data_ (data), insert_one_ (io), load_all_ (la), delete_all_ (da)
+    {
+    }
+
+  private:
+    void* data_;
+    insert_one_type insert_one_;
+    load_all_type load_all_;
+    delete_all_type delete_all_;
+  };
+
+  // Set/multiset containers.
+  //
+  template <typename V>
+  struct set_functions
+  {
+    typedef V value_type;
+
+    void
+    insert_one (const V& value) const
+    {
+      insert_one_ (value, data_);
+    }
+
+    bool
+    load_all (V& next_value) const
+    {
+      return load_all_ (next_value, data_);
+    }
+
+    void
+    delete_all () const
+    {
+      delete_all_ (data_);
+    }
+
+    // Implementation details.
+    //
+  public:
+    typedef void (*insert_one_type) (const V&, void*);
+    typedef bool (*load_all_type) (V&, void*);
+    typedef void (*delete_all_type) (void*);
+
+    set_functions (void* data,
+                   insert_one_type io,
+                   load_all_type la,
+                   delete_all_type da)
+        : data_ (data), insert_one_ (io), load_all_ (la), delete_all_ (da)
+    {
+    }
+
+  private:
+    void* data_;
+    insert_one_type insert_one_;
+    load_all_type load_all_;
+    delete_all_type delete_all_;
+  };
+
+  // Map/multimap containers.
+  //
+  template <typename K, typename V>
+  struct map_functions
+  {
+    typedef K key_type;
+    typedef V value_type;
+
+    void
+    insert_one (const K& key, const V& value) const
+    {
+      insert_one_ (key, value, data_);
+    }
+
+    bool
+    load_all (K& next_key, V& next_value) const
+    {
+      return load_all_ (next_key, next_value, data_);
+    }
+
+    void
+    delete_all () const
+    {
+      delete_all_ (data_);
+    }
+
+    // Implementation details.
+    //
+  public:
+    typedef void (*insert_one_type) (const K&, const V&, void*);
+    typedef bool (*load_all_type) (K&, V&, void*);
+    typedef void (*delete_all_type) (void*);
+
+    map_functions (void* data,
+                   insert_one_type io,
+                   load_all_type la,
+                   delete_all_type da)
+        : data_ (data), insert_one_ (io), load_all_ (la), delete_all_ (da)
+    {
+    }
+
+  private:
+    void* data_;
+    insert_one_type insert_one_;
+    load_all_type load_all_;
+    delete_all_type delete_all_;
+  };
+}
+
+#include <odb/post.hxx>
+
+#include <odb/std-map-traits.hxx>
+#include <odb/std-set-traits.hxx>
+#include <odb/std-list-traits.hxx>
+#include <odb/std-vector-traits.hxx>
+
+#endif // ODB_CONTAINER_TRAITS_HXX
diff --git a/odb/forward.hxx b/odb/forward.hxx
index e2bef03..bd6cbcb 100644
--- a/odb/forward.hxx
+++ b/odb/forward.hxx
@@ -30,6 +30,9 @@ namespace odb
 
     template <typename T>
     class composite_value_traits;
+
+    template <typename C>
+    class container_traits;
   };
 }
 
diff --git a/odb/std-list-traits.hxx b/odb/std-list-traits.hxx
new file mode 100644
index 0000000..2f6ec96
--- /dev/null
+++ b/odb/std-list-traits.hxx
@@ -0,0 +1,73 @@
+// file      : odb/std-list-traits.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_STD_LIST_TRAITS_HXX
+#define ODB_STD_LIST_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <list>
+
+#include <odb/container-traits.hxx>
+
+namespace odb
+{
+  template <typename V>
+  class access::container_traits<std::list<V> >
+  {
+  public:
+    static container_kind const kind = ck_ordered;
+
+    typedef V value_type;
+    typedef typename std::list<V>::size_type index_type;
+    typedef std::list<V> container_type;
+
+    typedef ordered_functions<index_type, value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      index_type i (0);
+      for (typename container_type::const_iterator j (c.begin ()),
+             e (c.end ()); j != e; ++j)
+        f.insert_one (i++, *j);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        index_type dummy;
+        c.push_back (value_type ());
+        more = f.load_all (dummy, c.back ());
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      index_type i (0);
+      for (typename container_type::const_iterator j (c.begin ()),
+             e (c.end ()); j != e; ++j)
+        f.insert_one (i++, *j);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_STD_LIST_TRAITS_HXX
diff --git a/odb/std-map-traits.hxx b/odb/std-map-traits.hxx
new file mode 100644
index 0000000..4f71868
--- /dev/null
+++ b/odb/std-map-traits.hxx
@@ -0,0 +1,130 @@
+// file      : odb/std-map-traits.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_STD_MAP_TRAITS_HXX
+#define ODB_STD_MAP_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <map>
+
+#include <odb/container-traits.hxx>
+
+namespace odb
+{
+  template <typename K, typename V>
+  class access::container_traits<std::map<K, V> >
+  {
+  public:
+    static container_kind const kind = ck_map;
+
+    typedef K key_type;
+    typedef V value_type;
+    typedef std::map<K, V> container_type;
+    typedef typename container_type::value_type pair_type;
+
+    typedef map_functions<key_type, value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (i->first, i->second);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        key_type k;
+        value_type v;
+        more = f.load_all (k, v);
+        c.insert (pair_type (k, v));
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (i->first, i->second);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+
+  // C++-03 does not guarantee insertion order of equal values but C++-0x
+  // changes that. The current implementation in the generated code does
+  // not guarantee this either.
+  //
+  template <typename K, typename V>
+  class access::container_traits<std::multimap<K, V> >
+  {
+  public:
+    static container_kind const kind = ck_multimap;
+
+    typedef K key_type;
+    typedef V value_type;
+    typedef std::multimap<K, V> container_type;
+    typedef typename container_type::value_type pair_type;
+
+    typedef map_functions<key_type, value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (i->first, i->second);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        key_type k;
+        value_type v;
+        more = f.load_all (k, v);
+        c.insert (pair_type (k, v));
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (i->first, i->second);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_STD_MAP_TRAITS_HXX
diff --git a/odb/std-set-traits.hxx b/odb/std-set-traits.hxx
new file mode 100644
index 0000000..0c8071a
--- /dev/null
+++ b/odb/std-set-traits.hxx
@@ -0,0 +1,124 @@
+// file      : odb/std-set-traits.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_STD_SET_TRAITS_HXX
+#define ODB_STD_SET_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <set>
+
+#include <odb/container-traits.hxx>
+
+namespace odb
+{
+  template <typename V>
+  class access::container_traits<std::set<V> >
+  {
+  public:
+    static container_kind const kind = ck_set;
+
+    typedef V value_type;
+    typedef std::set<V> container_type;
+
+    typedef set_functions<value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (*i);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        value_type v;
+        more = f.load_all (v);
+        c.insert (v);
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (*i);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+
+  // C++-03 does not guarantee insertion order of equal values but C++-0x
+  // changes that. The current implementation in the generated code does
+  // not guarantee this either.
+  //
+  template <typename V>
+  class access::container_traits<std::multiset<V> >
+  {
+  public:
+    static container_kind const kind = ck_multiset;
+
+    typedef V value_type;
+    typedef std::multiset<V> container_type;
+
+    typedef set_functions<value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (*i);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        value_type v;
+        more = f.load_all (v);
+        c.insert (v);
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      for (typename container_type::const_iterator i (c.begin ()),
+             e (c.end ()); i != e; ++i)
+        f.insert_one (*i);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_STD_SET_TRAITS_HXX
diff --git a/odb/std-vector-traits.hxx b/odb/std-vector-traits.hxx
new file mode 100644
index 0000000..6c439c8
--- /dev/null
+++ b/odb/std-vector-traits.hxx
@@ -0,0 +1,69 @@
+// file      : odb/std-vector-traits.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_STD_VECTOR_TRAITS_HXX
+#define ODB_STD_VECTOR_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <vector>
+
+#include <odb/container-traits.hxx>
+
+namespace odb
+{
+  template <typename V>
+  class access::container_traits<std::vector<V> >
+  {
+  public:
+    static container_kind const kind = ck_ordered;
+
+    typedef V value_type;
+    typedef typename std::vector<V>::size_type index_type;
+    typedef std::vector<V> container_type;
+
+    typedef ordered_functions<index_type, value_type> functions;
+
+  public:
+    static void
+    persist (const container_type& c, const functions& f)
+    {
+      for (index_type i (0), n (c.size ()); i < n; ++i)
+        f.insert_one (i, c[i]);
+    }
+
+    static void
+    load (container_type& c, bool more, const functions& f)
+    {
+      c.clear ();
+
+      while (more)
+      {
+        index_type dummy;
+        c.push_back (value_type ());
+        more = f.load_all (dummy, c.back ());
+      }
+    }
+
+    static void
+    update (const container_type& c, const functions& f)
+    {
+      f.delete_all ();
+
+      for (index_type i (0), n (c.size ()); i < n; ++i)
+        f.insert_one (i, c[i]);
+    }
+
+    static void
+    erase (const functions& f)
+    {
+      f.delete_all ();
+    }
+  };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_STD_VECTOR_TRAITS_HXX