From 3c37955a2f69c6090f6f4372a05ac6aa42827b19 Mon Sep 17 00:00:00 2001 From: Dhruba Borthakur Date: Tue, 8 Oct 2013 21:35:16 -0700 Subject: [PATCH] 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 --- include/rocksdb/arena.h | 2 -- include/rocksdb/cache.h | 2 -- include/rocksdb/compaction_filter.h | 2 -- include/rocksdb/comparator.h | 2 -- include/rocksdb/db.h | 2 -- include/rocksdb/env.h | 2 -- include/rocksdb/filter_policy.h | 1 - include/rocksdb/iterator.h | 2 -- include/rocksdb/ldb_tool.h | 2 -- include/rocksdb/memtablerep.h | 2 -- include/rocksdb/merge_operator.h | 4 +--- include/rocksdb/options.h | 2 -- include/rocksdb/perf_context.h | 2 -- include/rocksdb/rocksdb_to_leveldb.h | 9 --------- include/rocksdb/slice.h | 2 -- include/rocksdb/slice_transform.h | 2 -- include/rocksdb/statistics.h | 2 -- include/rocksdb/status.h | 2 -- include/rocksdb/table_builder.h | 2 -- include/rocksdb/transaction_log.h | 2 -- include/rocksdb/types.h | 2 -- include/rocksdb/universal_compaction.h | 2 -- include/rocksdb/write_batch.h | 2 -- 23 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 include/rocksdb/rocksdb_to_leveldb.h diff --git a/include/rocksdb/arena.h b/include/rocksdb/arena.h index c6a87ab9c..c0a0ac240 100644 --- a/include/rocksdb/arena.h +++ b/include/rocksdb/arena.h @@ -38,6 +38,4 @@ class Arena { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_ARENA_H_ diff --git a/include/rocksdb/cache.h b/include/rocksdb/cache.h index 7ef6bd924..f9106511d 100644 --- a/include/rocksdb/cache.h +++ b/include/rocksdb/cache.h @@ -103,6 +103,4 @@ class Cache { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_UTIL_CACHE_H_ diff --git a/include/rocksdb/compaction_filter.h b/include/rocksdb/compaction_filter.h index fe9ce1f0d..6356f1f8d 100644 --- a/include/rocksdb/compaction_filter.h +++ b/include/rocksdb/compaction_filter.h @@ -68,6 +68,4 @@ class DefaultCompactionFilterFactory : public CompactionFilterFactory { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_COMPACTION_FILTER_H_ diff --git a/include/rocksdb/comparator.h b/include/rocksdb/comparator.h index b60493418..f131627c7 100644 --- a/include/rocksdb/comparator.h +++ b/include/rocksdb/comparator.h @@ -60,6 +60,4 @@ extern const Comparator* BytewiseComparator(); } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_COMPARATOR_H_ diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index 1c5b1f394..a9dd724e3 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.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_ diff --git a/include/rocksdb/env.h b/include/rocksdb/env.h index ee4628123..612eba60c 100644 --- a/include/rocksdb/env.h +++ b/include/rocksdb/env.h @@ -565,6 +565,4 @@ class EnvWrapper : public Env { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_ENV_H_ diff --git a/include/rocksdb/filter_policy.h b/include/rocksdb/filter_policy.h index 3cafa579d..605b3c401 100644 --- a/include/rocksdb/filter_policy.h +++ b/include/rocksdb/filter_policy.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_ diff --git a/include/rocksdb/iterator.h b/include/rocksdb/iterator.h index 966ce108a..f729e394f 100644 --- a/include/rocksdb/iterator.h +++ b/include/rocksdb/iterator.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_ diff --git a/include/rocksdb/ldb_tool.h b/include/rocksdb/ldb_tool.h index 738fb9536..0a234b9c3 100644 --- a/include/rocksdb/ldb_tool.h +++ b/include/rocksdb/ldb_tool.h @@ -12,6 +12,4 @@ class LDBTool { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H diff --git a/include/rocksdb/memtablerep.h b/include/rocksdb/memtablerep.h index 4bed4b315..361b2f9c9 100644 --- a/include/rocksdb/memtablerep.h +++ b/include/rocksdb/memtablerep.h @@ -256,6 +256,4 @@ public: } -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ diff --git a/include/rocksdb/merge_operator.h b/include/rocksdb/merge_operator.h index 8d0a9f12f..19e02d2b1 100644 --- a/include/rocksdb/merge_operator.h +++ b/include/rocksdb/merge_operator.h @@ -7,7 +7,7 @@ #include #include -#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_ diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index 14d98bb25..a160acee1 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -683,6 +683,4 @@ struct FlushOptions { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_OPTIONS_H_ diff --git a/include/rocksdb/perf_context.h b/include/rocksdb/perf_context.h index eedefec56..332bf0d3c 100644 --- a/include/rocksdb/perf_context.h +++ b/include/rocksdb/perf_context.h @@ -36,6 +36,4 @@ extern __thread PerfContext perf_context; } -#include "rocksdb/rocksdb_to_leveldb.h" - #endif diff --git a/include/rocksdb/rocksdb_to_leveldb.h b/include/rocksdb/rocksdb_to_leveldb.h deleted file mode 100644 index 407efdbbb..000000000 --- a/include/rocksdb/rocksdb_to_leveldb.h +++ /dev/null @@ -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; diff --git a/include/rocksdb/slice.h b/include/rocksdb/slice.h index bb6440271..141480688 100644 --- a/include/rocksdb/slice.h +++ b/include/rocksdb/slice.h @@ -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_ diff --git a/include/rocksdb/slice_transform.h b/include/rocksdb/slice_transform.h index 917b50e68..f22e226d0 100644 --- a/include/rocksdb/slice_transform.h +++ b/include/rocksdb/slice_transform.h @@ -40,6 +40,4 @@ extern const SliceTransform* NewNoopTransform(); } -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_SLICE_TRANSFORM_H_ diff --git a/include/rocksdb/statistics.h b/include/rocksdb/statistics.h index e0baf11c8..e11127ce7 100644 --- a/include/rocksdb/statistics.h +++ b/include/rocksdb/statistics.h @@ -260,6 +260,4 @@ inline void SetTickerCount(std::shared_ptr statistics, } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_STATISTICS_H_ diff --git a/include/rocksdb/status.h b/include/rocksdb/status.h index 51a9b2d48..dabf7712c 100644 --- a/include/rocksdb/status.h +++ b/include/rocksdb/status.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_ diff --git a/include/rocksdb/table_builder.h b/include/rocksdb/table_builder.h index 077cc8ab1..8cb3440f4 100644 --- a/include/rocksdb/table_builder.h +++ b/include/rocksdb/table_builder.h @@ -92,6 +92,4 @@ class TableBuilder { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_TABLE_BUILDER_H_ diff --git a/include/rocksdb/transaction_log.h b/include/rocksdb/transaction_log.h index 73f011d9e..0a2be79c3 100644 --- a/include/rocksdb/transaction_log.h +++ b/include/rocksdb/transaction_log.h @@ -78,6 +78,4 @@ class TransactionLogIterator { }; } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ diff --git a/include/rocksdb/types.h b/include/rocksdb/types.h index ee2ed4632..36cc85f9b 100644 --- a/include/rocksdb/types.h +++ b/include/rocksdb/types.h @@ -12,6 +12,4 @@ typedef uint64_t SequenceNumber; } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_TYPES_H_ diff --git a/include/rocksdb/universal_compaction.h b/include/rocksdb/universal_compaction.h index 777dd7965..81144e8c8 100644 --- a/include/rocksdb/universal_compaction.h +++ b/include/rocksdb/universal_compaction.h @@ -67,6 +67,4 @@ class CompactionOptionsUniversal { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H diff --git a/include/rocksdb/write_batch.h b/include/rocksdb/write_batch.h index 1e0c9c2ef..e6f9ba3b2 100644 --- a/include/rocksdb/write_batch.h +++ b/include/rocksdb/write_batch.h @@ -96,6 +96,4 @@ class WriteBatch { } // namespace rocksdb -#include "rocksdb/rocksdb_to_leveldb.h" - #endif // STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_