mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 15:12:02 +00:00
Fix build and style
This commit is contained in:
parent
74670e7d20
commit
184405fc7a
@ -478,7 +478,7 @@ static DataTypePtr createJSON(const ASTPtr & arguments)
|
||||
void registerDataTypeJSON(DataTypeFactory & factory)
|
||||
{
|
||||
if (!Context::getGlobalContextInstance()->getSettingsRef().use_json_alias_for_old_object_type)
|
||||
factory.registerDataType("JSON", createJSON, DataTypeFactory::CaseInsensitive);
|
||||
factory.registerDataType("JSON", createJSON, DataTypeFactory::Case::Insensitive);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -10,11 +10,6 @@
|
||||
namespace DB
|
||||
{
|
||||
|
||||
namespace ErrorCodes
|
||||
{
|
||||
extern const int NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
class DataTypeObject : public IDataType
|
||||
{
|
||||
public:
|
||||
|
@ -80,7 +80,7 @@ void registerDataTypeObjectDeprecated(DataTypeFactory & factory)
|
||||
if (Context::getGlobalContextInstance()->getSettingsRef().use_json_alias_for_old_object_type)
|
||||
factory.registerSimpleDataType("JSON",
|
||||
[] { return std::make_shared<DataTypeObjectDeprecated>("JSON", false); },
|
||||
DataTypeFactory::CaseInsensitive);
|
||||
DataTypeFactory::Case::Insensitive);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
|
||||
DataTypePtr getReturnTypeImpl(const DataTypes & data_types) const override
|
||||
{
|
||||
if (data_types.size() != 1 )
|
||||
if (data_types.size() != 1)
|
||||
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires single argument with type JSON", getName());
|
||||
|
||||
if (data_types[0]->getTypeId() != TypeIndex::Object)
|
||||
@ -152,7 +152,7 @@ private:
|
||||
for (const auto & path : dynamic_paths)
|
||||
{
|
||||
/// Don't include path if it contains NULL, because we consider
|
||||
/// it to be equivalent to the absense of this path in this row.
|
||||
/// it to be equivalent to the absence of this path in this row.
|
||||
if (!dynamic_path_columns.at(path)->isNullAt(i))
|
||||
data.insertData(path.data(), path.size());
|
||||
}
|
||||
|
@ -390,6 +390,8 @@ IsValid
|
||||
JBOD
|
||||
JOINed
|
||||
JOINs
|
||||
JSONAllPaths
|
||||
JSONAllPathsWithTypes
|
||||
JSONArrayLength
|
||||
JSONAsObject
|
||||
JSONAsString
|
||||
@ -404,6 +406,8 @@ JSONCompactStrings
|
||||
JSONCompactStringsEachRow
|
||||
JSONCompactStringsEachRowWithNames
|
||||
JSONCompactStringsEachRowWithNamesAndTypes
|
||||
JSONDynamicPaths
|
||||
JSONDynamicPathsWithTypes
|
||||
JSONEachRow
|
||||
JSONEachRowWithProgress
|
||||
JSONExtract
|
||||
@ -423,6 +427,8 @@ JSONObjectEachRow
|
||||
JSONStrings
|
||||
JSONStringsEachRow
|
||||
JSONStringsEachRowWithProgress
|
||||
JSONSharedDataPaths
|
||||
JSONSharedDataPathsWithTypes
|
||||
JSONType
|
||||
JSONs
|
||||
Jaeger
|
||||
|
Loading…
Reference in New Issue
Block a user