some bug fix when enable the EXEC_EnV_OLS (#377)

* some bug fix when enable the EXEC_EnV_OLS

* avoid unit test failure

* unit test testing

* changed based on gopal's suggestion

* update load_impl(AlignedFileReader &reader)

* change the load_impl to be identical to objectstore

* remvoe blank

include/filter_utils.h

@@ -79,6 +79,7 @@ inline tsl::robin_map<std::string, std::vector<uint32_t>> generate_label_specifi
     path input_data_path, tsl::robin_map<std::string, uint32_t> labels_to_number_of_points,
     std::vector<label_set> point_ids_to_labels, label_set all_labels)
 {
+#ifndef _WINDOWS
     auto file_writing_timer = std::chrono::high_resolution_clock::now();
     diskann::MemoryMapper input_data(input_data_path);
     char *input_start = input_data.getBuf();
@@ -178,6 +179,7 @@ inline tsl::robin_map<std::string, std::vector<uint32_t>> generate_label_specifi
               << std::endl;
 
     return label_id_to_orig_id;
+#endif
 }
 
 inline std::vector<uint32_t> loadTags(const std::string &tags_file, const std::string &base_file)

include/in_mem_data_store.h

@@ -14,6 +14,7 @@
 #include "distance.h"
 #include "natural_number_map.h"
 #include "natural_number_set.h"
+#include "aligned_file_reader.h"
 
 namespace diskann
 {

include/index.h

@@ -338,6 +338,7 @@ template <typename T, typename TagT = uint32_t, typename LabelT = uint32_t> clas
     // Graph related data structures
     std::vector<std::vector<uint32_t>> _final_graph;
 
+    T *_data = nullptr; // coordinates of all base points
     // Dimensions
     size_t _dim = 0;
     size_t _nd = 0;         // number of active points i.e. existing in the graph

src/in_mem_data_store.cpp

@@ -43,26 +43,27 @@ template <typename data_t> location_t InMemDataStore<data_t>::load(const std::st
 }
 
 #ifdef EXEC_ENV_OLS
-template <typename data_t> location_t Index<data_t>::load_impl(AlignedFileReader &reader)
+template <typename data_t> location_t InMemDataStore<data_t>::load_impl(AlignedFileReader &reader)
 {
     size_t file_dim, file_num_points;
 
     diskann::get_bin_metadata(reader, file_num_points, file_dim);
 
-    if (file_dim != _dim)
+    if (file_dim != this->_dim)
     {
         std::stringstream stream;
-        stream << "ERROR: Driver requests loading " << _dim << " dimension,"
+        stream << "ERROR: Driver requests loading " << this->_dim << " dimension,"
                << "but file has " << file_dim << " dimension." << std::endl;
         diskann::cerr << stream.str() << std::endl;
         aligned_free(_data);
         throw diskann::ANNException(stream.str(), -1, __FUNCSIG__, __FILE__, __LINE__);
     }
 
-    if (file_num_points > _max_points + _num_frozen_pts)
+    if (file_num_points > this->capacity())
     {
-        resize(file_num_points - _num_frozen_pts);
+        this->resize((location_t)file_num_points);
     }
+    copy_aligned_data_from_file<data_t>(reader, _data, file_num_points, file_dim, _aligned_dim);
 
     return file_num_points;
 }

src/index.cpp

@@ -556,12 +556,12 @@ void Index<T, TagT, LabelT>::load(const char *filename, uint32_t num_threads, ui
     _has_built = true;
 
     size_t tags_file_num_pts = 0, graph_num_pts = 0, data_file_num_pts = 0, label_num_pts = 0;
-
+#ifndef EXEC_ENV_OLS
     std::string mem_index_file(filename);
     std::string labels_file = mem_index_file + "_labels.txt";
     std::string labels_to_medoids = mem_index_file + "_labels_to_medoids.txt";
     std::string labels_map_file = mem_index_file + "_labels_map.txt";
-
+#endif
     if (!_save_as_one_file)
     {
         // For DLVS Store, we will not support saving the index in multiple
@@ -600,7 +600,7 @@ void Index<T, TagT, LabelT>::load(const char *filename, uint32_t num_threads, ui
         diskann::cerr << stream.str() << std::endl;
         throw diskann::ANNException(stream.str(), -1, __FUNCSIG__, __FILE__, __LINE__);
     }
-
+#ifndef EXEC_ENV_OLS
     if (file_exists(labels_file))
     {
         _label_map = load_label_map(labels_map_file);
@@ -646,7 +646,7 @@ void Index<T, TagT, LabelT>::load(const char *filename, uint32_t num_threads, ui
             universal_label_reader.close();
         }
     }
-
+#endif
     _nd = data_file_num_pts - _num_frozen_pts;
     _empty_slots.clear();
     _empty_slots.reserve(_max_points);