From fdcc997abaad94a6af9cb955db77f68e48068700 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 8 Jun 2021 15:04:54 +0200
Subject: [PATCH] fix tests
---
broker/src/asapo_broker/database/encoding.go | 4 ++++
broker/src/asapo_broker/database/mongodb.go | 4 ----
common/cpp/src/database/mongodb_client.cpp | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/broker/src/asapo_broker/database/encoding.go b/broker/src/asapo_broker/database/encoding.go
index 578f08185..7f0839797 100644
--- a/broker/src/asapo_broker/database/encoding.go
+++ b/broker/src/asapo_broker/database/encoding.go
@@ -5,6 +5,10 @@ import (
"net/url"
)
+const max_encoded_source_size = 63
+const max_encoded_stream_size = 100
+const max_encoded_group_size = 50
+
func shouldEscape(c byte, db bool) bool {
if c == '$' || c == ' ' || c == '%' {
return true
diff --git a/broker/src/asapo_broker/database/mongodb.go b/broker/src/asapo_broker/database/mongodb.go
index 0e1f5ecc7..75c885f30 100644
--- a/broker/src/asapo_broker/database/mongodb.go
+++ b/broker/src/asapo_broker/database/mongodb.go
@@ -74,10 +74,6 @@ const stream_filter_all = "all"
const stream_filter_finished = "finished"
const stream_filter_unfinished = "unfinished"
-const max_encoded_source_size = 63
-const max_encoded_stream_size = 100
-const max_encoded_group_size = 50
-
var dbSessionLock sync.Mutex
type SizeRecord struct {
diff --git a/common/cpp/src/database/mongodb_client.cpp b/common/cpp/src/database/mongodb_client.cpp
index b024a7d05..6020f2664 100644
--- a/common/cpp/src/database/mongodb_client.cpp
+++ b/common/cpp/src/database/mongodb_client.cpp
@@ -115,12 +115,15 @@ std::string MongoDBClient::DBAddress(const std::string& address) const {
void MongoDBClient::CleanUp() {
if (write_concern_) {
mongoc_write_concern_destroy(write_concern_);
+ write_concern_ = nullptr;
}
if (current_collection_) {
mongoc_collection_destroy(current_collection_);
+ current_collection_ = nullptr;
}
if (client_) {
mongoc_client_destroy(client_);
+ client_ = nullptr;
}
}
@@ -205,9 +208,6 @@ Error MongoDBClient::Insert(const std::string& collection, const MessageMeta& fi
}
MongoDBClient::~MongoDBClient() {
- if (!connected_) {
- return;
- }
CleanUp();
}
--
GitLab