diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-05-09 18:23:34 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-12 11:30:33 +0200 |
commit | 26ceac4acf070ab589d25d05cd5e90e8fd721a69 (patch) | |
tree | 6f0dd31ef9faef74a5a9f1b286f5831e1ae8efcb /src/leveldb/db/filename.cc | |
parent | a39d4e3771dca644e891876db80e7821a2563a0f (diff) | |
download | bitcoin-26ceac4acf070ab589d25d05cd5e90e8fd721a69.tar.xz |
Squashed 'src/leveldb/' changes from 9094c7f..7924331
42dcc7e Merge upstream LevelDB 1.17.
e353fbc Release LevelDB 1.17
269fc6c Release LevelDB 1.16
REVERT: 9094c7f Temporarily revert to writing .sst files instead of .ldb
git-subtree-dir: src/leveldb
git-subtree-split: 79243314e40ac31d79c68e5658a1d6a64800d50b
Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com>
Rebased-From: 938b689
Diffstat (limited to 'src/leveldb/db/filename.cc')
-rw-r--r-- | src/leveldb/db/filename.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/leveldb/db/filename.cc b/src/leveldb/db/filename.cc index 27d750697b..da32946d99 100644 --- a/src/leveldb/db/filename.cc +++ b/src/leveldb/db/filename.cc @@ -29,19 +29,14 @@ std::string LogFileName(const std::string& name, uint64_t number) { return MakeFileName(name, number, "log"); } -// TableFileName returns the filenames we usually write to, while -// SSTTableFileName returns the alternative filenames we also try to read from -// for backward compatibility. For now, swap them around. -// TODO: when compatibility is no longer necessary, swap them back -// (TableFileName to use "ldb" and SSTTableFileName to use "sst"). std::string TableFileName(const std::string& name, uint64_t number) { assert(number > 0); - return MakeFileName(name, number, "sst"); + return MakeFileName(name, number, "ldb"); } std::string SSTTableFileName(const std::string& name, uint64_t number) { assert(number > 0); - return MakeFileName(name, number, "ldb"); + return MakeFileName(name, number, "sst"); } std::string DescriptorFileName(const std::string& dbname, uint64_t number) { |