database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

BRM journal is always singular, do not apply suffix logic to it

Browse Source
This commit is contained in:
Alexander Presnyakov
2025-07-23 16:38:15 +00:00
committed by drrtuy
parent bfdd581f6b
commit f8a57b4412
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmapi/cmapi_server/controllers/endpoints.py
View File

@@ -748,7 +748,12 @@ class ExtentMapController:
retry_count += 1
continue
elem_current_suffix = ret.stdout.decode("utf-8").rstrip()
elem_current_filename = f'{EM_PATH_SUFFIX}/{elem_current_suffix}_{element}'
suffix_for_file = elem_current_suffix
# The journal is always in the current directory, strip trailing A/B from suffix
if element == 'journal' and suffix_for_file.endswith(('A', 'B')):
suffix_for_file = suffix_for_file[:-1]
elem_current_filename = f'{EM_PATH_SUFFIX}/{suffix_for_file}_{element}'
# TODO: Remove conditional once container dispatcher
# uses non-root by default
@@ -774,8 +779,13 @@ class ExtentMapController:
)
elem_current_name = Path(MCS_BRM_CURRENT_PATH)
elem_current_filename = elem_current_name.read_text().rstrip()
suffix_for_file = elem_current_filename
# The journal is always in the current directory, strip trailing A/B from suffix
if element == 'journal' and suffix_for_file.endswith(('A', 'B')):
suffix_for_file = suffix_for_file[:-1]
elem_current_file = Path(
f'{MCS_EM_PATH}/{elem_current_filename}_{element}'
f'{MCS_EM_PATH}/{suffix_for_file}_{element}'
)
result = elem_current_file.read_bytes()

16
cmapi/cmapi_server/test/test_em_endpoints.py
View File

@@ -66,7 +66,13 @@ class TestEMEndpoints(unittest.TestCase):
["smcat", S3_BRM_CURRENT_PATH], stdout=subprocess.PIPE
)
element_current_suffix = ret.stdout.decode("utf-8").rstrip()
element_current_filename = f'{EM_PATH_SUFFIX}/{element_current_suffix}_{element}'
suffix_for_file = element_current_suffix
# Journal is always singular, so strip trailing A/B from suffix
if element == 'journal' and suffix_for_file.endswith(('A', 'B')):
suffix_for_file = suffix_for_file[:-1]
element_current_filename = f'{EM_PATH_SUFFIX}/{suffix_for_file}_{element}'
ret = subprocess.run(
["smcat", element_current_filename], stdout=subprocess.PIPE
)
@@ -74,8 +80,14 @@ class TestEMEndpoints(unittest.TestCase):
else:
element_current_name = Path(MCS_BRM_CURRENT_PATH)
element_current_filename = element_current_name.read_text().rstrip()
suffix_for_file = element_current_filename
# Journal is always singular, so strip trailing A/B from suffix
if element == 'journal' and suffix_for_file.endswith(('A', 'B')):
suffix_for_file = suffix_for_file[:-1]
element_current_file = Path(
f'{MCS_EM_PATH}/{element_current_filename}_{element}'
f'{MCS_EM_PATH}/{suffix_for_file}_{element}'
)
result = element_current_file.read_bytes()
return result