Merge remote-tracking branch 'couchbase/trinity'

|\
| * 497365f Abhinav Dangeti | MB-60816: Upgrade bleve/v2, zapx/v16, go-faiss for fix
| * 231a2f6 Abhinav Dangeti | MB-60819: Check return value of malloc_info
| * 054e69a Abhinav Dangeti | MB-60842: Upgrade bleve/v2 for fix

Change-Id: I7023691e0e33c9cd46b0aa40b73cbd04eeec2444

Author: abhinavdangeti

c_heap_mem_usage.h

@@ -16,7 +16,7 @@ extern "C" {
         size_t get_total_heap_bytes();
     #else
         size_t get_total_heap_bytes() {
-            return(size_t)0L;
+            return (size_t)0L;
         }
     #endif
 

c_heap_mem_usage_linux.cpp

@@ -52,7 +52,7 @@ size_t get_attribute_value(const char *str, const char *first_substr, const char
 }
 
 
-size_t get_total_heap_bytes(){
+size_t get_total_heap_bytes() {
     // ref: https://gist.github.com/tadeu/95013963c64da4cd74a2c6f4fa4fd553
     // There are three functions in Linux libc API to retrieve heap
     // information: `malloc_stats`, `mallinfo` and `malloc_info`.
@@ -72,11 +72,20 @@ size_t get_total_heap_bytes(){
     size_t buf_size = 0;
 
     FILE* f = open_memstream(&buf, &buf_size);
+    if (f == NULL) {
+       return (size_t)0;
+    }
+
     // this doesn't include the golang or the other process's stats
     // as per local testing
-    malloc_info(0, f);
+    int rv = malloc_info(0, f);
     fclose(f);
 
+    // https://man7.org/linux/man-pages/man3/malloc_info.3.html
+    if ((rv != 0) || (buf == NULL)) {
+        return (size_t)0;
+    }
+
     // We are only interested in totals, so we skip everything until the
     // closing of the <heap>...</heap> block.
     const char* pos = strstr(buf, "</heap>");
@@ -96,6 +105,7 @@ size_t get_total_heap_bytes(){
 
     free(buf);
     buf = NULL;
+
     return allocated_mem;
 }
 #endif

go.mod

@@ -5,14 +5,14 @@ go 1.21
 require (
 	github.com/aws/aws-sdk-go v1.48.1
 	github.com/blevesearch/bleve-mapping-ui v0.5.2
-	github.com/blevesearch/bleve/v2 v2.3.11-0.20240215163640-2d3c3ebf7a5b
+	github.com/blevesearch/bleve/v2 v2.3.11-0.20240222010232-dd801ce5a88b
 	github.com/blevesearch/bleve_index_api v1.1.6
 	github.com/blevesearch/zapx/v11 v11.3.10
 	github.com/blevesearch/zapx/v12 v12.3.10
 	github.com/blevesearch/zapx/v13 v13.3.10
 	github.com/blevesearch/zapx/v14 v14.3.10
 	github.com/blevesearch/zapx/v15 v15.3.13
-	github.com/blevesearch/zapx/v16 v16.0.8
+	github.com/blevesearch/zapx/v16 v16.0.10
 	github.com/buger/jsonparser v1.1.1
 	github.com/cloudfoundry/gosigar v1.3.4
 	github.com/couchbase/cbauth v0.1.11
@@ -42,7 +42,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.2.2 // indirect
 	github.com/blevesearch/geo v0.1.20 // indirect
-	github.com/blevesearch/go-faiss v1.0.10 // indirect
+	github.com/blevesearch/go-faiss v1.0.13 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
 	github.com/blevesearch/goleveldb v1.0.1 // indirect
 	github.com/blevesearch/gtreap v0.1.1 // indirect

go.sum

@@ -57,14 +57,14 @@ github.com/bits-and-blooms/bitset v1.2.2 h1:J5gbX05GpMdBjCvQ9MteIg2KKDExr7DrgK+Y
 github.com/bits-and-blooms/bitset v1.2.2/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/blevesearch/bleve-mapping-ui v0.5.2 h1:L6Irz3B14+L2WxIEVtkTi25Aps+uydKNAyt7IAlZOeE=
 github.com/blevesearch/bleve-mapping-ui v0.5.2/go.mod h1:D/HnjXhQdlSi0GU/xOWrh0LL/0XfmTSVuJZNQCy/Mqs=
-github.com/blevesearch/bleve/v2 v2.3.11-0.20240215163640-2d3c3ebf7a5b h1:41EVlTbqGA7ho3//GXmby2oN1sbhXYWSLJ+qjfXy+jw=
-github.com/blevesearch/bleve/v2 v2.3.11-0.20240215163640-2d3c3ebf7a5b/go.mod h1:783Nsvy8kfTldbs9SkiW0GiOzIvgwKaXmeRptn+tq4w=
+github.com/blevesearch/bleve/v2 v2.3.11-0.20240222010232-dd801ce5a88b h1:QRn0azq//mSVtWlENeA5O3xtlnv1HU61sndMtU4Fafc=
+github.com/blevesearch/bleve/v2 v2.3.11-0.20240222010232-dd801ce5a88b/go.mod h1:rATfMtFBaraojrNPA4gEC4qdUBbRHPW8+w/ineiVCNU=
 github.com/blevesearch/bleve_index_api v1.1.6 h1:orkqDFCBuNU2oHW9hN2YEJmet+TE9orml3FCGbl1cKk=
 github.com/blevesearch/bleve_index_api v1.1.6/go.mod h1:PbcwjIcRmjhGbkS/lJCpfgVSMROV6TRubGGAODaK1W8=
 github.com/blevesearch/geo v0.1.20 h1:paaSpu2Ewh/tn5DKn/FB5SzvH0EWupxHEIwbCk/QPqM=
 github.com/blevesearch/geo v0.1.20/go.mod h1:DVG2QjwHNMFmjo+ZgzrIq2sfCh6rIHzy9d9d0B59I6w=
-github.com/blevesearch/go-faiss v1.0.10 h1:LKt+/9yILFNlhcTwW8IMx0EewNgkD4hLnmdJFGOuA34=
-github.com/blevesearch/go-faiss v1.0.10/go.mod h1:jrxHrbl42X/RnDPI+wBoZU8joxxuRwedrxqswQ3xfU8=
+github.com/blevesearch/go-faiss v1.0.13 h1:zfFs7ZYD0NqXVSY37j0JZjZT1BhE9AE4peJfcx/NB4A=
+github.com/blevesearch/go-faiss v1.0.13/go.mod h1:jrxHrbl42X/RnDPI+wBoZU8joxxuRwedrxqswQ3xfU8=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/goleveldb v1.0.1 h1:iAtV2Cu5s0GD1lwUiekkFHe2gTMCCNVj2foPclDLIFI=
@@ -96,8 +96,8 @@ github.com/blevesearch/zapx/v14 v14.3.10 h1:SG6xlsL+W6YjhX5N3aEiL/2tcWh3DO75Bnz7
 github.com/blevesearch/zapx/v14 v14.3.10/go.mod h1:qqyuR0u230jN1yMmE4FIAuCxmahRQEOehF78m6oTgns=
 github.com/blevesearch/zapx/v15 v15.3.13 h1:6EkfaZiPlAxqXz0neniq35my6S48QI94W/wyhnpDHHQ=
 github.com/blevesearch/zapx/v15 v15.3.13/go.mod h1:Turk/TNRKj9es7ZpKK95PS7f6D44Y7fAFy8F4LXQtGg=
-github.com/blevesearch/zapx/v16 v16.0.8 h1:xiujW3MH3jDFJwh6TtN8X94wsTeBGQzIIY6HYqbASx0=
-github.com/blevesearch/zapx/v16 v16.0.8/go.mod h1:GkU8sUj2czc3syX4OwvouA74J68/e2banQ//9ufk2SM=
+github.com/blevesearch/zapx/v16 v16.0.10 h1:JuH32x4LEK+QwVRT89C+wDGWbX75tGJ0DdNq64Rla9A=
+github.com/blevesearch/zapx/v16 v16.0.10/go.mod h1:fN9n4RlFI8kST69yUeSSKJf/zZzZfP5bpcjmoRinKrk=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=