thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
vdimir 2024-07-31 09:36:56 +00:00
parent 9f9c5b8d6f
commit 175f0696d5
No known key found for this signature in database
GPG Key ID: 6EE4CE2BEDC51862
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/CMakeLists.txt vendored
View File

@ -154,8 +154,12 @@ add_contrib (idna-cmake idna)
add_contrib (datasketches-cpp-cmake datasketches-cpp) add_contrib (datasketches-cpp-cmake datasketches-cpp)
add_contrib (incbin-cmake incbin) add_contrib (incbin-cmake incbin)
add_contrib (sqids-cpp-cmake sqids-cpp) add_contrib (sqids-cpp-cmake sqids-cpp)
add_contrib (mongo-c-driver-cmake mongo-c-driver) # requires: zlib
add_contrib (mongo-cxx-driver-cmake mongo-cxx-driver) # requires: libmongoc, libbson option(ENABLE_MONGODB "Enable MongoDB support" ${ENABLE_LIBRARIES})
if (ENABLE_MONGODB)
add_contrib (mongo-c-driver-cmake mongo-c-driver) # requires: zlib
add_contrib (mongo-cxx-driver-cmake mongo-cxx-driver) # requires: libmongoc, libbson
endif()
option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES}) option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
if (ENABLE_NLP) if (ENABLE_NLP)

12
tests/integration/helpers/cluster.py
View File

@ -1445,9 +1445,9 @@ class ClickHouseCluster:
def setup_azurite_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_azurite_cmd(self, instance, env_variables, docker_compose_yml_dir):
self.with_azurite = True self.with_azurite = True
env_variables["AZURITE_PORT"] = str(self.azurite_port) env_variables["AZURITE_PORT"] = str(self.azurite_port)
env_variables[ env_variables["AZURITE_STORAGE_ACCOUNT_URL"] = (
"AZURITE_STORAGE_ACCOUNT_URL" f"http://azurite1:{env_variables['AZURITE_PORT']}/devstoreaccount1"
] = f"http://azurite1:{env_variables['AZURITE_PORT']}/devstoreaccount1" )
env_variables["AZURITE_CONNECTION_STRING"] = ( env_variables["AZURITE_CONNECTION_STRING"] = (
f"DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;" f"DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;"
f"AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;" f"AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;"
@ -1643,9 +1643,9 @@ class ClickHouseCluster:
# Code coverage files will be placed in database directory # Code coverage files will be placed in database directory
# (affect only WITH_COVERAGE=1 build) # (affect only WITH_COVERAGE=1 build)
env_variables[ env_variables["LLVM_PROFILE_FILE"] = (
"LLVM_PROFILE_FILE" "/var/lib/clickhouse/server_%h_%p_%m.profraw"
] = "/var/lib/clickhouse/server_%h_%p_%m.profraw" )
clickhouse_start_command = CLICKHOUSE_START_COMMAND clickhouse_start_command = CLICKHOUSE_START_COMMAND
if clickhouse_log_file: if clickhouse_log_file:

3
tests/integration/test_storage_mongodb_new/test.py
View File

@ -522,7 +522,8 @@ def test_auth_source(started_cluster):
mongo_connection = get_mongo_connection(started_cluster, with_credentials=False) mongo_connection = get_mongo_connection(started_cluster, with_credentials=False)
admin_db = mongo_connection["admin"] admin_db = mongo_connection["admin"]
admin_db.command("dropAllUsersFromDatabase") admin_db.command("dropAllUsersFromDatabase")
admin_db.command("createUser", admin_db.command(
"createUser",
"root", "root",
pwd="clickhouse", pwd="clickhouse",
roles=[{"role": "userAdminAnyDatabase", "db": "admin"}, "readWriteAnyDatabase"], roles=[{"role": "userAdminAnyDatabase", "db": "admin"}, "readWriteAnyDatabase"],