Selaa lähdekoodia

ndb_mongodb: fix for deprecated bson_as_json() from v1.29.0

- GH #4037

(cherry picked from commit 8e6a8e0baf8a700f36c81d3f808391f03a37c9d1)
Daniel-Constantin Mierla 9 kuukautta sitten
vanhempi
commit
d816c822db
1 muutettua tiedostoa jossa 9 lisäystä ja 3 poistoa
  1. 9 3
      src/modules/ndb_mongodb/mongodb_client.c

+ 9 - 3
src/modules/ndb_mongodb/mongodb_client.c

@@ -34,6 +34,12 @@
 #include "mongodb_client.h"
 #include "api.h"
 
+#if MONGOC_CHECK_VERSION(1, 29, 0)
+#define _ksr_bson_as_json bson_as_legacy_extended_json
+#else
+#define _ksr_bson_as_json bson_as_json
+#endif
+
 static mongodbc_server_t *_mongodbc_srv_list = NULL;
 
 static mongodbc_reply_t *_mongodbc_rpl_list = NULL;
@@ -263,7 +269,7 @@ int mongodbc_exec_cmd(
 			goto error_exec;
 		}
 		bson_destroy(&command);
-		rpl->jsonrpl.s = bson_as_json(&reply, NULL);
+		rpl->jsonrpl.s = _ksr_bson_as_json(&reply, NULL);
 		rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0;
 		bson_destroy(&reply);
 	} else {
@@ -303,7 +309,7 @@ int mongodbc_exec_cmd(
 			}
 			goto error_exec;
 		}
-		rpl->jsonrpl.s = bson_as_json(cdoc, NULL);
+		rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL);
 		rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0;
 	}
 
@@ -479,7 +485,7 @@ int mongodbc_next_reply(str *name)
 		rpl->jsonrpl.s = NULL;
 		rpl->jsonrpl.len = 0;
 	}
-	rpl->jsonrpl.s = bson_as_json(cdoc, NULL);
+	rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL);
 	rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0;
 	LM_DBG("next cursor result: [[%s]]\n",
 			(rpl->jsonrpl.s) ? rpl->jsonrpl.s : "<null>");