Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
kvdb
rocksdb
提交
5356b2a6
R
rocksdb
项目概览
kvdb
/
rocksdb
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
5356b2a6
编写于
1月 24, 2014
作者:
I
Igor Canadi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into columnfamilies
上级
6a404de4
04afa321
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
37 addition
and
15 deletion
+37
-15
db/compaction_picker.cc
db/compaction_picker.cc
+2
-0
db/db_bench.cc
db/db_bench.cc
+2
-0
db/db_test.cc
db/db_test.cc
+2
-0
db/prefix_filter_iterator.h
db/prefix_filter_iterator.h
+2
-0
db/skiplist.h
db/skiplist.h
+1
-0
db/tailing_iter.cc
db/tailing_iter.cc
+2
-0
db/version_set.cc
db/version_set.cc
+4
-1
include/rocksdb/memtablerep.h
include/rocksdb/memtablerep.h
+4
-3
include/rocksdb/options.h
include/rocksdb/options.h
+5
-5
include/rocksdb/universal_compaction.h
include/rocksdb/universal_compaction.h
+0
-6
tools/db_stress.cc
tools/db_stress.cc
+2
-0
util/coding.cc
util/coding.cc
+4
-0
util/coding.h
util/coding.h
+2
-0
util/options.cc
util/options.cc
+4
-0
utilities/backupable/backupable_db.cc
utilities/backupable/backupable_db.cc
+1
-0
未找到文件。
db/compaction_picker.cc
浏览文件 @
5356b2a6
...
...
@@ -8,6 +8,8 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker.h"
#include <limits>
#include "util/statistics.h"
namespace
rocksdb
{
...
...
db/db_bench.cc
浏览文件 @
5356b2a6
...
...
@@ -21,6 +21,8 @@
#include "rocksdb/env.h"
#include "rocksdb/memtablerep.h"
#include "rocksdb/write_batch.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h"
#include "port/port.h"
#include "util/bit_set.h"
...
...
db/db_test.cc
浏览文件 @
5356b2a6
...
...
@@ -21,6 +21,8 @@
#include "rocksdb/cache.h"
#include "rocksdb/compaction_filter.h"
#include "rocksdb/env.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table.h"
#include "util/hash.h"
#include "util/logging.h"
...
...
db/prefix_filter_iterator.h
浏览文件 @
5356b2a6
...
...
@@ -12,6 +12,8 @@
#pragma once
#include "rocksdb/iterator.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace
rocksdb
{
...
...
db/skiplist.h
浏览文件 @
5356b2a6
...
...
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include "port/port.h"
#include "util/random.h"
#include "rocksdb/arena.h"
namespace
rocksdb
{
...
...
db/tailing_iter.cc
浏览文件 @
5356b2a6
...
...
@@ -8,6 +8,8 @@
#include <string>
#include <utility>
#include "db/db_impl.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace
rocksdb
{
...
...
db/version_set.cc
浏览文件 @
5356b2a6
...
...
@@ -1925,8 +1925,11 @@ Status VersionSet::ReduceNumberOfLevels(const std::string& dbname,
}
std
::
vector
<
FileMetaData
*>*
old_files_list
=
current_version
->
files_
;
// we need to allocate an array with the old number of levels size to
// avoid SIGSEGV in WriteSnapshot()
// however, all levels bigger or equal to new_levels will be empty
std
::
vector
<
FileMetaData
*>*
new_files_list
=
new
std
::
vector
<
FileMetaData
*>
[
new
_levels
];
new
std
::
vector
<
FileMetaData
*>
[
current
_levels
];
for
(
int
i
=
0
;
i
<
new_levels
-
1
;
i
++
)
{
new_files_list
[
i
]
=
old_files_list
[
i
];
}
...
...
include/rocksdb/memtablerep.h
浏览文件 @
5356b2a6
...
...
@@ -37,12 +37,13 @@
#define STORAGE_ROCKSDB_DB_MEMTABLEREP_H_
#include <memory>
#include "rocksdb/arena.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace
rocksdb
{
class
Arena
;
class
Slice
;
class
SliceTransform
;
class
MemTableRep
{
public:
// KeyComparator provides a means to compare keys, which are internal keys
...
...
include/rocksdb/options.h
浏览文件 @
5356b2a6
...
...
@@ -15,11 +15,6 @@
#include <vector>
#include <stdint.h>
#include "rocksdb/memtablerep.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h"
#include "rocksdb/table_properties.h"
#include "rocksdb/universal_compaction.h"
namespace
rocksdb
{
...
...
@@ -34,6 +29,11 @@ class Logger;
class
MergeOperator
;
class
Snapshot
;
class
TableFactory
;
class
MemTableRepFactory
;
class
TablePropertiesCollector
;
class
Slice
;
class
SliceTransform
;
class
Statistics
;
using
std
::
shared_ptr
;
...
...
include/rocksdb/universal_compaction.h
浏览文件 @
5356b2a6
...
...
@@ -6,14 +6,8 @@
#ifndef STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H
#define STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H
#include <stddef.h>
#include <string>
#include <memory>
#include <vector>
#include <stdint.h>
#include <climits>
#include "rocksdb/slice.h"
#include "rocksdb/statistics.h"
namespace
rocksdb
{
...
...
tools/db_stress.cc
浏览文件 @
5356b2a6
...
...
@@ -31,6 +31,8 @@
#include "utilities/utility_db.h"
#include "rocksdb/env.h"
#include "rocksdb/write_batch.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h"
#include "port/port.h"
#include "util/coding.h"
...
...
util/coding.cc
浏览文件 @
5356b2a6
...
...
@@ -9,6 +9,10 @@
#include "util/coding.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include <algorithm>
namespace
rocksdb
{
...
...
util/coding.h
浏览文件 @
5356b2a6
...
...
@@ -16,6 +16,8 @@
#include <stdint.h>
#include <string.h>
#include <string>
#include "rocksdb/write_batch.h"
#include "port/port.h"
namespace
rocksdb
{
...
...
util/options.cc
浏览文件 @
5356b2a6
...
...
@@ -17,6 +17,10 @@
#include "rocksdb/env.h"
#include "rocksdb/filter_policy.h"
#include "rocksdb/merge_operator.h"
#include "rocksdb/memtablerep.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table_properties.h"
#include "table/block_based_table_factory.h"
namespace
rocksdb
{
...
...
utilities/backupable/backupable_db.cc
浏览文件 @
5356b2a6
...
...
@@ -21,6 +21,7 @@
#include <string>
#include <limits>
#include <atomic>
#include <unordered_map>
namespace
rocksdb
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录