Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
61ae4e55
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,发现更多精彩内容 >>
提交
61ae4e55
编写于
5月 28, 2016
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Using std::shared_ptr for data types [#METR-21503].
上级
bf71e2ed
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
12 addition
and
12 deletion
+12
-12
dbms/src/DataTypes/DataTypeFactory.cpp
dbms/src/DataTypes/DataTypeFactory.cpp
+1
-1
dbms/src/DataTypes/DataTypeNested.cpp
dbms/src/DataTypes/DataTypeNested.cpp
+1
-1
dbms/src/Interpreters/ExpressionAnalyzer.cpp
dbms/src/Interpreters/ExpressionAnalyzer.cpp
+1
-1
dbms/src/Interpreters/InterpreterCreateQuery.cpp
dbms/src/Interpreters/InterpreterCreateQuery.cpp
+3
-3
dbms/src/Interpreters/InterpreterInsertQuery.cpp
dbms/src/Interpreters/InterpreterInsertQuery.cpp
+1
-1
dbms/src/Server/TCPHandler.cpp
dbms/src/Server/TCPHandler.cpp
+1
-1
dbms/src/Storages/tests/merge_tree.cpp
dbms/src/Storages/tests/merge_tree.cpp
+1
-1
dbms/src/TableFunctions/TableFunctionMerge.cpp
dbms/src/TableFunctions/TableFunctionMerge.cpp
+1
-1
dbms/src/TableFunctions/TableFunctionRemote.cpp
dbms/src/TableFunctions/TableFunctionRemote.cpp
+1
-1
dbms/src/TableFunctions/TableFunctionShardByHash.cpp
dbms/src/TableFunctions/TableFunctionShardByHash.cpp
+1
-1
未找到文件。
dbms/src/DataTypes/DataTypeFactory.cpp
浏览文件 @
61ae4e55
...
...
@@ -162,7 +162,7 @@ DataTypePtr DataTypeFactory::get(const String & name) const
ParserNameTypePairList
columns_p
;
ASTPtr
columns_ast
=
parseQuery
(
columns_p
,
parameters
.
data
(),
parameters
.
data
()
+
parameters
.
size
(),
"parameters for data type "
+
name
);
NamesAndTypesListPtr
columns
=
new
NamesAndTypesList
;
NamesAndTypesListPtr
columns
=
std
::
make_shared
<
NamesAndTypesList
>
()
;
ASTExpressionList
&
columns_list
=
typeid_cast
<
ASTExpressionList
&>
(
*
columns_ast
);
for
(
ASTs
::
iterator
it
=
columns_list
.
children
.
begin
();
it
!=
columns_list
.
children
.
end
();
++
it
)
...
...
dbms/src/DataTypes/DataTypeNested.cpp
浏览文件 @
61ae4e55
...
...
@@ -71,7 +71,7 @@ std::string DataTypeNested::getName() const
NamesAndTypesListPtr
DataTypeNested
::
expandNestedColumns
(
const
NamesAndTypesList
&
names_and_types
)
{
NamesAndTypesListPtr
columns
=
new
NamesAndTypesList
;
NamesAndTypesListPtr
columns
=
std
::
make_shared
<
NamesAndTypesList
>
()
;
for
(
NamesAndTypesList
::
const_iterator
it
=
names_and_types
.
begin
();
it
!=
names_and_types
.
end
();
++
it
)
{
if
(
const
DataTypeNested
*
type_nested
=
typeid_cast
<
const
DataTypeNested
*>
(
&*
it
->
type
))
...
...
dbms/src/Interpreters/ExpressionAnalyzer.cpp
浏览文件 @
61ae4e55
...
...
@@ -391,7 +391,7 @@ void ExpressionAnalyzer::addExternalStorage(ASTPtr & subquery_or_table_name)
SharedPtr
<
InterpreterSelectQuery
>
interpreter
=
interpretSubquery
(
subquery_or_table_name
,
context
,
subquery_depth
,
{});
Block
sample
=
interpreter
->
getSampleBlock
();
NamesAndTypesListPtr
columns
=
new
NamesAndTypesList
(
sample
.
getColumnsList
());
NamesAndTypesListPtr
columns
=
std
::
make_shared
<
NamesAndTypesList
>
(
sample
.
getColumnsList
());
StoragePtr
external_storage
=
StorageMemory
::
create
(
external_table_name
,
columns
);
...
...
dbms/src/Interpreters/InterpreterCreateQuery.cpp
浏览文件 @
61ae4e55
...
...
@@ -348,7 +348,7 @@ InterpreterCreateQuery::ColumnsInfo InterpreterCreateQuery::getColumnsInfo(
auto
&&
columns_and_defaults
=
parseColumns
(
columns
,
context
);
res
.
materialized_columns
=
removeAndReturnColumns
(
columns_and_defaults
,
ColumnDefaultType
::
Materialized
);
res
.
alias_columns
=
removeAndReturnColumns
(
columns_and_defaults
,
ColumnDefaultType
::
Alias
);
res
.
columns
=
new
NamesAndTypesList
{
std
::
move
(
columns_and_defaults
.
first
)}
;
res
.
columns
=
std
::
make_shared
<
NamesAndTypesList
>
(
std
::
move
(
columns_and_defaults
.
first
))
;
res
.
column_defaults
=
std
::
move
(
columns_and_defaults
.
second
);
if
(
res
.
columns
->
size
()
+
res
.
materialized_columns
.
size
()
==
0
)
...
...
@@ -369,14 +369,14 @@ InterpreterCreateQuery::ColumnsInfo InterpreterCreateQuery::setColumns(
}
else
if
(
!
create
.
as_table
.
empty
())
{
res
.
columns
=
new
NamesAndTypesList
(
as_storage
->
getColumnsListNonMaterialized
());
res
.
columns
=
std
::
make_shared
<
NamesAndTypesList
>
(
as_storage
->
getColumnsListNonMaterialized
());
res
.
materialized_columns
=
as_storage
->
materialized_columns
;
res
.
alias_columns
=
as_storage
->
alias_columns
;
res
.
column_defaults
=
as_storage
->
column_defaults
;
}
else
if
(
create
.
select
)
{
res
.
columns
=
new
NamesAndTypesList
;
res
.
columns
=
std
::
make_shared
<
NamesAndTypesList
>
()
;
for
(
size_t
i
=
0
;
i
<
as_select_sample
.
columns
();
++
i
)
res
.
columns
->
push_back
(
NameAndTypePair
(
as_select_sample
.
getByPosition
(
i
).
name
,
as_select_sample
.
getByPosition
(
i
).
type
));
}
...
...
dbms/src/Interpreters/InterpreterInsertQuery.cpp
浏览文件 @
61ae4e55
...
...
@@ -76,7 +76,7 @@ BlockIO InterpreterInsertQuery::execute()
auto
table_lock
=
table
->
lockStructure
(
true
);
NamesAndTypesListPtr
required_columns
=
new
NamesAndTypesList
(
table
->
getColumnsList
());
NamesAndTypesListPtr
required_columns
=
std
::
make_shared
<
NamesAndTypesList
>
(
table
->
getColumnsList
());
/// Создаем кортеж из нескольких стримов, в которые будем писать данные.
BlockOutputStreamPtr
out
{
...
...
dbms/src/Server/TCPHandler.cpp
浏览文件 @
61ae4e55
...
...
@@ -588,7 +588,7 @@ bool TCPHandler::receiveData()
/// Если такой таблицы не существовало, создаем ее.
if
(
!
(
storage
=
query_context
.
tryGetExternalTable
(
external_table_name
)))
{
NamesAndTypesListPtr
columns
=
new
NamesAndTypesList
(
block
.
getColumnsList
());
NamesAndTypesListPtr
columns
=
std
::
make_shared
<
NamesAndTypesList
>
(
block
.
getColumnsList
());
storage
=
StorageMemory
::
create
(
external_table_name
,
columns
);
query_context
.
addExternalTable
(
external_table_name
,
storage
);
}
...
...
dbms/src/Storages/tests/merge_tree.cpp
浏览文件 @
61ae4e55
...
...
@@ -29,7 +29,7 @@ int main(int argc, char ** argv)
/// создаём таблицу с парой столбцов
NamesAndTypesListPtr
names_and_types
=
new
NamesAndTypesList
;
NamesAndTypesListPtr
names_and_types
=
std
::
make_shared
<
NamesAndTypesList
>
()
;
names_and_types
->
push_back
(
NameAndTypePair
(
"d"
,
std
::
make_shared
<
DataTypeDate
>
()));
names_and_types
->
push_back
(
NameAndTypePair
(
"a"
,
std
::
make_shared
<
DataTypeArray
>
(
std
::
make_shared
<
DataTypeUInt32
>
())));
...
...
dbms/src/TableFunctions/TableFunctionMerge.cpp
浏览文件 @
61ae4e55
...
...
@@ -76,7 +76,7 @@ StoragePtr TableFunctionMerge::execute(ASTPtr ast_function, Context & context) c
return
StorageMerge
::
create
(
getName
(),
new
NamesAndTypesList
(
chooseColumns
(
source_database
,
table_name_regexp
,
context
)),
std
::
make_shared
<
NamesAndTypesList
>
(
chooseColumns
(
source_database
,
table_name_regexp
,
context
)),
source_database
,
table_name_regexp
,
context
);
...
...
dbms/src/TableFunctions/TableFunctionRemote.cpp
浏览文件 @
61ae4e55
...
...
@@ -267,7 +267,7 @@ StoragePtr TableFunctionRemote::execute(ASTPtr ast_function, Context & context)
return
StorageDistributed
::
create
(
getName
(),
new
NamesAndTypesList
(
getStructureOfRemoteTable
(
*
cluster
,
remote_database
,
remote_table
,
context
)),
std
::
make_shared
<
NamesAndTypesList
>
(
getStructureOfRemoteTable
(
*
cluster
,
remote_database
,
remote_table
,
context
)),
remote_database
,
remote_table
,
cluster
,
...
...
dbms/src/TableFunctions/TableFunctionShardByHash.cpp
浏览文件 @
61ae4e55
...
...
@@ -67,7 +67,7 @@ StoragePtr TableFunctionShardByHash::execute(ASTPtr ast_function, Context & cont
return
StorageDistributed
::
create
(
getName
(),
new
NamesAndTypesList
(
getStructureOfRemoteTable
(
*
shard
,
remote_database
,
remote_table
,
context
)),
std
::
make_shared
<
NamesAndTypesList
>
(
getStructureOfRemoteTable
(
*
shard
,
remote_database
,
remote_table
,
context
)),
remote_database
,
remote_table
,
shard
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录