projects
/
osm
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for mongodb replicaset connection (HA).
[osm/common.git]
/
osm_common
/
dbmongo.py
diff --git
a/osm_common/dbmongo.py
b/osm_common/dbmongo.py
index
e40d0e4
..
56f387b
100644
(file)
--- a/
osm_common/dbmongo.py
+++ b/
osm_common/dbmongo.py
@@
-99,9
+99,9
@@
class DbMongo(DbBase):
self.database_key = master_key
self.set_secret_key(master_key)
if config.get("uri"):
self.database_key = master_key
self.set_secret_key(master_key)
if config.get("uri"):
- self.client = MongoClient(config["uri"])
+ self.client = MongoClient(config["uri"]
, replicaSet=config.get("replicaset", None)
)
else:
else:
- self.client = MongoClient(config["host"], config["port"])
+ self.client = MongoClient(config["host"], config["port"]
, replicaSet=config.get("replicaset", None)
)
# TODO add as parameters also username=config.get("user"), password=config.get("password"))
# when all modules are ready
self.db = self.client[config["name"]]
# TODO add as parameters also username=config.get("user"), password=config.get("password"))
# when all modules are ready
self.db = self.client[config["name"]]
@@
-362,7
+362,8
@@
class DbMongo(DbBase):
except Exception as e: # TODO refine
raise DbException(e)
except Exception as e: # TODO refine
raise DbException(e)
- def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None):
+ def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None,
+ push_list=None, pull_list=None):
"""
Modifies an entry at database
:param table: collection or table
"""
Modifies an entry at database
:param table: collection or table
@@
-374,8
+375,11
@@
class DbMongo(DbBase):
ignored. If not exist, it is ignored
:param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
if exist in the array is removed. If not exist, it is ignored
ignored. If not exist, it is ignored
:param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
if exist in the array is removed. If not exist, it is ignored
+ :param pull_list: Same as pull but values are arrays where each item is removed from the array
:param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys and value
is appended to the end of the array
:param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys and value
is appended to the end of the array
+ :param push_list: Same as push but values are arrays where each item is and appended instead of appending the
+ whole array
:return: Dict with the number of entries modified. None if no matching is found.
"""
try:
:return: Dict with the number of entries modified. None if no matching is found.
"""
try:
@@
-384,10
+388,14
@@
class DbMongo(DbBase):
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
- if pull:
- db_oper["$pull"] = pull
- if push:
- db_oper["$push"] = push
+ if pull or pull_list:
+ db_oper["$pull"] = pull or {}
+ if pull_list:
+ db_oper["$pull"].update({k: {"$in": v} for k, v in pull_list.items()})
+ if push or push_list:
+ db_oper["$push"] = push or {}
+ if push_list:
+ db_oper["$push"].update({k: {"$each": v} for k, v in push_list.items()})
with self.lock:
collection = self.db[table]
with self.lock:
collection = self.db[table]
@@
-401,7
+409,7
@@
class DbMongo(DbBase):
except Exception as e: # TODO refine
raise DbException(e)
except Exception as e: # TODO refine
raise DbException(e)
- def set_list(self, table, q_filter, update_dict, unset=None, pull=None, push=None):
+ def set_list(self, table, q_filter, update_dict, unset=None, pull=None, push=None
, push_list=None, pull_list=None
):
"""
Modifies al matching entries at database
:param table: collection or table
"""
Modifies al matching entries at database
:param table: collection or table
@@
-411,8
+419,11
@@
class DbMongo(DbBase):
ignored. If not exist, it is ignored
:param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
if exist in the array is removed. If not exist, it is ignored
ignored. If not exist, it is ignored
:param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
if exist in the array is removed. If not exist, it is ignored
- :param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys and value
- is appended to the end of the array
+ :param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys, the
+ single value is appended to the end of the array
+ :param pull_list: Same as pull but values are arrays where each item is removed from the array
+ :param push_list: Same as push but values are arrays where each item is and appended instead of appending the
+ whole array
:return: Dict with the number of entries modified
"""
try:
:return: Dict with the number of entries modified
"""
try:
@@
-421,10
+432,14
@@
class DbMongo(DbBase):
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
db_oper["$set"] = update_dict
if unset:
db_oper["$unset"] = unset
- if pull:
- db_oper["$pull"] = pull
- if push:
- db_oper["$push"] = push
+ if pull or pull_list:
+ db_oper["$pull"] = pull or {}
+ if pull_list:
+ db_oper["$pull"].update({k: {"$in": v} for k, v in pull_list.items()})
+ if push or push_list:
+ db_oper["$push"] = push or {}
+ if push_list:
+ db_oper["$push"].update({k: {"$each": v} for k, v in push_list.items()})
with self.lock:
collection = self.db[table]
rows = collection.update_many(self._format_filter(q_filter), db_oper)
with self.lock:
collection = self.db[table]
rows = collection.update_many(self._format_filter(q_filter), db_oper)