Commit 514e42c 1 parent fa99d53 commit 514e42c Copy full SHA for 514e42c
File tree 5 files changed +7
-5
lines changed
5 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ enum Tag {
31
31
// these are new formats divergent from open source leveldb
32
32
kNewFile2 = 100 , // store smallest & largest seqno
33
33
34
- kColumnFamily = 200 , // specify column family for version edit
34
+ kColumnFamily = 200 , // specify column family for version edit
35
35
kColumnFamilyAdd = 201 ,
36
36
kColumnFamilyDrop = 202 ,
37
37
};
Original file line number Diff line number Diff line change 11
11
#include < set>
12
12
#include < utility>
13
13
#include < vector>
14
+ #include < string>
14
15
#include " db/dbformat.h"
15
16
16
17
namespace rocksdb {
Original file line number Diff line number Diff line change 11
11
12
12
#include < algorithm>
13
13
#include < map>
14
+ #include < set>
14
15
#include < climits>
15
16
#include < stdio.h>
16
17
#include " db/filename.h"
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ Status WriteBatch::Iterate(Handler* handler) const {
92
92
while (!input.empty () && handler->Continue ()) {
93
93
char tag = input[0 ];
94
94
input.remove_prefix (1 );
95
- uint32_t column_family = 0 ; // default
95
+ uint32_t column_family = 0 ; // default
96
96
switch (tag) {
97
97
case kTypeColumnFamilyValue :
98
98
if (!GetVarint32 (&input, &column_family)) {
Original file line number Diff line number Diff line change 8
8
9
9
#pragma once
10
10
#include " rocksdb/slice.h"
11
+ #include < string>
11
12
12
13
namespace rocksdb {
13
14
@@ -21,11 +22,10 @@ struct ColumnFamilyHandle {
21
22
uint32_t id;
22
23
// default
23
24
ColumnFamilyHandle () : id() {}
24
- /* implicit */
25
- ColumnFamilyHandle (uint32_t _id) : id(_id) {}
25
+ explicit ColumnFamilyHandle (uint32_t _id) : id(_id) {}
26
26
};
27
27
28
28
const ColumnFamilyHandle default_column_family = ColumnFamilyHandle();
29
29
extern const std::string default_column_family_name;
30
30
31
- }
31
+ } // namespace rocksdb
You can’t perform that action at this time.
0 commit comments