Fix some lint warnings

main
Igor Canadi 11 years ago
parent fa99d53e55
commit 514e42c7cc
  1. 2
      db/version_edit.cc
  2. 1
      db/version_edit.h
  3. 1
      db/version_set.cc
  4. 2
      db/write_batch.cc
  5. 6
      include/rocksdb/column_family.h

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

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

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

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

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

Loading…
Cancel
Save