few bugs fix and complete missing methods

Author: Hilik Yochai

src/VecSim/algorithms/hnsw/abs_graph_data.h

@@ -62,10 +62,14 @@ struct VectorMetaData
      enum Flags {
          DELETE_MARK = 0x1, // element is logically deleted, but still exists in the graph
          IN_PROCESS = 0x2,  // element is being inserted into the graph
-         PERMANENT_DELETE = 0x3, 
+         PERMANENT_DELETED = 0x4,  // element no longer in the graph
      }; 
     VectorMetaData(const labelType &label, uint8_t max_level) :
         label_(label), max_level_(max_level), flags_(0) {}
+	
+    VectorMetaData(const VectorMetaData &src) :
+        label_(src.label_), max_level_(src.max_level_)
+		{flags_ = char(src.flags_);}
 
     // mark methods 
     void mark(Flags flag) {

src/VecSim/algorithms/hnsw/graph_data_ram.cpp

@@ -43,7 +43,7 @@ struct VectorGraphData {
     };
 
     char *others;
-    // since level0_data has an variable size it must be last 
+    // since level0_data has a variable size it must be last 
     LevelDataOnRam level0_data;
 };
 
@@ -75,16 +75,25 @@ struct VectorGraphData {
 const char *
 RamGraphData::getVectorByInternalId(idType internal_id) const {
     return vectorBlocks_[internal_id / block_size_].getElement(internal_id % block_size_);
-    }
+}
 
+void
+RamGraphData::multiGetVectors(const std::vector<idType> &ids,
+				std::vector<const char *> &results) const {
+	results.reserve(ids.size());
+	for (auto id:ids) {
+		results.push_back(getVectorByInternalId(id));
+	}
+}
+	
 
 
 idType
 RamGraphData::pushVector(const void *vector_data,
                          int max_level,
                          const labelType  &label,
                          WriteBatch *wb) {
-    idToMetaData_.push_back(new VectorMetaData(label,max_level));
+    idToMetaData_.push_back(VectorMetaData(label,max_level));
 
     if (vectorBlocks_.size() == 0 ||
         vectorBlocks_.back().getLength() == block_size_) {
@@ -152,7 +161,7 @@ idType
 RamGraphData::getGarbadgeCollectionTarget(idType startingId) const {
     for (idType i = startingId; i < idToMetaData_.size(); i++) {
         auto const &v =  vectorMetaDataById(i);
-        if (v.ismarked(VectorMetaData::PERMANENT_DELETE)) {
+        if (v.ismarked(VectorMetaData::PERMANENT_DELETED)) {
             return i;
         }
     }

src/VecSim/algorithms/hnsw/graph_data_ram.h

@@ -132,19 +132,22 @@ class RamGraphData : public absGraphData  {
 
     const VectorMetaData &
     vectorMetaDataById(idType internal_id) const override {
-        return *idToMetaData_[internal_id];
+        return idToMetaData_[internal_id];
     }
 
     VectorMetaData    &
     vectorMetaDataById(idType internal_id,
                        WriteBatch *) override {
-        return *idToMetaData_[internal_id];
+        return idToMetaData_[internal_id];
     }
 
     // premanently delete the vector and the edges "free" the id 
     void
     deleteVectorAndEdges(idType internalId,
-                         WriteBatch *) override;
+                         WriteBatch *wb) override {
+		vectorMetaDataById(internalId, wb).mark(
+			VectorMetaData::PERMANENT_DELETED);
+	}
 
 
     // outgoing edges 
@@ -176,17 +179,16 @@ class RamGraphData : public absGraphData  {
 public:
     // helper methods needed by hnsw
 
-    // get the first id that exists at level level 
+    // get the first id that exists at level "level"
+	// at or after the statingId
     virtual idType
     getVectorIdByLevel(short level,
-                    idType startingId = 0) const = 0;
+					   idType startingId = 0) const = 0;
 
-    // get a pair of candidates to swap for the gc
-    // first is a location that is permanent deleted
-    // second is a location that is valid
-    // start points is the last pair returned in the prev scan 
+    // get a permanent deleted entry (at or after start point)
+	// to be used by the GC 
     virtual idType
-    getGarbadgeCollectionTarget(idType startPoint = 0) const = 0;
+    getGarbadgeCollectionTarget(idType startingId = 0) const = 0;
 
     virtual void
     shrinkToFit() override;
@@ -219,7 +221,7 @@ class RamGraphData : public absGraphData  {
 private:
     vecsim_stl::vector<DataBlock> vectorBlocks_;
     vecsim_stl::vector<DataBlock> graphDataBlocks_;
-    vecsim_stl::vector<VectorMetaData *> idToMetaData_;
+    vecsim_stl::vector<VectorMetaData> idToMetaData_;
     std::shared_ptr<VecSimAllocator> allocator_;    
     const size_t block_size_;
     const size_t vector_size_bytes_;