Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
kvdb
rocksdb
提交
db68a2c0
R
rocksdb
项目概览
kvdb
/
rocksdb
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rocksdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
db68a2c0
编写于
11月 02, 2015
作者:
I
Igor Canadi
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #806 from yuslepukhin/signed_unsigned_warning
Do not suppress C4018 'expression' : signed/unsigned mismatch
上级
ff4499e2
eaaf081d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
CMakeLists.txt
CMakeLists.txt
+2
-2
db/db_test.cc
db/db_test.cc
+9
-9
未找到文件。
CMakeLists.txt
浏览文件 @
db68a2c0
...
...
@@ -58,7 +58,7 @@ add_custom_command(OUTPUT ${BUILD_VERSION_CC}
add_custom_target
(
GenerateBuildVersion DEPENDS
${
BUILD_VERSION_CC
}
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/FC /d2Zi+ /W3 /WX /wd4
018 /wd4
100 /wd4101 /wd4127 /wd4189 /wd4200 /wd4244 /wd4267 /wd4296 /wd4305 /wd4307 /wd4309 /wd4512 /wd4701 /wd4702 /wd4800 /wd4804 /wd4996"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/FC /d2Zi+ /W3 /WX /wd4100 /wd4101 /wd4127 /wd4189 /wd4200 /wd4244 /wd4267 /wd4296 /wd4305 /wd4307 /wd4309 /wd4512 /wd4701 /wd4702 /wd4800 /wd4804 /wd4996"
)
# Used to run CI build and tests so we can run faster
set
(
OPTIMIZE_DEBUG_DEFAULT 0
)
# Debug build is unoptimized by default use -DOPTDBG=1 to optimize
...
...
@@ -230,7 +230,6 @@ set(SOURCES
util/thread_local.cc
util/thread_status_impl.cc
util/thread_status_updater.cc
util/thread_status_updater_debug.cc
util/thread_status_util.cc
util/thread_status_util_debug.cc
util/vectorrep.cc
...
...
@@ -268,6 +267,7 @@ set(SOURCES
# and linked to tests. Add test only code that is not #ifdefed for Release here.
set
(
TESTUTIL_SOURCE
db/db_test_util.cc
util/thread_status_updater_debug.cc
)
add_library
(
rocksdblib
${
ARTIFACT_SUFFIX
}
${
SOURCES
}
)
...
...
db/db_test.cc
浏览文件 @
db68a2c0
...
...
@@ -788,10 +788,10 @@ TEST_F(DBTest, GetUserDefinedTableProperties) {
}
ASSERT_EQ
(
10u
+
11u
+
12u
+
13u
,
sum
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
collector_factory
->
num_created_
=
0
;
dbfull
()
->
TEST_CompactRange
(
0
,
nullptr
,
nullptr
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
}
#endif // ROCKSDB_LITE
...
...
@@ -811,7 +811,7 @@ TEST_F(DBTest, UserDefinedTablePropertiesContext) {
}
Flush
(
1
);
}
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
collector_factory
->
num_created_
=
0
;
// Trigger automatic compactions.
...
...
@@ -822,11 +822,11 @@ TEST_F(DBTest, UserDefinedTablePropertiesContext) {
Flush
(
1
);
dbfull
()
->
TEST_WaitForCompact
();
}
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
collector_factory
->
num_created_
=
0
;
dbfull
()
->
TEST_CompactRange
(
0
,
nullptr
,
nullptr
,
handles_
[
1
]);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
// Come back to write to default column family
collector_factory
->
num_created_
=
0
;
...
...
@@ -838,7 +838,7 @@ TEST_F(DBTest, UserDefinedTablePropertiesContext) {
}
Flush
();
}
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
collector_factory
->
num_created_
=
0
;
// Trigger automatic compactions.
...
...
@@ -849,11 +849,11 @@ TEST_F(DBTest, UserDefinedTablePropertiesContext) {
Flush
();
dbfull
()
->
TEST_WaitForCompact
();
}
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
collector_factory
->
num_created_
=
0
;
dbfull
()
->
TEST_CompactRange
(
0
,
nullptr
,
nullptr
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
);
ASSERT_GT
(
collector_factory
->
num_created_
,
0
U
);
}
#ifndef ROCKSDB_LITE
...
...
@@ -5140,7 +5140,7 @@ class RecoveryTestHelper {
// Overwrite data with 'a' from offset for length len
static
void
InduceCorruption
(
const
std
::
string
&
filename
,
uint32_t
offset
,
uint32_t
len
)
{
ASSERT_GT
(
len
,
0
);
ASSERT_GT
(
len
,
0
U
);
int
fd
=
open
(
filename
.
c_str
(),
O_RDWR
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录