Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
d8ca4345
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d8ca4345
编写于
8月 10, 2018
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed style violations [#CLICKHOUSE-2]
上级
29e40f00
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
12 deletion
+12
-12
dbms/src/Formats/ODBCDriver2BlockOutputStream.cpp
dbms/src/Formats/ODBCDriver2BlockOutputStream.cpp
+2
-1
dbms/src/Functions/FunctionsHashing.h
dbms/src/Functions/FunctionsHashing.h
+1
-1
dbms/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
dbms/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+1
-1
dbms/src/Interpreters/ExternalLoader.cpp
dbms/src/Interpreters/ExternalLoader.cpp
+4
-4
dbms/src/Storages/StorageFactory.cpp
dbms/src/Storages/StorageFactory.cpp
+1
-1
dbms/src/Storages/StorageMaterializedView.h
dbms/src/Storages/StorageMaterializedView.h
+0
-1
dbms/src/Storages/StorageMergeTree.cpp
dbms/src/Storages/StorageMergeTree.cpp
+1
-1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+2
-2
未找到文件。
dbms/src/Formats/ODBCDriver2BlockOutputStream.cpp
浏览文件 @
d8ca4345
...
...
@@ -87,7 +87,8 @@ void ODBCDriver2BlockOutputStream::writePrefix()
void
registerOutputFormatODBCDriver2
(
FormatFactory
&
factory
)
{
factory
.
registerOutputFormat
(
"ODBCDriver2"
,
[](
WriteBuffer
&
buf
,
const
Block
&
sample
,
const
Context
&
,
const
FormatSettings
&
format_settings
)
{
"ODBCDriver2"
,
[](
WriteBuffer
&
buf
,
const
Block
&
sample
,
const
Context
&
,
const
FormatSettings
&
format_settings
)
{
return
std
::
make_shared
<
ODBCDriver2BlockOutputStream
>
(
buf
,
sample
,
format_settings
);
});
}
...
...
dbms/src/Functions/FunctionsHashing.h
浏览文件 @
d8ca4345
...
...
@@ -583,7 +583,7 @@ public:
size_t
getNumberOfArguments
()
const
override
{
return
1
;
}
DataTypePtr
getReturnTypeImpl
(
const
DataTypes
&
/*arguments */
)
const
override
DataTypePtr
getReturnTypeImpl
(
const
DataTypes
&
/*arguments */
)
const
override
{
return
std
::
make_shared
<
DataTypeNumber
<
ToType
>>
();
}
bool
useDefaultImplementationForConstants
()
const
override
{
return
true
;
}
...
...
dbms/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
浏览文件 @
d8ca4345
...
...
@@ -118,7 +118,7 @@ void SelectStreamFactory::createForShard(
}
else
emplace_local_stream
();
/// Let it fail the usual way.
return
;
}
...
...
dbms/src/Interpreters/ExternalLoader.cpp
浏览文件 @
d8ca4345
...
...
@@ -228,8 +228,8 @@ void ExternalLoader::reloadFromConfigFiles(const bool throw_on_error, const bool
throw
;
}
}
/// erase removed from config loadable objects
/// erase removed from config loadable objects
std
::
list
<
std
::
string
>
removed_loadable_objects
;
for
(
const
auto
&
loadable
:
loadable_objects
)
{
...
...
@@ -261,7 +261,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
if
(
force_reload
||
last_modified
>
config_last_modified
)
{
auto
config
=
config_repository
->
load
(
config_path
);
loadable_objects_defined_in_config
[
config_path
].
clear
();
/// Definitions of loadable objects may have changed, recreate all of them
...
...
@@ -295,7 +295,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
LOG_WARNING
(
log
,
config_path
<<
": "
+
config_settings
.
external_name
+
" name cannot be empty"
);
continue
;
}
loadable_objects_defined_in_config
[
config_path
].
emplace
(
name
);
if
(
!
loadable_name
.
empty
()
&&
name
!=
loadable_name
)
continue
;
...
...
dbms/src/Storages/StorageFactory.cpp
浏览文件 @
d8ca4345
...
...
@@ -91,7 +91,7 @@ StoragePtr StorageFactory::get(
{
throw
Exception
(
"Engine "
+
name
+
" doesn't support SETTINGS clause. "
"Currently only the MergeTree family of engines and Kafka engine supports it"
,
"Currently only the MergeTree family of engines and Kafka engine supports it"
,
ErrorCodes
::
BAD_ARGUMENTS
);
}
...
...
dbms/src/Storages/StorageMaterializedView.h
浏览文件 @
d8ca4345
...
...
@@ -43,7 +43,6 @@ public:
void
shutdown
()
override
;
void
checkTableCanBeDropped
()
const
override
;
void
checkPartitionCanBeDropped
(
const
ASTPtr
&
partition
)
override
;
BlockInputStreams
read
(
...
...
dbms/src/Storages/StorageMergeTree.cpp
浏览文件 @
d8ca4345
...
...
@@ -131,7 +131,7 @@ void StorageMergeTree::checkTableCanBeDropped() const
void
StorageMergeTree
::
checkPartitionCanBeDropped
(
const
ASTPtr
&
partition
)
{
const_cast
<
MergeTreeData
&>
(
getData
()).
recalculateColumnSizes
();
const
String
partition_id
=
data
.
getPartitionIDFromQuery
(
partition
,
context
);
auto
parts_to_remove
=
data
.
getDataPartsVectorInPartition
(
MergeTreeDataPartState
::
Committed
,
partition_id
);
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
d8ca4345
...
...
@@ -3356,12 +3356,12 @@ void StorageReplicatedMergeTree::checkTableCanBeDropped() const
void
StorageReplicatedMergeTree
::
checkPartitionCanBeDropped
(
const
ASTPtr
&
partition
)
{
const_cast
<
MergeTreeData
&>
(
getData
()).
recalculateColumnSizes
();
const
String
partition_id
=
data
.
getPartitionIDFromQuery
(
partition
,
context
);
auto
parts_to_remove
=
data
.
getDataPartsVectorInPartition
(
MergeTreeDataPartState
::
Committed
,
partition_id
);
UInt64
partition_size
=
0
;
for
(
const
auto
&
part
:
parts_to_remove
)
{
partition_size
+=
part
->
bytes_on_disk
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录