Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
254d55f2
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,发现更多精彩内容 >>
提交
254d55f2
编写于
6月 01, 2020
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better method name
上级
663e92b1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
6 deletion
+6
-6
src/Interpreters/InterpreterCreateQuery.cpp
src/Interpreters/InterpreterCreateQuery.cpp
+1
-1
src/Storages/AlterCommands.cpp
src/Storages/AlterCommands.cpp
+1
-1
src/Storages/IndicesDescription.cpp
src/Storages/IndicesDescription.cpp
+2
-2
src/Storages/IndicesDescription.h
src/Storages/IndicesDescription.h
+1
-1
src/Storages/MergeTree/registerStorageMergeTree.cpp
src/Storages/MergeTree/registerStorageMergeTree.cpp
+1
-1
未找到文件。
src/Interpreters/InterpreterCreateQuery.cpp
浏览文件 @
254d55f2
...
@@ -401,7 +401,7 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
...
@@ -401,7 +401,7 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
if
(
create
.
columns_list
->
indices
)
if
(
create
.
columns_list
->
indices
)
for
(
const
auto
&
index
:
create
.
columns_list
->
indices
->
children
)
for
(
const
auto
&
index
:
create
.
columns_list
->
indices
->
children
)
properties
.
indices
.
push_back
(
properties
.
indices
.
push_back
(
IndexDescription
::
get
Skip
IndexFromAST
(
index
->
clone
(),
properties
.
columns
,
context
));
IndexDescription
::
getIndexFromAST
(
index
->
clone
(),
properties
.
columns
,
context
));
properties
.
constraints
=
getConstraintsDescription
(
create
.
columns_list
->
constraints
);
properties
.
constraints
=
getConstraintsDescription
(
create
.
columns_list
->
constraints
);
}
}
...
...
src/Storages/AlterCommands.cpp
浏览文件 @
254d55f2
...
@@ -365,7 +365,7 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & con
...
@@ -365,7 +365,7 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & con
++
insert_it
;
++
insert_it
;
}
}
metadata
.
indices
.
emplace
(
insert_it
,
IndexDescription
::
get
Skip
IndexFromAST
(
index_decl
,
metadata
.
columns
,
context
));
metadata
.
indices
.
emplace
(
insert_it
,
IndexDescription
::
getIndexFromAST
(
index_decl
,
metadata
.
columns
,
context
));
}
}
else
if
(
type
==
DROP_INDEX
)
else
if
(
type
==
DROP_INDEX
)
{
{
...
...
src/Storages/IndicesDescription.cpp
浏览文件 @
254d55f2
...
@@ -20,7 +20,7 @@ namespace ErrorCodes
...
@@ -20,7 +20,7 @@ namespace ErrorCodes
};
};
IndexDescription
IndexDescription
::
get
Skip
IndexFromAST
(
const
ASTPtr
&
definition_ast
,
const
ColumnsDescription
&
columns
,
const
Context
&
context
)
IndexDescription
IndexDescription
::
getIndexFromAST
(
const
ASTPtr
&
definition_ast
,
const
ColumnsDescription
&
columns
,
const
Context
&
context
)
{
{
const
auto
*
index_definition
=
definition_ast
->
as
<
ASTIndexDeclaration
>
();
const
auto
*
index_definition
=
definition_ast
->
as
<
ASTIndexDeclaration
>
();
if
(
!
index_definition
)
if
(
!
index_definition
)
...
@@ -103,7 +103,7 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
...
@@ -103,7 +103,7 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
ASTPtr
list
=
parseQuery
(
parser
,
str
,
0
,
DBMS_DEFAULT_MAX_PARSER_DEPTH
);
ASTPtr
list
=
parseQuery
(
parser
,
str
,
0
,
DBMS_DEFAULT_MAX_PARSER_DEPTH
);
for
(
const
auto
&
index
:
list
->
children
)
for
(
const
auto
&
index
:
list
->
children
)
result
.
emplace_back
(
IndexDescription
::
get
Skip
IndexFromAST
(
index
,
columns
,
context
));
result
.
emplace_back
(
IndexDescription
::
getIndexFromAST
(
index
,
columns
,
context
));
return
result
;
return
result
;
}
}
...
...
src/Storages/IndicesDescription.h
浏览文件 @
254d55f2
...
@@ -47,7 +47,7 @@ struct IndexDescription
...
@@ -47,7 +47,7 @@ struct IndexDescription
size_t
granularity
;
size_t
granularity
;
/// Parse index from definition AST
/// Parse index from definition AST
static
IndexDescription
get
Skip
IndexFromAST
(
const
ASTPtr
&
definition_ast
,
const
ColumnsDescription
&
columns
,
const
Context
&
context
);
static
IndexDescription
getIndexFromAST
(
const
ASTPtr
&
definition_ast
,
const
ColumnsDescription
&
columns
,
const
Context
&
context
);
};
};
/// All non-primary indicies for storage
/// All non-primary indicies for storage
...
...
src/Storages/MergeTree/registerStorageMergeTree.cpp
浏览文件 @
254d55f2
...
@@ -607,7 +607,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
...
@@ -607,7 +607,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
if
(
args
.
query
.
columns_list
&&
args
.
query
.
columns_list
->
indices
)
if
(
args
.
query
.
columns_list
&&
args
.
query
.
columns_list
->
indices
)
for
(
auto
&
index
:
args
.
query
.
columns_list
->
indices
->
children
)
for
(
auto
&
index
:
args
.
query
.
columns_list
->
indices
->
children
)
indices_description
.
push_back
(
IndexDescription
::
get
Skip
IndexFromAST
(
index
,
args
.
columns
,
args
.
context
));
indices_description
.
push_back
(
IndexDescription
::
getIndexFromAST
(
index
,
args
.
columns
,
args
.
context
));
storage_settings
->
loadFromQuery
(
*
args
.
storage_def
);
storage_settings
->
loadFromQuery
(
*
args
.
storage_def
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录