wbtiger
/
ByConity
mirror of https://github.com/ByConity/ByConity
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for NULL as random seed; reordered parameters for convenience

This commit is contained in:
Alexey Milovidov 2020-03-08 00:09:45 +03:00
parent 609aef269d
commit 757c37c03e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/src/Storages/StorageGenerateRandom.cpp
View File

@ -376,13 +376,17 @@ void registerStorageGenerateRandom(StorageFactory & factory)
UInt64 max_array_length = 10;
if (engine_args.size() >= 1)
random_seed = engine_args[0]->as<ASTLiteral &>().value.safeGet<UInt64>();
{
const Field & value = engine_args[0]->as<const ASTLiteral &>().value;
if (!value.isNull())
random_seed = value.safeGet<UInt64>();
}
if (engine_args.size() >= 2)
max_string_length = engine_args[1]->as<ASTLiteral &>().value.safeGet<UInt64>();
max_string_length = engine_args[1]->as<const ASTLiteral &>().value.safeGet<UInt64>();
if (engine_args.size() == 3)
max_array_length = engine_args[2]->as<ASTLiteral &>().value.safeGet<UInt64>();
max_array_length = engine_args[2]->as<const ASTLiteral &>().value.safeGet<UInt64>();
return StorageGenerateRandom::create(args.table_id, args.columns, max_array_length, max_string_length, random_seed);

12
dbms/src/TableFunctions/TableFunctionGenerateRandom.cpp
View File

@ -45,20 +45,24 @@ StoragePtr TableFunctionGenerateRandom::executeImpl(const ASTPtr & ast_function,
ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
/// Parsing first argument as table structure and creating a sample block
std::string structure = args[0]->as<ASTLiteral &>().value.safeGet<String>();
std::string structure = args[0]->as<const ASTLiteral &>().value.safeGet<String>();
UInt64 max_string_length = 10;
UInt64 max_array_length = 10;
std::optional<UInt64> random_seed = 0; // zero for random
if (args.size() >= 2)
random_seed = args[1]->as<ASTLiteral &>().value.safeGet<UInt64>();
{
const Field & value = args[1]->as<const ASTLiteral &>().value;
if (!value.isNull())
random_seed = value.safeGet<UInt64>();
}
if (args.size() >= 3)
max_string_length = args[2]->as<ASTLiteral &>().value.safeGet<UInt64>();
max_string_length = args[2]->as<const ASTLiteral &>().value.safeGet<UInt64>();
if (args.size() == 4)
max_array_length = args[3]->as<ASTLiteral &>().value.safeGet<UInt64>();
max_array_length = args[3]->as<const ASTLiteral &>().value.safeGet<UInt64>();
ColumnsDescription columns = parseColumnsListFromString(structure, context);