Fix some lint warnings

This commit is contained in:
Igor Canadi 2014-01-29 15:26:43 -08:00
parent fa99d53e55
commit 514e42c7cc
5 changed files with 7 additions and 5 deletions

View File

@ -31,7 +31,7 @@ enum Tag {
// these are new formats divergent from open source leveldb
kNewFile2 = 100, // store smallest & largest seqno
kColumnFamily = 200, // specify column family for version edit
kColumnFamily = 200, // specify column family for version edit
kColumnFamilyAdd = 201,
kColumnFamilyDrop = 202,
};

View File

@ -11,6 +11,7 @@
#include <set>
#include <utility>
#include <vector>
#include <string>
#include "db/dbformat.h"
namespace rocksdb {

View File

@ -11,6 +11,7 @@
#include <algorithm>
#include <map>
#include <set>
#include <climits>
#include <stdio.h>
#include "db/filename.h"

View File

@ -92,7 +92,7 @@ Status WriteBatch::Iterate(Handler* handler) const {
while (!input.empty() && handler->Continue()) {
char tag = input[0];
input.remove_prefix(1);
uint32_t column_family = 0; // default
uint32_t column_family = 0; // default
switch (tag) {
case kTypeColumnFamilyValue:
if (!GetVarint32(&input, &column_family)) {

View File

@ -8,6 +8,7 @@
#pragma once
#include "rocksdb/slice.h"
#include <string>
namespace rocksdb {
@ -21,11 +22,10 @@ struct ColumnFamilyHandle {
uint32_t id;
// default
ColumnFamilyHandle() : id() {}
/* implicit */
ColumnFamilyHandle(uint32_t _id) : id(_id) {}
explicit ColumnFamilyHandle(uint32_t _id) : id(_id) {}
};
const ColumnFamilyHandle default_column_family = ColumnFamilyHandle();
extern const std::string default_column_family_name;
}
} // namespace rocksdb