Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
2647d4ca
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,发现更多精彩内容 >>
提交
2647d4ca
编写于
8月 30, 2019
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename immutable to readonly
上级
6f30338c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
7 deletion
+7
-7
dbms/src/Common/ErrorCodes.cpp
dbms/src/Common/ErrorCodes.cpp
+1
-1
dbms/src/Storages/Kafka/StorageKafka.cpp
dbms/src/Storages/Kafka/StorageKafka.cpp
+2
-2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+3
-3
dbms/src/Storages/MergeTree/MergeTreeSettings.h
dbms/src/Storages/MergeTree/MergeTreeSettings.h
+1
-1
未找到文件。
dbms/src/Common/ErrorCodes.cpp
浏览文件 @
2647d4ca
...
...
@@ -446,7 +446,7 @@ namespace ErrorCodes
extern
const
int
VIOLATED_CONSTRAINT
=
469
;
extern
const
int
QUERY_IS_NOT_SUPPORTED_IN_LIVE_VIEW
=
470
;
extern
const
int
SETTINGS_ARE_NOT_SUPPORTED
=
471
;
extern
const
int
IMMUTABLE
_SETTING
=
472
;
extern
const
int
READONLY
_SETTING
=
472
;
extern
const
int
KEEPER_EXCEPTION
=
999
;
extern
const
int
POCO_EXCEPTION
=
1000
;
...
...
dbms/src/Storages/Kafka/StorageKafka.cpp
浏览文件 @
2647d4ca
...
...
@@ -45,7 +45,7 @@ namespace ErrorCodes
extern
const
int
NUMBER_OF_ARGUMENTS_DOESNT_MATCH
;
extern
const
int
UNSUPPORTED_METHOD
;
extern
const
int
UNKNOWN_SETTING
;
extern
const
int
IMMUTABLE
_SETTING
;
extern
const
int
READONLY
_SETTING
;
}
namespace
...
...
@@ -417,7 +417,7 @@ void StorageKafka::checkSetting(const String & setting_name) const
if
(
KafkaSettings
::
findIndex
(
setting_name
)
==
KafkaSettings
::
npos
)
throw
Exception
{
"Storage '"
+
getName
()
+
"' doesn't have setting '"
+
setting_name
+
"'"
,
ErrorCodes
::
UNKNOWN_SETTING
};
throw
Exception
{
"Setting '"
+
setting_name
+
"' is
immutable for storage '"
+
getName
()
+
"'"
,
ErrorCodes
::
IMMUTABLE
_SETTING
};
throw
Exception
{
"Setting '"
+
setting_name
+
"' is
readonly for storage '"
+
getName
()
+
"'"
,
ErrorCodes
::
READONLY
_SETTING
};
}
void
registerStorageKafka
(
StorageFactory
&
factory
)
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
2647d4ca
...
...
@@ -91,7 +91,7 @@ namespace ErrorCodes
extern
const
int
INCORRECT_FILE_NAME
;
extern
const
int
BAD_DATA_PART_NAME
;
extern
const
int
UNKNOWN_SETTING
;
extern
const
int
IMMUTABLE
_SETTING
;
extern
const
int
READONLY
_SETTING
;
}
...
...
@@ -1661,8 +1661,8 @@ void MergeTreeData::checkSetting(const String & setting_name) const
{
if
(
MergeTreeSettings
::
findIndex
(
setting_name
)
==
MergeTreeSettings
::
npos
)
throw
Exception
{
"Storage '"
+
getName
()
+
"' doesn't have setting '"
+
setting_name
+
"'"
,
ErrorCodes
::
UNKNOWN_SETTING
};
if
(
MergeTreeSettings
::
is
Immutable
Setting
(
setting_name
))
throw
Exception
{
"Setting '"
+
setting_name
+
"' is
immutable for storage '"
+
getName
()
+
"'"
,
ErrorCodes
::
IMMUTABLE
_SETTING
};
if
(
MergeTreeSettings
::
is
Readonly
Setting
(
setting_name
))
throw
Exception
{
"Setting '"
+
setting_name
+
"' is
readonly for storage '"
+
getName
()
+
"'"
,
ErrorCodes
::
READONLY
_SETTING
};
}
...
...
dbms/src/Storages/MergeTree/MergeTreeSettings.h
浏览文件 @
2647d4ca
...
...
@@ -101,7 +101,7 @@ struct MergeTreeSettings : public SettingsCollection<MergeTreeSettings>
void
loadFromQuery
(
ASTStorage
&
storage_def
);
/// We check settings after storage creation
static
bool
is
Immutable
Setting
(
const
String
&
name
)
static
bool
is
Readonly
Setting
(
const
String
&
name
)
{
return
name
==
"index_granularity"
||
name
==
"index_granularity_bytes"
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录