diff options
author | Etienne Petrel <etienne.petrel@mongodb.com> | 2023-02-07 03:53:16 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-07 04:46:39 +0000 |
commit | 50b8172aa3be78b0beee29c516a3cb412dddb26b (patch) | |
tree | cc30aacf027236675fff1056f8a2c7183af1dcfa | |
parent | d1ec31a870e6189634389f8a1c4dac293c9352f5 (diff) | |
download | mongo-50b8172aa3be78b0beee29c516a3cb412dddb26b.tar.gz |
Import wiredtiger: 555e19733065fc47d4dc85a68283730744992e40 from branch mongodb-master
ref: 3687d84457..555e197330
for: 6.3.0-rc0
WT-10574 Fix whitespace issues in three files
4 files changed, 15 insertions, 15 deletions
diff --git a/src/third_party/wiredtiger/cmake/third_party/azure_sdk.cmake b/src/third_party/wiredtiger/cmake/third_party/azure_sdk.cmake index b0a459484dd..27482215577 100644 --- a/src/third_party/wiredtiger/cmake/third_party/azure_sdk.cmake +++ b/src/third_party/wiredtiger/cmake/third_party/azure_sdk.cmake @@ -10,7 +10,7 @@ config_choice( "package;IMPORT_AZURE_SDK_PACKAGE;ENABLE_AZURE" "external;IMPORT_AZURE_SDK_EXTERNAL;ENABLE_AZURE" ) - + if(IMPORT_AZURE_SDK_NONE) message(FATAL_ERROR "Cannot enable the Azure extension without specifying an IMPORT_AZURE_SDK method (package, external).") endif() @@ -39,7 +39,7 @@ if (IMPORT_AZURE_SDK_EXTERNAL) BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/azure-sdk-cpp/install/${CMAKE_INSTALL_LIBDIR}/libazure-storage-blobs${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/azure-sdk-cpp/install/${CMAKE_INSTALL_LIBDIR}/libazure-core${CMAKE_SHARED_LIBRARY_SUFFIX} - ${CMAKE_CURRENT_BINARY_DIR}/azure-sdk-cpp/install/${CMAKE_INSTALL_LIBDIR}/libazure-storage-common${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CMAKE_CURRENT_BINARY_DIR}/azure-sdk-cpp/install/${CMAKE_INSTALL_LIBDIR}/libazure-storage-common${CMAKE_SHARED_LIBRARY_SUFFIX} INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/azure-sdk-cpp/install TEST_COMMAND "" UPDATE_COMMAND "" @@ -59,7 +59,7 @@ add_library(azure_core_lib SHARED IMPORTED) add_library(azure_storage_common_lib SHARED IMPORTED) # Declare the include directories under INTERFACE_INCLUDE_DIRECTORIES during the configuration phase -# to set the IMPORTED_LOCATION for shared imported targets so that the linker knows where the shared +# to set the IMPORTED_LOCATION for shared imported targets so that the linker knows where the shared # libraries are located to build the intermediate library. set_target_properties(azure_storage_lib PROPERTIES IMPORTED_LOCATION ${azure_storage_lib_location} diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index da6f0711304..794ff627df5 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "3687d84457c5468542645aff23930a2a248a16ed" + "commit": "555e19733065fc47d4dc85a68283730744992e40" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 222921b8105..d30a6a85700 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -2231,7 +2231,7 @@ tasks: cd cmake_build i=0 limit=100 - while ((i < limit)) + while ((i < limit)) do ((i=i+1)) echo "Test count: $i" @@ -3245,7 +3245,7 @@ tasks: - func: "run data validation stress test checkpoint" vars: run_test_checkpoint_args: -x -s 6 - + - name: data-validation-stress-test-checkpoint-fp-hs-insert-s7 tags: ["data-validation-stress-test"] depends_on: @@ -5086,7 +5086,7 @@ buildvariants: - macos-1100 batchtime: 120 # 2 hours expansions: - # The cmake toolchain file is set to the mongodb toolchain gcc by defualt. + # The cmake toolchain file is set to the mongodb toolchain gcc by defualt. # Remove that configuration here and let MacOS use the default Xcode toolchain instead. CMAKE_TOOLCHAIN_FILE: python_binary: 'python3' diff --git a/src/third_party/wiredtiger/test/suite/test_tiered19.py b/src/third_party/wiredtiger/test/suite/test_tiered19.py index 8c2c026ac1c..bec291ff1d8 100644 --- a/src/third_party/wiredtiger/test/suite/test_tiered19.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered19.py @@ -40,13 +40,13 @@ class test_tiered19(wttest.WiredTigerTestCase, TieredConfigMixin): tiered_storage_sources = [ ('azure_store', dict(is_tiered = True, is_local_storage = False, - auth_token = get_auth_token('azure_store'), + auth_token = get_auth_token('azure_store'), bucket = 'pythontest', bucket_prefix = "pfx_", ss_name = 'azure_store')), ('gcp_store', dict(is_tiered = True, is_local_storage = False, - auth_token = get_auth_token('gcp_store'), + auth_token = get_auth_token('gcp_store'), bucket = 'test_tiered19', bucket_prefix = "pfx_", ss_name = 'gcp_store')), @@ -65,12 +65,12 @@ class test_tiered19(wttest.WiredTigerTestCase, TieredConfigMixin): if cache_dir: conf += ',cache_directory=' + cache_dir return conf - + # Load the storage source extensions. def conn_extensions(self, extlist): TieredConfigMixin.conn_extensions(self, extlist) - def test_gcp_filesystem(self): + def test_gcp_filesystem(self): # Test basic functionality of the storage source API, calling # each supported method in the API at least once. @@ -107,11 +107,11 @@ class test_tiered19(wttest.WiredTigerTestCase, TieredConfigMixin): lambda: ss.ss_customize_file_system( session, self.bucket, "", self.get_fs_config(prefix)), err_msg) # Provide a bucket name that does not exist. - non_exist_bucket = "non_exist" + non_exist_bucket = "non_exist" self.assertRaisesHavingMessage(wiredtiger.WiredTigerError, lambda: ss.ss_customize_file_system( session, non_exist_bucket, None, self.get_fs_config(prefix)), err_msg) - # Provide a bucket name that exists but we do not have access to. + # Provide a bucket name that exists but we do not have access to. no_access_bucket = "test_cred" self.assertRaisesHavingMessage(wiredtiger.WiredTigerError, lambda: ss.ss_customize_file_system( @@ -137,7 +137,7 @@ class test_tiered19(wttest.WiredTigerTestCase, TieredConfigMixin): lambda: ss.ss_customize_file_system( session, "", None, self.get_fs_config(prefix_1)), err_msg) - bad_bucket = "./bucket_BAD" + bad_bucket = "./bucket_BAD" err_msg = '/Exception: No such file or directory/' self.assertRaisesHavingMessage(wiredtiger.WiredTigerError, lambda: ss.ss_customize_file_system( @@ -150,7 +150,7 @@ class test_tiered19(wttest.WiredTigerTestCase, TieredConfigMixin): # Create another file systems to make sure that terminate works. ss.ss_customize_file_system( session, self.bucket, None, self.get_fs_config(prefix_2)) - + # Test that azure file system terminate succeeds. self.assertEqual(azure_fs_1.terminate(session), 0) |