diff options
Diffstat (limited to 'include/framework/reconstruction')
6 files changed, 28 insertions, 38 deletions
diff --git a/include/framework/reconstruction/BSMPolicy.h b/include/framework/reconstruction/BSMPolicy.h index c42b928..eaa374a 100644 --- a/include/framework/reconstruction/BSMPolicy.h +++ b/include/framework/reconstruction/BSMPolicy.h @@ -11,7 +11,7 @@ #include <cmath> #include "framework/reconstruction/ReconstructionPolicy.h" -#include "framework/scheduling/Epoch.h" +#include "framework/scheduling/Version.h" #include "util/types.h" namespace de { @@ -28,6 +28,12 @@ public: get_reconstruction_tasks(const Version<ShardType, QueryType> *version, size_t incoming_reccnt) const override { ReconstructionVector reconstructions; + return reconstructions; + } + + ReconstructionVector + get_flush_tasks(const Version<ShardType, QueryType> *version) const override { + ReconstructionVector reconstructions; auto levels = version->get_structure()->get_level_vector(); level_index target_level = find_reconstruction_target(levels); @@ -53,12 +59,6 @@ public: return reconstructions; } - ReconstructionVector - get_flush_tasks(const Version<ShardType, QueryType> *version) const override { - ReconstructionVector v; - v.add_reconstruction(ReconstructionTask {{buffer_shid}, 0, m_buffer_size, ReconstructionType::Merge}); - } - private: level_index find_reconstruction_target(LevelVector &levels) const { level_index target_level = invalid_level_idx; diff --git a/include/framework/reconstruction/FixedShardCountPolicy.h b/include/framework/reconstruction/FixedShardCountPolicy.h index 2a3c977..0768daa 100644 --- a/include/framework/reconstruction/FixedShardCountPolicy.h +++ b/include/framework/reconstruction/FixedShardCountPolicy.h @@ -11,7 +11,7 @@ #include <cmath> #include "framework/reconstruction/ReconstructionPolicy.h" -#include "framework/scheduling/Epoch.h" +#include "framework/scheduling/Version.h" #include "util/types.h" namespace de { diff --git a/include/framework/reconstruction/FloodL0Policy.h b/include/framework/reconstruction/FloodL0Policy.h index 8304d8a..94bed70 100644 --- a/include/framework/reconstruction/FloodL0Policy.h +++ b/include/framework/reconstruction/FloodL0Policy.h @@ -11,7 +11,7 @@ #include <cmath> #include "framework/reconstruction/ReconstructionPolicy.h" -#include "framework/scheduling/Epoch.h" +#include "framework/scheduling/Version.h" #include "util/types.h" namespace de { @@ -26,17 +26,14 @@ public: ReconstructionVector get_reconstruction_tasks(const Version<ShardType, QueryType> *version, size_t incoming_reccnt) const override { - ReconstructionVector reconstructions; return reconstructions; - } ReconstructionVector get_flush_tasks(const Version<ShardType, QueryType> *version) const override { - ReconstructionVector v; - v.add_reconstruction(ReconstructionTask{ - {{buffer_shid}}, 0, m_buffer_size, ReconstructionType::Append}); + ReconstructionVector reconstructions; + return reconstructions; } private: diff --git a/include/framework/reconstruction/LevelingPolicy.h b/include/framework/reconstruction/LevelingPolicy.h index 176492e..1523e74 100644 --- a/include/framework/reconstruction/LevelingPolicy.h +++ b/include/framework/reconstruction/LevelingPolicy.h @@ -11,7 +11,7 @@ #include <cmath> #include "framework/reconstruction/ReconstructionPolicy.h" -#include "framework/scheduling/Epoch.h" +#include "framework/scheduling/Version.h" #include "util/types.h" namespace de { @@ -25,14 +25,19 @@ public: : m_scale_factor(scale_factor), m_buffer_size(buffer_size) {} ReconstructionVector - get_reconstruction_tasks(const Version<ShardType, QueryType> *version, - size_t incoming_reccnt) const override { + get_reconstruction_tasks(const Version<ShardType, QueryType> *version) const override { + ReconstructionVector reconstructions; + return reconstructions; + } + + ReconstructionVector + get_flush_tasks(const Version<ShardType, QueryType> *version) const override { ReconstructionVector reconstructions; auto levels = version->get_structure()->get_level_vector(); level_index target_level = find_reconstruction_target(levels); assert(target_level != -1); - level_index source_level = 0; + level_index source_level = 1; if (target_level == invalid_level_idx) { /* grow */ @@ -51,14 +56,6 @@ public: return reconstructions; } - ReconstructionVector - get_flush_tasks(const Version<ShardType, QueryType> *version) const override { - ReconstructionVector v; - v.add_reconstruction(ReconstructionTask{ - {{buffer_shid}}, 0, m_buffer_size, ReconstructionType::Merge}); - return v; - } - private: level_index find_reconstruction_target(LevelVector &levels) const { level_index target_level = invalid_level_idx; diff --git a/include/framework/reconstruction/ReconstructionPolicy.h b/include/framework/reconstruction/ReconstructionPolicy.h index 48bddcf..6f99b32 100644 --- a/include/framework/reconstruction/ReconstructionPolicy.h +++ b/include/framework/reconstruction/ReconstructionPolicy.h @@ -23,8 +23,7 @@ class ReconstructionPolicy { public: ReconstructionPolicy() {} - virtual ReconstructionVector get_reconstruction_tasks(const Version<ShardType, QueryType> *version, - size_t incoming_reccnt) const = 0; + virtual ReconstructionVector get_reconstruction_tasks(const Version<ShardType, QueryType> *version) const = 0; virtual ReconstructionVector get_flush_tasks(const Version<ShardType, QueryType> *version) const = 0; }; } diff --git a/include/framework/reconstruction/TieringPolicy.h b/include/framework/reconstruction/TieringPolicy.h index 63be5fe..dce5c3c 100644 --- a/include/framework/reconstruction/TieringPolicy.h +++ b/include/framework/reconstruction/TieringPolicy.h @@ -11,7 +11,7 @@ #include <cmath> #include "framework/reconstruction/ReconstructionPolicy.h" -#include "framework/scheduling/Epoch.h" +#include "framework/scheduling/Version.h" #include "util/types.h" namespace de { @@ -26,6 +26,12 @@ public: get_reconstruction_tasks(const Version<ShardType, QueryType> *version, size_t incoming_reccnt) const override { ReconstructionVector reconstructions; + return reconstructions; + } + + ReconstructionVector + get_flush_tasks(const Version<ShardType, QueryType> *version) const override { + ReconstructionVector reconstructions; auto levels = version->get_structure()->get_level_vector(); level_index target_level = find_reconstruction_target(levels); @@ -49,15 +55,6 @@ public: return reconstructions; } - ReconstructionVector - get_flush_tasks(const Version<ShardType, QueryType> *version) const override { - ReconstructionVector v; - - v.add_reconstruction(ReconstructionTask{ - {{buffer_shid}}, 0, m_buffer_size, ReconstructionType::Append}); - return v; - } - private: level_index find_reconstruction_target(LevelVector &levels) const { level_index target_level = invalid_level_idx; |