ec: drop stubs of {encode,decode}_chunks() from ErasureCode.

`decode_chunks()` was needed only because of the ec unit testing.
Move its implementation there.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/erasure-code/ErasureCode.cc b/src/erasure-code/ErasureCode.cc
index 8086bf8db7aa297d20f6aa3d60d60dd04389e566..0cebf9a98022f865b22b08942630571cd74c1227 100644 (file)
--- a/src/erasure-code/ErasureCode.cc
+++ b/src/erasure-code/ErasureCode.cc
@@ -203,12 +203,6 @@ int ErasureCode::encode(const set<int> &want_to_encode,
   return 0;
 }
 
-int ErasureCode::encode_chunks(const set<int> &want_to_encode,
-                               map<int, bufferlist> *encoded)
-{
-  ceph_abort_msg("ErasureCode::encode_chunks not implemented");
-}
- 
 int ErasureCode::_decode(const set<int> &want_to_read,
                         const map<int, bufferlist> &chunks,
                         map<int, bufferlist> *decoded)
@@ -254,13 +248,6 @@ int ErasureCode::decode(const set<int> &want_to_read,
   return _decode(want_to_read, chunks, decoded);
 }
 
-int ErasureCode::decode_chunks(const set<int> &want_to_read,
-                               const map<int, bufferlist> &chunks,
-                               map<int, bufferlist> *decoded)
-{
-  ceph_abort_msg("ErasureCode::decode_chunks not implemented");
-}
-
 int ErasureCode::parse(const ErasureCodeProfile &profile,
                       ostream *ss)
 {

diff --git a/src/erasure-code/ErasureCode.h b/src/erasure-code/ErasureCode.h
index 7e17a845f1aafa0d4980e479bab3367fe653be0c..c246d5dc6b67d9a2d865f6876be53ed2d2ad0390 100644 (file)
--- a/src/erasure-code/ErasureCode.h
+++ b/src/erasure-code/ErasureCode.h
@@ -79,9 +79,6 @@ namespace ceph {
                        const bufferlist &in,
                        std::map<int, bufferlist> *encoded) override;
 
-    int encode_chunks(const std::set<int> &want_to_encode,
-                              std::map<int, bufferlist> *encoded) override;
-
     int decode(const std::set<int> &want_to_read,
                 const std::map<int, bufferlist> &chunks,
                 std::map<int, bufferlist> *decoded, int chunk_size) override;
@@ -90,10 +87,6 @@ namespace ceph {
                        const std::map<int, bufferlist> &chunks,
                        std::map<int, bufferlist> *decoded);
 
-    int decode_chunks(const std::set<int> &want_to_read,
-                              const std::map<int, bufferlist> &chunks,
-                              std::map<int, bufferlist> *decoded) override;
-
     const std::vector<int> &get_chunk_mapping() const override;
 
     int to_mapping(const ErasureCodeProfile &profile,

diff --git a/src/test/erasure-code/TestErasureCode.cc b/src/test/erasure-code/TestErasureCode.cc
index 3e7d90cd58983d2966a548d6b2a027566cd2d2bf..98d5bb2edf98e03413e1c7aa1343c75bcb8ef402 100644 (file)
--- a/src/test/erasure-code/TestErasureCode.cc
+++ b/src/test/erasure-code/TestErasureCode.cc
@@ -47,6 +47,12 @@ public:
     encode_chunks_encoded = *encoded;
     return 0;
   }
+  int decode_chunks(const set<int> &want_to_read,
+                    const map<int, bufferlist> &chunks,
+                    map<int, bufferlist> *decoded) override {
+    ceph_abort_msg("ErasureCode::decode_chunks not implemented");
+  }
+
   int create_rule(const string &name,
                  CrushWrapper &crush,
                  ostream *ss) const override { return 0; }