Eliminate unused serialize: fixes #742

Conflicts: jubatus/core/framework/mixable.cpp jubatus/core/recommender/recommender_mock_storage.hpp
jubatus · May 7, 2014 · b6357e7 · b6357e7
1 parent fdfdaad
commit b6357e7
Show file tree

Hide file tree

Showing 41 changed files with 6 additions and 426 deletions.
diff --git a/jubatus/core/anomaly/lof.cpp b/jubatus/core/anomaly/lof.cpp
@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/cast.h"
 #include "jubatus/util/math/random.h"
 

diff --git a/jubatus/core/anomaly/lof_storage.cpp b/jubatus/core/anomaly/lof_storage.cpp
@@ -30,8 +30,6 @@
 #include "../recommender/euclid_lsh.hpp"
 #include "../recommender/recommender_factory.hpp"
 
-using jubatus::util::data::serialization::binary_iarchive;
-using jubatus::util::data::serialization::binary_oarchive;
 using jubatus::util::data::unordered_map;
 using jubatus::util::data::unordered_set;
 using jubatus::util::lang::shared_ptr;

diff --git a/jubatus/core/anomaly/lof_storage.hpp b/jubatus/core/anomaly/lof_storage.hpp
@@ -44,11 +44,6 @@ struct lof_entry {
   float lrd;
 
   MSGPACK_DEFINE(kdist, lrd);
-
-  template<typename Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(kdist) & JUBA_MEMBER(lrd);
-  }
 };
 
 typedef jubatus::util::data::unordered_map<std::string, lof_entry> lof_table_t;
@@ -137,14 +132,6 @@ class lof_storage {
   static void mark_removed(lof_entry& entry);
   static bool is_removed(const lof_entry& entry);
 
-  friend class jubatus::util::data::serialization::access;
-
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(lof_table_) & JUBA_MEMBER(lof_table_diff_);
-    ar & JUBA_MEMBER(neighbor_num_) & JUBA_MEMBER(reverse_nn_num_);
-  }
-
   float collect_lrds_from_neighbors(
       const std::vector<std::pair<std::string, float> >& neighbors,
       jubatus::util::data::unordered_map<std::string, float>&

diff --git a/jubatus/core/clustering/clustering.cpp b/jubatus/core/clustering/clustering.cpp
@@ -21,7 +21,6 @@
 #include <cassert>
 #include <string>
 #include <vector>
-#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/function.h"
 #include "jubatus/util/lang/bind.h"
 

diff --git a/jubatus/core/clustering/clustering_config.hpp b/jubatus/core/clustering/clustering_config.hpp
@@ -26,26 +26,6 @@ namespace jubatus {
 namespace core {
 namespace clustering {
 
-struct storage_config {
-  std::string method;
-
-  int bucket_size;
-  int bucket_length;
-  int compressed_bucket_size;
-  double forgetting_factor;
-  double forgetting_threshold;
-
-  template<typename Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(method)
-        & JUBA_MEMBER(bucket_size)
-        & JUBA_MEMBER(bucket_length)
-        & JUBA_MEMBER(compressed_bucket_size)
-        & JUBA_MEMBER(forgetting_factor)
-        & JUBA_MEMBER(forgetting_threshold);
-  }
-};
-
 struct clustering_config {
   clustering_config()
       : k(2),

diff --git a/jubatus/core/common/key_manager.hpp b/jubatus/core/common/key_manager.hpp
@@ -26,8 +26,6 @@
 
 #include <msgpack.hpp>
 #include "jubatus/util/data/unordered_map.h"
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "unordered_map.hpp"
 
 namespace jubatus {
@@ -64,12 +62,6 @@ class key_manager {
   std::vector<std::string> get_all_id2key() const;
 
  private:
-  friend class jubatus::util::data::serialization::access;
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(key2id_) & JUBA_MEMBER(id2key_);
-  }
-
   jubatus::util::data::unordered_map<std::string, uint64_t> key2id_;
   std::vector<std::string> id2key_;
 

diff --git a/jubatus/core/common/version.hpp b/jubatus/core/common/version.hpp
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <ostream>
 #include <msgpack.hpp>
-#include "jubatus/util/data/serialization.h"
 
 namespace jubatus {
 namespace core {
@@ -81,12 +80,6 @@ class version {
 
  private:
   uint64_t version_number_;
-
-  friend class jubatus::util::data::serialization::access;
-  template <class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(version_number_);
-  }
 };
 
 }  // namespace storage

diff --git a/jubatus/core/fv_converter/counter.hpp b/jubatus/core/fv_converter/counter.hpp
@@ -19,8 +19,6 @@
 
 #include <ostream>
 
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "jubatus/util/data/unordered_map.h"
 #include "../common/unordered_map.hpp"
 
@@ -85,11 +83,6 @@ class counter {
 
   MSGPACK_DEFINE(data_);
 
-  template<class Archiver>
-  void serialize(Archiver& ar) {
-    ar & JUBA_MEMBER(data_);
-  }
-
   friend std::ostream& operator<<(std::ostream& os, const counter<T>& c) {
     os << "{";
     for (typename

diff --git a/jubatus/core/fv_converter/keyword_weights.hpp b/jubatus/core/fv_converter/keyword_weights.hpp
@@ -51,13 +51,6 @@ class keyword_weights {
   void clear();
 
   MSGPACK_DEFINE(document_count_, document_frequencies_, weights_);
-  template<class Archiver>
-  void serialize(Archiver& ar) {
-    ar
-        & JUBA_MEMBER(document_count_)
-        & JUBA_MEMBER(document_frequencies_)
-        & JUBA_MEMBER(weights_);
-  }
 
  private:
   double get_global_weight(const std::string& key) const;

diff --git a/jubatus/core/fv_converter/mixable_weight_manager_test.cpp b/jubatus/core/fv_converter/mixable_weight_manager_test.cpp
@@ -21,8 +21,6 @@
 
 #include <gtest/gtest.h>
 #include "jubatus/util/lang/shared_ptr.h"
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "mixable_weight_manager.hpp"
 
 using std::make_pair;

diff --git a/jubatus/core/fv_converter/weight_manager.hpp b/jubatus/core/fv_converter/weight_manager.hpp
@@ -89,12 +89,6 @@ class weight_manager : public framework::model {
     return version_;
   }
 
-
-  template<class Archiver>
-  void serialize(Archiver& ar) {
-    ar & JUBA_MEMBER(diff_weights_) & JUBA_MEMBER(master_weights_);
-  }
-
   MSGPACK_DEFINE(version_, diff_weights_, master_weights_);
 
   void pack(msgpack::packer<msgpack::sbuffer>& pk) const {

diff --git a/jubatus/core/graph/graph_type.hpp b/jubatus/core/graph/graph_type.hpp
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include <msgpack.hpp>
-#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/data/unordered_map.h"
 
 #include "../common/exception.hpp"
@@ -48,12 +47,6 @@ struct eigen_vector_info {
   uint64_t out_degree_num;
 
   MSGPACK_DEFINE(score, out_degree_num);
-
-  friend class jubatus::util::data::serialization::access;
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(score) & JUBA_MEMBER(out_degree_num);
-  }
 };
 
 typedef jubatus::util::data::unordered_map<node_id_t, eigen_vector_info>
@@ -65,13 +58,6 @@ struct node_info {
   std::vector<edge_id_t> out_edges;
 
   MSGPACK_DEFINE(property, in_edges, out_edges);
-
-  friend class jubatus::util::data::serialization::access;
-
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(property) & JUBA_MEMBER(in_edges) & JUBA_MEMBER(out_edges);
-  }
 };
 
 struct edge_info {
@@ -80,13 +66,6 @@ struct edge_info {
   node_id_t tgt;
 
   MSGPACK_DEFINE(p, src, tgt);
-
-  friend class jubatus::util::data::serialization::access;
-
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(p) & JUBA_MEMBER(src) & JUBA_MEMBER(tgt);
-  }
 };
 
 struct preset_query {
@@ -99,13 +78,6 @@ struct preset_query {
   }
 
   MSGPACK_DEFINE(edge_query, node_query);
-
-  friend class jubatus::util::data::serialization::access;
-
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(edge_query) & JUBA_MEMBER(node_query);
-  }
 };
 
 typedef jubatus::util::data::unordered_map<
@@ -117,12 +89,6 @@ struct shortest_path_tree {
   spt_edges to_root;
 
   MSGPACK_DEFINE(landmark, from_root, to_root);
-
-  friend class jubatus::util::data::serialization::access;
-  template<class Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(landmark) & JUBA_MEMBER(from_root) & JUBA_MEMBER(to_root);
-  }
 };
 
 typedef std::vector<shortest_path_tree> spt_diff;

diff --git a/jubatus/core/graph/graph_wo_index.cpp b/jubatus/core/graph/graph_wo_index.cpp
@@ -21,8 +21,6 @@
 #include <utility>
 #include <vector>
 
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "jubatus/util/data/unordered_set.h"
 #include "jubatus/util/lang/cast.h"
 

diff --git a/jubatus/core/graph/graph_wo_index.hpp b/jubatus/core/graph/graph_wo_index.hpp
@@ -48,11 +48,6 @@ class graph_wo_index
     }
 
     MSGPACK_DEFINE(eigen_vector_query, spt_query);
-
-    template<typename Ar>
-    void serialize(Ar& ar) {
-      ar & JUBA_MEMBER(eigen_vector_query) & JUBA_MEMBER(spt_query);
-    }
   };
 
   struct config {

diff --git a/jubatus/core/nearest_neighbor/euclid_lsh.hpp b/jubatus/core/nearest_neighbor/euclid_lsh.hpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/shared_ptr.h"
 #include "nearest_neighbor_base.hpp"
 

diff --git a/jubatus/core/nearest_neighbor/lsh.hpp b/jubatus/core/nearest_neighbor/lsh.hpp
@@ -20,6 +20,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/shared_ptr.h"
 #include "bit_vector_nearest_neighbor_base.hpp"
 

diff --git a/jubatus/core/nearest_neighbor/minhash.hpp b/jubatus/core/nearest_neighbor/minhash.hpp
@@ -20,6 +20,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/shared_ptr.h"
 #include "bit_vector_nearest_neighbor_base.hpp"
 

diff --git a/jubatus/core/recommender/recommender_mock.cpp b/jubatus/core/recommender/recommender_mock.cpp
@@ -17,7 +17,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "jubatus/util/data/serialization.h"
 #include "recommender_mock.hpp"
 
 using std::istream;

diff --git a/jubatus/core/recommender/recommender_mock.hpp b/jubatus/core/recommender/recommender_mock.hpp
@@ -20,7 +20,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "jubatus/util/data/serialization.h"
 #include "jubatus/util/lang/shared_ptr.h"
 #include "recommender_base.hpp"
 #include "recommender_mock_storage.hpp"

diff --git a/jubatus/core/recommender/recommender_mock_storage.hpp b/jubatus/core/recommender/recommender_mock_storage.hpp
@@ -22,7 +22,6 @@
 #include <utility>
 #include <vector>
 #include <msgpack.hpp>
-#include "jubatus/util/data/serialization.h"
 #include "../framework/mixable_helper.hpp"
 #include "../common/version.hpp"
 #include "recommender_type.hpp"
@@ -73,12 +72,6 @@ class recommender_mock_storage {
   typedef std::map<common::sfv_t, std::vector<std::pair<std::string, float> > >
     relation_type;
 
-  friend class jubatus::util::data::serialization::access;
-  template<typename Ar>
-  void serialize(Ar& ar) {
-    ar & JUBA_MEMBER(similar_relation_) & JUBA_MEMBER(neighbor_relation_);
-  }
-
   static void get_relation(
       const common::sfv_t& query,
       const relation_type& relmap,

diff --git a/jubatus/core/stat/stat.cpp b/jubatus/core/stat/stat.cpp
@@ -20,7 +20,6 @@
 #include <string>
 #include <utility>
 #include "jubatus/util/system/time_util.h"
-#include "jubatus/util/data/serialization.h"
 
 using std::string;
 using jubatus::util::system::time::clock_time;

diff --git a/jubatus/core/stat/stat.hpp b/jubatus/core/stat/stat.hpp
@@ -24,8 +24,6 @@
 #include <string>
 #include <utility>
 #include "jubatus/util/concurrent/rwmutex.h"
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "jubatus/util/data/unordered_map.h"
 #include "jubatus/util/lang/enable_shared_from_this.h"
 #include "jubatus/util/lang/shared_ptr.h"
@@ -156,12 +154,6 @@ class stat : public jubatus::util::lang::enable_shared_from_this<stat> {
       }
     }
 
-    friend class jubatus::util::data::serialization::access;
-    template<class Archive>
-    void serialize(Archive& ar) {
-      ar & n_ & sum_ & sum2_ & max_ & min_;
-    }
-
     size_t n_;
 
     double sum_, sum2_;
@@ -175,11 +167,6 @@ class stat : public jubatus::util::lang::enable_shared_from_this<stat> {
   jubatus::util::data::unordered_map<std::string, stat_val> stats_;
 
  private:
-  friend class jubatus::util::data::serialization::access;
-  template<class Archive>
-  void serialize(Archive& ar) {
-    ar & window_size_ & window_ & stats_ & e_ & n_;
-  }
   size_t window_size_;
 
   double e_;

diff --git a/jubatus/core/storage/bit_index_storage.cpp b/jubatus/core/storage/bit_index_storage.cpp
@@ -21,8 +21,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include "jubatus/util/data/serialization.h"
-#include "jubatus/util/data/serialization/unordered_map.h"
 #include "fixed_size_heap.hpp"
 
 using std::greater;