Avoid regexp

This commit is contained in:
avogar 2024-08-06 09:07:21 +00:00
parent bb33dca384
commit 71c06b40cb
14 changed files with 21 additions and 21 deletions

View File

@ -100,14 +100,14 @@ For `.sh` tests limits are written as a comment on the line next to tags or on t
```bash
#!/usr/bin/env bash
# Tags: no-fasttest
# Random settings limits: max_block_size=(1000, 10000), index_granularity=(100, None)
# Random settings limits: max_block_size=(1000, 10000); index_granularity=(100, None)
```
For `.sql` tests tags are placed as a SQL comment in the line next to tags or in the first line:
```sql
-- Tags: no-fasttest
-- Random settings limits: max_block_size=(1000, 10000), index_granularity=(100, None)
-- Random settings limits: max_block_size=(1000, 10000); index_granularity=(100, None)
SELECT 1
```

View File

@ -1964,13 +1964,13 @@ class TestSuite:
if not random_settings_limits_str.startswith(random_settings_limits_prefix):
return {}
random_settings_limits_str = random_settings_limits_str[len(random_settings_limits_prefix) :] # noqa: ignore E203
# limits are specified in a form 'setting1=(min, max), setting2=(min,max), ...'
random_settings_limits = re.findall(
"([^=, ]+) *= *(\([^=]+\))", random_settings_limits_str
)
random_settings_limits = {
pair[0]: make_tuple(pair[1]) for pair in random_settings_limits
}
# limits are specified in a form 'setting1=(min, max); setting2=(min,max); ...'
random_settings_limits = {}
for setting_and_limit in random_settings_limits_str.split(';'):
setting_and_limit = setting_and_limit.split('=')
random_settings_limits[setting_and_limit[0].strip()] = make_tuple(
setting_and_limit[1]
)
return random_settings_limits
def is_shebang(line: str) -> bool:

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type=1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type=1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type=1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type=1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_dynamic_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_variant_type = 1;
set use_variant_as_common_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_variant_type = 1;
set use_variant_as_common_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_variant_type = 1;
set use_variant_as_common_type = 1;

View File

@ -1,5 +1,5 @@
-- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-- Random settings limits: index_granularity=(100, None), merge_max_block_size=(100, None)
-- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
set allow_experimental_variant_type = 1;
set use_variant_as_common_type = 1;