comparison index.cpp @ 512:6439cfba2524 memory-leaks

Implemented correct LSH table via compile-time switch -DLSH_DUMP_CORE_TABLES. Dumps on LSH load.

       lsh = new LSH(mergeIndexName, false); // Initialize empty LSH tables
       assert(lsh);
       
       // Insert up to lsh_param_b database tracks
       index_insert_tracks(startTrack, endTrack, &fvp, &sNorm, &snPtr, &sPower, &spPtr);
-
+      
       // Serialize to file (merging is performed here)
-      lsh->serialize(mergeIndexName, lsh_in_core?O2_SERIAL_FILEFORMAT2:O2_SERIAL_FILEFORMAT1); // Serialize core LSH heap to disk
+      lsh->serialize(mergeIndexName, lsh_in_core?O2_SERIAL_FILEFORMAT2:O2_SERIAL_FILEFORMAT1); // Serialize core LSH heap to disk    
       delete lsh;
       lsh = 0;
     }
     
     close(lshfid);    

     if(SERVER_LSH_INDEX_SINGLETON)
       fprintf(stderr,"INDEX: using persistent hash tables: %s\n", lsh->get_indexName());
     else
       VERB_LOG(1,"INDEX: loading hash tables into core %s\n", (lsh->get_lshHeader()->flags&O2_SERIAL_FILEFORMAT2)?"FORMAT2":"FORMAT1");
     lsh = index_allocate(indexName, true);
+#ifdef LSH_DUMP_CORE_TABLES
+    lsh->dump_hashtables();
+#endif
   }
   
   delete[] indexName;
   return true;
 }