Bläddra i källkod

toolset: Update pymongo to version 4.7.2 (#9038)

Anton Kirilov 1 år sedan
förälder
incheckning
5f8717924d
2 ändrade filer med 5 tillägg och 4 borttagningar
  1. 1 1
      Dockerfile
  2. 4 3
      toolset/databases/mongodb/mongodb.py

+ 1 - 1
Dockerfile

@@ -31,7 +31,7 @@ RUN apt-get -yqq update && \
       colorama==0.3.1 \
       colorama==0.3.1 \
       docker==7.0.0 \
       docker==7.0.0 \
       mysqlclient==2.2.4 \
       mysqlclient==2.2.4 \
-      pymongo==3.13.0
+      pymongo==4.7.2
 
 
 # Collect resource usage statistics
 # Collect resource usage statistics
 ARG DOOL_VERSION=v1.3.1
 ARG DOOL_VERSION=v1.3.1

+ 4 - 3
toolset/databases/mongodb/mongodb.py

@@ -1,3 +1,4 @@
+import bson
 import pymongo
 import pymongo
 import traceback
 import traceback
 
 
@@ -52,19 +53,19 @@ class Database(AbstractDatabase):
     @classmethod
     @classmethod
     def get_queries(cls, config):
     def get_queries(cls, config):
         co = cls.get_connection(config)
         co = cls.get_connection(config)
-        status = co.admin.command(pymongo.son_manipulator.SON([('serverStatus', 1)]))
+        status = co.admin.command(bson.son.SON([('serverStatus', 1)]))
         return int(status["opcounters"]["query"]) + int(status["opcounters"]["update"]) #get_queries returns all the queries
         return int(status["opcounters"]["query"]) + int(status["opcounters"]["update"]) #get_queries returns all the queries
 
 
     @classmethod
     @classmethod
     def get_rows(cls, config):
     def get_rows(cls, config):
         co = cls.get_connection(config)
         co = cls.get_connection(config)
-        status = co.admin.command(pymongo.son_manipulator.SON([('serverStatus', 1)]))
+        status = co.admin.command(bson.son.SON([('serverStatus', 1)]))
         return int(status["opcounters"]["query"]) * cls.get_rows_per_query(co)
         return int(status["opcounters"]["query"]) * cls.get_rows_per_query(co)
 
 
     @classmethod
     @classmethod
     def get_rows_updated(cls, config):
     def get_rows_updated(cls, config):
         co = cls.get_connection(config)
         co = cls.get_connection(config)
-        status = co.admin.command(pymongo.son_manipulator.SON([('serverStatus', 1)]))
+        status = co.admin.command(bson.son.SON([('serverStatus', 1)]))
         return int(status["opcounters"]["update"]) * cls.get_rows_per_query(co)
         return int(status["opcounters"]["update"]) * cls.get_rows_per_query(co)
 
 
     @classmethod
     @classmethod