Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
651f5b0e
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,发现更多精彩内容 >>
提交
651f5b0e
编写于
9月 18, 2019
作者:
C
CurtizJ
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merging with master
上级
79a08ef8
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
2 addition
and
9 deletion
+2
-9
dbms/src/Common/ErrorCodes.cpp
dbms/src/Common/ErrorCodes.cpp
+1
-4
dbms/tests/integration/helpers/cluster.py
dbms/tests/integration/helpers/cluster.py
+1
-5
未找到文件。
dbms/src/Common/ErrorCodes.cpp
浏览文件 @
651f5b0e
...
...
@@ -451,16 +451,13 @@ namespace ErrorCodes
extern
const
int
INVALID_TEMPLATE_FORMAT
=
474
;
extern
const
int
INVALID_WITH_FILL_EXPRESSION
=
475
;
extern
const
int
WITH_TIES_WITHOUT_ORDER_BY
=
476
;
<<<<<<<
HEAD
extern
const
int
INTERNAL_REDIS_ERROR
=
477
;
=======
extern
const
int
INVALID_USAGE_OF_INPUT
=
477
;
extern
const
int
UNKNOWN_POLICY
=
478
;
extern
const
int
UNKNOWN_DISK
=
479
;
extern
const
int
UNKNOWN_PROTOCOL
=
480
;
extern
const
int
PATH_ACCESS_DENIED
=
481
;
extern
const
int
DICTIONARY_ACCESS_DENIED
=
482
;
>>>>>>>
upstream
/
master
extern
const
int
INTERNAL_REDIS_ERROR
=
483
;
extern
const
int
KEEPER_EXCEPTION
=
999
;
extern
const
int
POCO_EXCEPTION
=
1000
;
...
...
dbms/tests/integration/helpers/cluster.py
浏览文件 @
651f5b0e
...
...
@@ -115,11 +115,7 @@ class ClickHouseCluster:
cmd
+=
" client"
return
cmd
<<<<<<<
HEAD
def
add_instance
(
self
,
name
,
config_dir
=
None
,
main_configs
=
[],
user_configs
=
[],
macros
=
{},
with_zookeeper
=
False
,
with_mysql
=
False
,
with_kafka
=
False
,
clickhouse_path_dir
=
None
,
with_odbc_drivers
=
False
,
with_postgres
=
False
,
with_hdfs
=
False
,
with_mongo
=
False
,
with_redis
=
False
,
hostname
=
None
,
env_variables
=
{},
image
=
"yandex/clickhouse-integration-test"
,
stay_alive
=
False
,
ipv4_address
=
None
,
ipv6_address
=
None
,
with_installed_binary
=
False
):
=======
def
add_instance
(
self
,
name
,
config_dir
=
None
,
main_configs
=
[],
user_configs
=
[],
macros
=
{},
with_zookeeper
=
False
,
with_mysql
=
False
,
with_kafka
=
False
,
clickhouse_path_dir
=
None
,
with_odbc_drivers
=
False
,
with_postgres
=
False
,
with_hdfs
=
False
,
with_mongo
=
False
,
hostname
=
None
,
env_variables
=
{},
image
=
"yandex/clickhouse-integration-test"
,
stay_alive
=
False
,
ipv4_address
=
None
,
ipv6_address
=
None
,
with_installed_binary
=
False
,
tmpfs
=
[]):
>>>>>>>
upstream
/
master
def
add_instance
(
self
,
name
,
config_dir
=
None
,
main_configs
=
[],
user_configs
=
[],
macros
=
{},
with_zookeeper
=
False
,
with_mysql
=
False
,
with_kafka
=
False
,
clickhouse_path_dir
=
None
,
with_odbc_drivers
=
False
,
with_postgres
=
False
,
with_hdfs
=
False
,
with_mongo
=
False
,
with_redis
=
False
,
hostname
=
None
,
env_variables
=
{},
image
=
"yandex/clickhouse-integration-test"
,
stay_alive
=
False
,
ipv4_address
=
None
,
ipv6_address
=
None
,
with_installed_binary
=
False
,
tmpfs
=
[]):
"""Add an instance to the cluster.
name - the name of the instance directory and the value of the 'instance' macro in ClickHouse.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录