ok

Author: wxyucs

examples/cpp/402_persistent_streaming.cpp

@@ -82,7 +82,7 @@ main(int32_t argc, char** argv) {
     std::cout << "index contains vectors: " << index->GetNumElements() << std::endl;
 
     /******************* Save Index to OStream *****************/
-    vsag::Options::Instance().set_new_version(true);
+    vsag::Options::Instance().set_new_version(false);
     std::ofstream out_stream("/tmp/vsag-persistent-streaming.index");
     auto serialize_result = index->Serialize(out_stream);
     out_stream.close();
@@ -127,19 +127,12 @@ main(int32_t argc, char** argv) {
     }
 
     )";
-    std::cout << "before search" << std::endl;
-    std::cout << "before search" << std::endl;
-    std::cout << "before search" << std::endl;
-    std::cout << "before search" << std::endl;
     if (auto knn_search = index->KnnSearch(query, topk, search_parameters);
         not knn_search.has_value()) {
-    std::cout << "aaaa" << std::endl;
         std::cerr << "search knn failed: " << knn_search.error().message << std::endl;
         abort();
     } else {
-    std::cout << "bbbb" << std::endl;
         auto result = *knn_search;
-        std::cout << "result.getdim: " << result->GetDim() << std::endl;
         for (int64_t i = 0; i < result->GetDim(); ++i) {
             std::cout << result->GetIds()[i] << " " << result->GetDistances()[i] << std::endl;
         }

extern/diskann/DiskANN/src/pq_flash_index.cpp

@@ -1433,16 +1433,16 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(std::stringstream &pivots_
                       << ". Will not output it at search time." << std::endl;
     }
 
-    // diskann::cout << "Disk-Index File Meta-data: ";
-    // diskann::cout << "# nodes per sector: " << nnodes_per_sector;
-    // diskann::cout << ", max node len (bytes): " << max_node_len;
-    // diskann::cout << ", max node degree: " << max_degree << std::endl;
+    diskann::cout << "Disk-Index File Meta-data: ";
+    diskann::cout << "# nodes per sector: " << nnodes_per_sector;
+    diskann::cout << ", max node len (bytes): " << max_node_len;
+    diskann::cout << ", max node degree: " << max_degree << std::endl;
     num_medoids = 1;
     medoids = new uint32_t[1];
     medoids[0] = (uint32_t)(medoid_id_on_file);
 
     use_medoids_data_as_centroids();
-    // diskann::cout << "done.." << std::endl;
+    diskann::cout << "done.." << std::endl;
     return 0;
 }
 
@@ -1859,7 +1859,12 @@ int64_t PQFlashIndex<T, LabelT>::cached_beam_search_memory(const T *query, const
 
     // re-sort by distance
     std::sort(full_retset.begin(), full_retset.end());
-    if (reorder) {
+    if (not reorder) {
+
+    std::cout << "yes yes yes reorder" << std::endl;
+    std::cout << "yes yes yes reorder" << std::endl;
+    std::cout << "yes yes yes reorder" << std::endl;
+
         std::vector<Neighbor> reorder_retset;
         std::priority_queue<float> distance_ranks;
         int loc = 0;

src/index/diskann.cpp

@@ -121,7 +121,7 @@ class LocalMemoryReader : public Reader {
 
 class IStreamReader : public Reader {
 public:
-    IStreamReader(std::istream& in_stream, int64_t base_offset = 0, int64_t size = 0)
+    IStreamReader(std::istream& in_stream, int64_t base_offset, int64_t size)
         : in_stream_(in_stream),
           base_offset_(base_offset),
           size_(size) {
@@ -1053,7 +1053,6 @@ DiskANN::deserialize(std::istream& in_stream) {
         READ_DATACELL_WITH_NAME(in_stream, DISKANN_COMPRESSED_VECTOR, disk_pq_compressed_vectors);
         READ_DATACELL_WITH_NAME(in_stream, DISKANN_TAG_FILE, tag_stream);
 
-        // TODO(wxyu): wrap with `in_stream`
         disk_layout_reader_ = std::make_shared<IStreamReader>(in_stream,
                                                               datacell_offsets[DISKANN_LAYOUT_FILE].get<uint64_t>(),
                                                               datacell_sizes[DISKANN_LAYOUT_FILE].get<uint64_t>());
@@ -1073,6 +1072,7 @@ DiskANN::deserialize(std::istream& in_stream) {
             READ_DATACELL_WITH_NAME(in_stream, DISKANN_GRAPH, graph);
             index_->load_graph(graph);
         }
+        status_ = IndexStatus::HYBRID;
 
     } catch (const std::runtime_error& e) {
         LOG_ERROR_AND_RETURNS(ErrorType::READ_ERROR, "failed to deserialize: ", e.what());