Remove obsolete namespace mappings.

Summary:
The previous release 2.4 had a mapping to alias the older
namespace to rocksdb. This mapping is not needed in the new
release.

Test Plan:
make check
make release

Reviewers: emayanke

Reviewed By: emayanke

CC: leveldb

Differential Revision: https://reviews.facebook.net/D13359
main
Dhruba Borthakur 11 years ago
parent cbf4a06427
commit 3c37955a2f
  1. 2
      include/rocksdb/arena.h
  2. 2
      include/rocksdb/cache.h
  3. 2
      include/rocksdb/compaction_filter.h
  4. 2
      include/rocksdb/comparator.h
  5. 2
      include/rocksdb/db.h
  6. 2
      include/rocksdb/env.h
  7. 1
      include/rocksdb/filter_policy.h
  8. 2
      include/rocksdb/iterator.h
  9. 2
      include/rocksdb/ldb_tool.h
  10. 2
      include/rocksdb/memtablerep.h
  11. 4
      include/rocksdb/merge_operator.h
  12. 2
      include/rocksdb/options.h
  13. 2
      include/rocksdb/perf_context.h
  14. 9
      include/rocksdb/rocksdb_to_leveldb.h
  15. 2
      include/rocksdb/slice.h
  16. 2
      include/rocksdb/slice_transform.h
  17. 2
      include/rocksdb/statistics.h
  18. 2
      include/rocksdb/status.h
  19. 2
      include/rocksdb/table_builder.h
  20. 2
      include/rocksdb/transaction_log.h
  21. 2
      include/rocksdb/types.h
  22. 2
      include/rocksdb/universal_compaction.h
  23. 2
      include/rocksdb/write_batch.h

@ -38,6 +38,4 @@ class Arena {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_ARENA_H_

@ -103,6 +103,4 @@ class Cache {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_UTIL_CACHE_H_

@ -68,6 +68,4 @@ class DefaultCompactionFilterFactory : public CompactionFilterFactory {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_COMPACTION_FILTER_H_

@ -60,6 +60,4 @@ extern const Comparator* BytewiseComparator();
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_COMPARATOR_H_

@ -308,6 +308,4 @@ Status RepairDB(const std::string& dbname, const Options& options);
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_DB_H_

@ -565,6 +565,4 @@ class EnvWrapper : public Env {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_ENV_H_

@ -66,6 +66,5 @@ class FilterPolicy {
extern const FilterPolicy* NewBloomFilterPolicy(int bits_per_key);
}
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_FILTER_POLICY_H_

@ -99,6 +99,4 @@ extern Iterator* NewErrorIterator(const Status& status);
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_

@ -12,6 +12,4 @@ class LDBTool {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H

@ -256,6 +256,4 @@ public:
}
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_DB_MEMTABLEREP_H_

@ -7,7 +7,7 @@
#include <string>
#include <deque>
#include "rocksdb/slice.h" // TODO: Remove this when migration is done;
#include "rocksdb/slice.h"
namespace rocksdb {
@ -144,6 +144,4 @@ class AssociativeMergeOperator : public MergeOperator {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_MERGE_OPERATOR_H_

@ -683,6 +683,4 @@ struct FlushOptions {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_OPTIONS_H_

@ -36,6 +36,4 @@ extern __thread PerfContext perf_context;
}
#include "rocksdb/rocksdb_to_leveldb.h"
#endif

@ -1,9 +0,0 @@
// Copyright (c) 2013 Facebook.
#pragma once
//
// This is for backward compatibility with applications that use the
// 'leveldb' namespace. This file will be deleted in a future release.
//
namespace leveldb = rocksdb;

@ -119,6 +119,4 @@ inline int Slice::compare(const Slice& b) const {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_SLICE_H_

@ -40,6 +40,4 @@ extern const SliceTransform* NewNoopTransform();
}
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_SLICE_TRANSFORM_H_

@ -260,6 +260,4 @@ inline void SetTickerCount(std::shared_ptr<Statistics> statistics,
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_STATISTICS_H_

@ -123,6 +123,4 @@ inline void Status::operator=(const Status& s) {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_STATUS_H_

@ -92,6 +92,4 @@ class TableBuilder {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_TABLE_BUILDER_H_

@ -78,6 +78,4 @@ class TransactionLogIterator {
};
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_

@ -12,6 +12,4 @@ typedef uint64_t SequenceNumber;
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_TYPES_H_

@ -67,6 +67,4 @@ class CompactionOptionsUniversal {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H

@ -96,6 +96,4 @@ class WriteBatch {
} // namespace rocksdb
#include "rocksdb/rocksdb_to_leveldb.h"
#endif // STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_

Loading…
Cancel
Save