Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
dcfe6524
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,发现更多精彩内容 >>
提交
dcfe6524
编写于
2月 07, 2020
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix unit tests
上级
f4467aaa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
21 deletion
+24
-21
dbms/src/Common/tests/gtest_global_context.h
dbms/src/Common/tests/gtest_global_context.h
+17
-0
dbms/src/Storages/tests/gtest_storage_log.cpp
dbms/src/Storages/tests/gtest_storage_log.cpp
+5
-19
dbms/src/Storages/tests/gtest_transform_query_for_external_database.cpp
...ges/tests/gtest_transform_query_for_external_database.cpp
+2
-2
未找到文件。
dbms/src/Common/tests/gtest_global_context.h
0 → 100644
浏览文件 @
dcfe6524
#pragma once
#include <Interpreters/Context.h>
inline
DB
::
Context
createContext
()
{
auto
context
=
DB
::
Context
::
createGlobal
();
context
.
makeGlobalContext
();
context
.
setPath
(
"./"
);
return
context
;
}
inline
const
DB
::
Context
&
getContext
()
{
static
DB
::
Context
global_context
=
createContext
();
return
global_context
;
}
dbms/src/Storages/tests/gtest_storage_log.cpp
浏览文件 @
dcfe6524
...
...
@@ -12,6 +12,7 @@
#include <Interpreters/Context.h>
#include <Storages/StorageLog.h>
#include <Common/typeid_cast.h>
#include <Common/tests/gtest_global_context.h>
#include <memory>
...
...
@@ -20,13 +21,6 @@
# pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
DB
::
Context
createContext
()
{
auto
context
=
DB
::
Context
::
createGlobal
();
context
.
makeGlobalContext
();
context
.
setPath
(
"./"
);
return
context
;
}
DB
::
StoragePtr
createStorage
(
DB
::
DiskPtr
&
disk
)
{
...
...
@@ -43,18 +37,10 @@ DB::StoragePtr createStorage(DB::DiskPtr & disk)
return
table
;
}
std
::
unique_ptr
<
DB
::
Context
>
context
;
template
<
typename
T
>
class
StorageLogTest
:
public
testing
::
Test
{
public:
static
void
SetUpTestSuite
()
{
// Create context only once.
if
(
!
context
)
context
=
std
::
make_unique
<
DB
::
Context
>
(
createContext
());
}
void
SetUp
()
override
{
...
...
@@ -109,7 +95,7 @@ std::string writeData(int rows, DB::StoragePtr & table)
block
.
insert
(
column
);
}
BlockOutputStreamPtr
out
=
table
->
write
({},
*
context
);
BlockOutputStreamPtr
out
=
table
->
write
({},
getContext
()
);
out
->
write
(
block
);
return
data
;
...
...
@@ -123,9 +109,9 @@ std::string readData(DB::StoragePtr & table)
Names
column_names
;
column_names
.
push_back
(
"a"
);
QueryProcessingStage
::
Enum
stage
=
table
->
getQueryProcessingStage
(
*
context
);
QueryProcessingStage
::
Enum
stage
=
table
->
getQueryProcessingStage
(
getContext
()
);
BlockInputStreamPtr
in
=
table
->
read
(
column_names
,
{},
*
context
,
stage
,
8192
,
1
)[
0
];
BlockInputStreamPtr
in
=
table
->
read
(
column_names
,
{},
getContext
()
,
stage
,
8192
,
1
)[
0
];
Block
sample
;
{
...
...
@@ -136,7 +122,7 @@ std::string readData(DB::StoragePtr & table)
std
::
ostringstream
ss
;
WriteBufferFromOStream
out_buf
(
ss
);
BlockOutputStreamPtr
output
=
FormatFactory
::
instance
().
getOutput
(
"Values"
,
out_buf
,
sample
,
*
context
);
BlockOutputStreamPtr
output
=
FormatFactory
::
instance
().
getOutput
(
"Values"
,
out_buf
,
sample
,
getContext
()
);
copyData
(
*
in
,
*
output
);
...
...
dbms/src/Storages/tests/gtest_transform_query_for_external_database.cpp
浏览文件 @
dcfe6524
...
...
@@ -9,6 +9,7 @@
#include <Databases/DatabaseMemory.h>
#include <Storages/StorageMemory.h>
#include <Functions/registerFunctions.h>
#include <Common/tests/gtest_global_context.h>
using
namespace
DB
;
...
...
@@ -17,7 +18,7 @@ using namespace DB;
/// NOTE How to do better?
struct
State
{
Context
context
{
Context
::
createGlobal
()}
;
Context
context
=
getContext
()
;
NamesAndTypesList
columns
{
{
"column"
,
std
::
make_shared
<
DataTypeUInt8
>
()},
{
"apply_id"
,
std
::
make_shared
<
DataTypeUInt64
>
()},
...
...
@@ -31,7 +32,6 @@ struct State
registerFunctions
();
DatabasePtr
database
=
std
::
make_shared
<
DatabaseMemory
>
(
"test"
);
database
->
attachTable
(
"table"
,
StorageMemory
::
create
(
StorageID
(
"test"
,
"table"
),
ColumnsDescription
{
columns
},
ConstraintsDescription
{}));
context
.
makeGlobalContext
();
context
.
addDatabase
(
"test"
,
database
);
context
.
setCurrentDatabase
(
"test"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录