Began overhauling reconstruction mechanism

2 files changed, 6 insertions, 9 deletions

diff --git a/include/framework/scheduling/Epoch.h b/include/framework/scheduling/Epoch.h
index 03675b1..303ab2f 100644
--- a/include/framework/scheduling/Epoch.h
+++ b/include/framework/scheduling/Epoch.h
@@ -8,7 +8,6 @@
  */
 #pragma once
 
-#include <condition_variable>
 #include <mutex>
 
 #include "framework/structure/BufferView.h"
@@ -17,13 +16,12 @@
 
 namespace de {
 
-template <ShardInterface ShardType, QueryInterface<ShardType> QueryType,
-          LayoutPolicy L>
+template <ShardInterface ShardType, QueryInterface<ShardType> QueryType>
 class Epoch {
 private:
   typedef typename ShardType::RECORD RecordType;
   typedef MutableBuffer<RecordType> Buffer;
-  typedef ExtensionStructure<ShardType, QueryType, L> Structure;
+  typedef ExtensionStructure<ShardType, QueryType> Structure;
   typedef BufferView<RecordType> BufView;
 
 public:
diff --git a/include/framework/scheduling/Task.h b/include/framework/scheduling/Task.h
index 34f053a..7242bef 100644
--- a/include/framework/scheduling/Task.h
+++ b/include/framework/scheduling/Task.h
@@ -19,16 +19,15 @@
 
 #include "framework/scheduling/Epoch.h"
 #include "framework/scheduling/statistics.h"
-#include "framework/util/Configuration.h"
+#include "util/types.h"
 
 namespace de {
 
-template <ShardInterface ShardType, QueryInterface<ShardType> QueryType,
-          LayoutPolicy L>
+template <ShardInterface ShardType, QueryInterface<ShardType> QueryType>
 struct ReconstructionArgs {
   typedef typename ShardType::RECORD RecordType;
-  Epoch<ShardType, QueryType, L> *epoch;
-  ReconstructionVector merges;
+  Epoch<ShardType, QueryType> *epoch;
+  ReconstructionVector tasks;
   std::promise<bool> result;
   bool compaction;
   void *extension;