thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2021-10-06 15:12:07 +03:00
parent 90eb74c933
commit 33353be4ed
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Functions/ngrams.cpp
View File

@ -53,14 +53,14 @@ public:
const auto & ngram_argument_column = arguments[1].column; const auto & ngram_argument_column = arguments[1].column;
auto ngram_argument_type = WhichDataType(column_with_type.type); auto ngram_argument_type = WhichDataType(column_with_type.type);
if (!ngram_argument_type.isNativeUInt() && ngram_argument_column && isColumnConst(*ngram_argument_column)) if (!ngram_argument_type.isNativeUInt() || !ngram_argument_column || !isColumnConst(*ngram_argument_column))
throw Exception(ErrorCodes::BAD_ARGUMENTS, throw Exception(ErrorCodes::BAD_ARGUMENTS,
"Function {} second argument type should be constant UInt. Actual {}", "Function {} second argument type should be constant UInt. Actual {}",
getName(), getName(),
arguments[1].type->getName()); arguments[1].type->getName());
Field ngram_argument_value; Field ngram_argument_value;
arguments[1].column->get(0, ngram_argument_value); ngram_argument_column->get(0, ngram_argument_value);
auto ngram_value = ngram_argument_value.safeGet<UInt64>(); auto ngram_value = ngram_argument_value.safeGet<UInt64>();
return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFixedString>(ngram_value)); return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFixedString>(ngram_value));

2
src/Storages/MergeTree/MergeTreeIndexFullText.cpp
View File

@ -18,7 +18,6 @@
#include <Poco/Logger.h> #include <Poco/Logger.h>
namespace DB namespace DB
{ {
@ -136,7 +135,6 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
*pos += rows_read; *pos += rows_read;
} }
MergeTreeConditionFullText::MergeTreeConditionFullText( MergeTreeConditionFullText::MergeTreeConditionFullText(
const SelectQueryInfo & query_info, const SelectQueryInfo & query_info,
ContextPtr context, ContextPtr context,