thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-20 14:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

More variable renamings for more uniformity

Browse Source
This commit is contained in:
Robert Schulze 2022-07-06 14:55:02 +00:00
parent 0b0d64c5ca
commit 8a18705729
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Functions/FunctionsMultiStringFuzzySearch.h
View File

@ -83,11 +83,11 @@ public:
else else
throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {}. The number is not const or does not fit in UInt32", arguments[1].column->getName()); throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {}. The number is not const or does not fit in UInt32", arguments[1].column->getName());
const ColumnArray * col_needles = checkAndGetColumn<ColumnArray>(needles_ptr.get()); const ColumnArray * col_needles_vector = checkAndGetColumn<ColumnArray>(needles_ptr.get());
const ColumnConst * col_needles_const = checkAndGetColumnConst<ColumnArray>(needles_ptr.get()); const ColumnConst * col_needles_const = checkAndGetColumnConst<ColumnArray>(needles_ptr.get());
assert(static_cast<bool>(col_needles) ^ static_cast<bool>(col_needles_const)); assert(static_cast<bool>(col_needles_vector) ^ static_cast<bool>(col_needles_const));
if (col_haystack_const && col_needles) if (col_haystack_const && col_needles_vector)
throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support search with non-constant needles in constant haystack", name); throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support search with non-constant needles in constant haystack", name);
using ResultType = typename Impl::ResultType; using ResultType = typename Impl::ResultType;
@ -108,7 +108,7 @@ public:
else else
{ {
Impl::vectorVector( Impl::vectorVector(
col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), *col_needles, vec_res, offsets_res, edit_distance, col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), *col_needles_vector, vec_res, offsets_res, edit_distance,
allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length); allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
} }

8
src/Functions/FunctionsMultiStringSearch.h
View File

@ -83,11 +83,11 @@ public:
const ColumnConst * col_haystack_const = checkAndGetColumnConst<ColumnString>(&*haystack_ptr); const ColumnConst * col_haystack_const = checkAndGetColumnConst<ColumnString>(&*haystack_ptr);
assert(static_cast<bool>(col_haystack_vector) ^ static_cast<bool>(col_haystack_const)); assert(static_cast<bool>(col_haystack_vector) ^ static_cast<bool>(col_haystack_const));
const ColumnArray * col_needles = checkAndGetColumn<ColumnArray>(needles_ptr.get()); const ColumnArray * col_needles_vector = checkAndGetColumn<ColumnArray>(needles_ptr.get());
const ColumnConst * col_needles_const = checkAndGetColumnConst<ColumnArray>(needles_ptr.get()); const ColumnConst * col_needles_const = checkAndGetColumnConst<ColumnArray>(needles_ptr.get());
assert(static_cast<bool>(col_needles) ^ static_cast<bool>(col_needles_const)); assert(static_cast<bool>(col_needles_vector) ^ static_cast<bool>(col_needles_const));
if (col_haystack_const && col_needles) if (col_haystack_const && col_needles_vector)
throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support search with non-constant needles in constant haystack", name); throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support search with non-constant needles in constant haystack", name);
using ResultType = typename Impl::ResultType; using ResultType = typename Impl::ResultType;
@ -108,7 +108,7 @@ public:
else else
{ {
Impl::vectorVector( Impl::vectorVector(
col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), *col_needles, vec_res, offsets_res, col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), *col_needles_vector, vec_res, offsets_res,
allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length); allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
} }