Work with new blockstore::Key

This commit is contained in:
Sebastian Messmer 2015-04-09 20:07:21 +02:00
parent 8b7601f216
commit 4b04226162
6 changed files with 6 additions and 15 deletions

View File

@ -5,10 +5,8 @@
#include <memory> #include <memory>
#include <messmer/cpp-utils/macros.h> #include <messmer/cpp-utils/macros.h>
#include <messmer/cachingstore/CachingStore.h> #include <messmer/cachingstore/CachingStore.h>
#include <messmer/blockstore/utils/Key.h>
namespace blockstore{
class Key;
}
namespace blobstore { namespace blobstore {
namespace onblocks { namespace onblocks {
namespace datatreestore { namespace datatreestore {

View File

@ -18,7 +18,7 @@ private:
key.ToBinary(_keydata); key.ToBinary(_keydata);
} }
friend class DataInnerNode; friend class DataInnerNode;
uint8_t _keydata[blockstore::Key::KEYLENGTH_BINARY]; uint8_t _keydata[blockstore::Key::BINARY_LENGTH];
DISALLOW_COPY_AND_ASSIGN(DataInnerNode_ChildEntry); DISALLOW_COPY_AND_ASSIGN(DataInnerNode_ChildEntry);
}; };

View File

@ -5,11 +5,11 @@
#include <memory> #include <memory>
#include "messmer/cpp-utils/macros.h" #include "messmer/cpp-utils/macros.h"
#include "DataNodeView.h" #include "DataNodeView.h"
#include <messmer/blockstore/utils/Key.h>
namespace blockstore{ namespace blockstore{
class Block; class Block;
class BlockStore; class BlockStore;
class Key;
} }
namespace blobstore { namespace blobstore {

View File

@ -8,10 +8,8 @@
#include "../datanodestore/DataNodeView.h" #include "../datanodestore/DataNodeView.h"
//TODO Replace with C++14 once std::shared_mutex is supported //TODO Replace with C++14 once std::shared_mutex is supported
#include <boost/thread/shared_mutex.hpp> #include <boost/thread/shared_mutex.hpp>
#include <messmer/blockstore/utils/Key.h>
namespace blockstore {
class Key;
}
namespace blobstore { namespace blobstore {
namespace onblocks { namespace onblocks {
namespace datanodestore { namespace datanodestore {

View File

@ -4,10 +4,8 @@
#include <memory> #include <memory>
#include <messmer/cpp-utils/macros.h> #include <messmer/cpp-utils/macros.h>
#include <messmer/blockstore/utils/Key.h>
namespace blockstore{
class Key;
}
namespace blobstore { namespace blobstore {
namespace onblocks { namespace onblocks {
namespace datanodestore { namespace datanodestore {

View File

@ -4,10 +4,7 @@
#include <cstring> #include <cstring>
#include <cstdint> #include <cstdint>
#include <messmer/blockstore/utils/Key.h>
namespace blockstore {
class Key;
}
namespace blobstore { namespace blobstore {