Merge remote-tracking branch 'origin/2.6' into backport-6574-to-2.6

lerman25 · lerman25 · commit dcd209f8aaef · 2025-08-17T14:08:40.000+03:00
diff --git a/src/info/indexes_info.c b/src/info/indexes_info.c
@@ -25,18 +25,19 @@ TotalIndexesInfo IndexesInfo_TotalInfo() {
     if (!sp) {
       continue;
     }
-    // Lock for read
-    size_t cur_mem = IndexSpec_TotalMemUsage(sp, 0, 0, 0);
-    info.total_mem += cur_mem;
-    if (info.min_mem > cur_mem) info.min_mem = cur_mem;
-    if (info.max_mem < cur_mem) info.max_mem = cur_mem;
-    info.indexing_time += sp->stats.totalIndexTime;
 
     // Vector index stats
     VectorIndexStats vec_info = IndexSpec_GetVectorIndexStats(sp);
     info.fields_stats.total_vector_idx_mem += vec_info.memory;
     info.fields_stats.total_mark_deleted_vectors += vec_info.marked_deleted;
 
+    size_t cur_mem = IndexSpec_TotalMemUsage(sp, 0, 0, 0, vec_info.memory);
+    info.total_mem += cur_mem;
+
+    if (info.min_mem > cur_mem) info.min_mem = cur_mem;
+    if (info.max_mem < cur_mem) info.max_mem = cur_mem;
+    info.indexing_time += sp->stats.totalIndexTime;
+
     if (sp->gc) {
       ForkGCStats gcStats = ((ForkGC *)sp->gc->gcCtx)->stats;
       info.gc_stats.totalCollectedBytes += gcStats.totalCollected;
diff --git a/src/info/info_command.c b/src/info/info_command.c
@@ -221,7 +221,7 @@ int IndexInfoCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
   size_t text_overhead = IndexSpec_collect_text_overhead(sp);
   REPLY_KVNUM(n, "text_overhead_sz_mb", text_overhead / (float)0x100000);
   REPLY_KVNUM(n, "total_index_memory_sz_mb", IndexSpec_TotalMemUsage(sp, dt_tm_size,
-    tags_overhead, text_overhead) / (float)0x100000);
+    tags_overhead, text_overhead, sp->stats.vectorIndexSize) / (float)0x100000);
   REPLY_KVNUM(n, "records_per_doc_avg",
               (float)sp->stats.numRecords / (float)sp->stats.numDocuments);
   REPLY_KVNUM(n, "bytes_per_record_avg",
diff --git a/src/redisearch_api.c b/src/redisearch_api.c
@@ -850,7 +850,7 @@ int RediSearch_IndexInfo(RSIndex* sp, RSIdxInfo *info) {
 }
 
 size_t RediSearch_MemUsage(RSIndex* sp) {
-  return IndexSpec_TotalMemUsage(sp, 0, 0, 0);
+  return IndexSpec_TotalMemUsage(sp, 0, 0, 0, 0);
 }
 
 // Collect statistics of all the currently existing indexes
diff --git a/src/spec.c b/src/spec.c
@@ -30,6 +30,7 @@
 #include "rdb.h"
 #include "commands.h"
 #include "info/global_stats.h"
+#include "info/field_spec_info.h"
 #include "rs_wall_clock.h"
 
 #define INITIAL_DOC_TABLE_SIZE 1000
@@ -298,7 +299,7 @@ size_t IndexSpec_collect_text_overhead(IndexSpec *sp) {
   return overhead;
 }
 
-size_t IndexSpec_TotalMemUsage(IndexSpec *sp, size_t doctable_tm_size, size_t tags_overhead, size_t text_overhead) {
+size_t IndexSpec_TotalMemUsage(IndexSpec *sp, size_t doctable_tm_size, size_t tags_overhead, size_t text_overhead, size_t vector_overhead) {
   size_t res = 0;
   res += sp->docs.memsize;
   res += sp->docs.sortablesSize;
@@ -308,6 +309,7 @@ size_t IndexSpec_TotalMemUsage(IndexSpec *sp, size_t doctable_tm_size, size_t ta
   res += sp->stats.invertedSize;
   res += sp->stats.offsetVecsSize;
   res += sp->stats.termsSize;
+  res += vector_overhead;
   return res;
 }
 
diff --git a/src/spec.h b/src/spec.h
@@ -611,9 +611,14 @@ size_t IndexSpec_collect_text_overhead(IndexSpec *sp);
 
 /**
  * @return all memory used by the index `sp`.
- * Uses the sizes of the doc-table, tag and text overhead if they are not `0`.
+ * Uses the sizes of the doc-table, tag and text overhead if they are not `0`
+ * (otherwise compute them in-place). Vector overhead is expected to be passed in as an argument
+ * and will not be computed in-place
+ * TODO: fIx so this will account for the entire index memory, preferably by using an allocator,
+ * currently it is a best effort that account only for part of the actual memory.
  */
-size_t IndexSpec_TotalMemUsage(IndexSpec *sp, size_t doctable_tm_size, size_t tags_overhead, size_t text_overhead);
+size_t IndexSpec_TotalMemUsage(IndexSpec *sp, size_t doctable_tm_size, size_t tags_overhead,
+  size_t text_overhead, size_t vector_overhead);
 
 //---------------------------------------------------------------------------------------------
 
diff --git a/tests/pytests/test_info_modules.py b/tests/pytests/test_info_modules.py
@@ -472,6 +472,8 @@ def test_redis_info_modules_vecsim(env):
   info = env.cmd('INFO', 'MODULES')
   field_infos = get_field_infos()
   env.assertEqual(info['search_used_memory_vector_index'], sum(field_info['MEMORY'] for field_info in field_infos))
+  # Validate that vector indexes are accounted in the total index memory
+  env.assertGreater(info['search_used_memory_indexes'], info['search_used_memory_vector_index'])
   env.assertEqual(info['search_marked_deleted_vectors'], 0)
 
   set_doc().equal(0) # Add (override) the document with a new one

Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,7 @@ int RediSearch_IndexInfo(RSIndex* sp, RSIdxInfo *info) {`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`size_t RediSearch_MemUsage(RSIndex* sp) {`
`853`		`- return IndexSpec_TotalMemUsage(sp, 0, 0, 0);`
	`853`	`+ return IndexSpec_TotalMemUsage(sp, 0, 0, 0, 0);`
`854`	`854`	`}`
`855`	`855`
`856`	`856`	`// Collect statistics of all the currently existing indexes`