Adding correct #ifdef EXEC_ENV_OLS blocks

microsoft · Jun 20, 2024 · 07f21f3 · 07f21f3
1 parent e94b9a8
commit 07f21f3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/include/abstract_data_store.h b/include/abstract_data_store.h
@@ -24,7 +24,9 @@ template <typename data_t> class AbstractDataStore
 
     // Return number of points returned
     virtual location_t load(const std::string &filename, size_t offset) = 0;
-    //virtual location_t load(AlignedFileReader &reader, size_t offset) = 0;
+#ifdef EXEC_ENV_OLS
+    virtual location_t load(AlignedFileReader &reader, size_t offset) = 0;
+#endif
 
     // Why does store take num_pts? Since store only has capacity, but we allow
     // resizing we can end up in a situation where the store has spare capacity.

diff --git a/include/in_mem_data_store.h b/include/in_mem_data_store.h
@@ -25,7 +25,9 @@ template <typename data_t> class InMemDataStore : public AbstractDataStore<data_
     virtual ~InMemDataStore();
 
     virtual location_t load(const std::string &filename, size_t offset = 0) override;
-    //virtual location_t load(AlignedFileReader &reader, size_t offset = 0) override;
+#ifdef EXEC_ENV_OLS
+    virtual location_t load(AlignedFileReader &reader, size_t offset = 0) override;
+#endif
     virtual size_t save(const std::string &filename, const location_t num_pts) override;
     virtual size_t save(std::ofstream &writer, const location_t num_pts, size_t offset) override;
 

diff --git a/include/utils.h b/include/utils.h
@@ -31,7 +31,9 @@ typedef int FileHandle;
 
 #ifdef EXEC_ENV_OLS
 #include "content_buf.h"
-#include "memory_mapper.h"
+//#include "memory_mapper.h"
+//This file is supplied by DLVS team.
+#include "memory_mapped_files.h"
 #endif
 
 // taken from

diff --git a/src/in_mem_data_store.cpp b/src/in_mem_data_store.cpp
@@ -42,12 +42,12 @@ template <typename data_t> location_t InMemDataStore<data_t>::load(const std::st
     return load_impl(filename, offset);
 }
 
-//template <typename data_t> location_t InMemDataStore<data_t>::load(AlignedFileReader &reader, size_t offset)
-//{
-//    return load_impl(reader, offset);
-//}
-
 #ifdef EXEC_ENV_OLS
+template <typename data_t> location_t InMemDataStore<data_t>::load(AlignedFileReader &reader, size_t offset)
+{
+    return load_impl(reader, offset);
+}
+
 template <typename data_t> location_t InMemDataStore<data_t>::load_impl(AlignedFileReader &reader, size_t offset)
 {
     size_t file_dim, file_num_points;