thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 19:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

disallow null characters in custom alphabet

Browse Source
This commit is contained in:
Michael Nutt 2022-05-13 08:43:42 +09:00
parent 4eb55d17b3
commit 03a7f7c4bd
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Functions/FunctionHashID.h
View File

@ -4,17 +4,17 @@
#if USE_HASHIDSXX #if USE_HASHIDSXX
#include <hashids.h> # include <hashids.h>
#include <Columns/ColumnString.h> # include <Columns/ColumnString.h>
#include <Columns/ColumnsNumber.h> # include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeString.h> # include <DataTypes/DataTypeString.h>
#include <Functions/FunctionFactory.h> # include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h> # include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h> # include <Functions/IFunction.h>
#include <functional> # include <functional>
#include <initializer_list> # include <initializer_list>
namespace DB namespace DB
{ {
@ -23,6 +23,7 @@ namespace ErrorCodes
{ {
extern const int ILLEGAL_COLUMN; extern const int ILLEGAL_COLUMN;
extern const int ILLEGAL_TYPE_OF_ARGUMENT; extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int INVALID_ALPHABET;
extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION; extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION; extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
} }
@ -114,7 +115,11 @@ public:
{ {
const auto & alphabetcolumn = arguments[3].column; const auto & alphabetcolumn = arguments[3].column;
if (auto alpha_col = checkAndGetColumnConst<ColumnString>(alphabetcolumn.get())) if (auto alpha_col = checkAndGetColumnConst<ColumnString>(alphabetcolumn.get()))
{
alphabet = alpha_col->getValue<String>(); alphabet = alpha_col->getValue<String>();
if (alphabet.find("\0") != std::string::npos)
throw Exception(ErrorCodes::INVALID_ALPHABET, "Custom alphabet must not contain null character");
}
} }
else else
alphabet.assign(DEFAULT_ALPHABET); alphabet.assign(DEFAULT_ALPHABET);