Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove old facade from UUID generation

Browse Source
This commit is contained in:
Dennis Luxen 2013-09-23 13:42:35 +02:00
parent 056c95670f
commit 7cf46afc48
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Util/UUID.cpp.in
View File

@ -30,13 +30,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#cmakedefine01 HAS64BITS #cmakedefine01 HAS64BITS
#cmakedefine MD5PREPARE "${MD5PREPARE}" #cmakedefine MD5PREPARE "${MD5PREPARE}"
#cmakedefine MD5RTREE "${MD5RTREE}" #cmakedefine MD5RTREE "${MD5RTREE}"
#cmakedefine MD5NODEINFO "${MD5NODEINFO}"
#cmakedefine MD5GRAPH "${MD5GRAPH}" #cmakedefine MD5GRAPH "${MD5GRAPH}"
#cmakedefine MD5OBJECTS "${MD5OBJECTS}" #cmakedefine MD5OBJECTS "${MD5OBJECTS}"
UUID::UUID() : magic_number(1297240911) { UUID::UUID() : magic_number(1297240911) {
md5_prepare[32] = md5_tree[32] = md5_nodeinfo[32] = md5_graph[32] = md5_prepare[32] =
md5_objects[32] = '\0'; md5_tree[32] =
md5_graph[32] =
md5_objects[32] = '\0';
boost::uuids::name_generator gen(named_uuid); boost::uuids::name_generator gen(named_uuid);
std::string temp_string(__DATE__); std::string temp_string(__DATE__);
@ -46,8 +47,6 @@ UUID::UUID() : magic_number(1297240911) {
temp_string += md5_prepare; temp_string += md5_prepare;
std::copy(MD5RTREE, MD5RTREE+32, md5_tree); std::copy(MD5RTREE, MD5RTREE+32, md5_tree);
temp_string += md5_tree; temp_string += md5_tree;
std::copy(MD5NODEINFO, MD5NODEINFO+32, md5_nodeinfo);
temp_string += md5_nodeinfo;
std::copy(MD5GRAPH, MD5GRAPH+32, md5_graph); std::copy(MD5GRAPH, MD5GRAPH+32, md5_graph);
temp_string += md5_graph; temp_string += md5_graph;
std::copy(MD5OBJECTS, MD5OBJECTS+32, md5_objects); std::copy(MD5OBJECTS, MD5OBJECTS+32, md5_objects);
@ -90,13 +89,6 @@ bool UUID::TestRTree(const UUID & other) const {
return std::equal(md5_tree, md5_tree+32, other.md5_tree); return std::equal(md5_tree, md5_tree+32, other.md5_tree);
} }
bool UUID::TestNodeInfo(const UUID & other) const {
if(!other.IsMagicNumberOK()) {
throw OSRMException("nodes file misses magic number. Check or reprocess the file");
}
return std::equal(md5_nodeinfo, md5_nodeinfo+32, other.md5_nodeinfo);
}
bool UUID::TestQueryObjects(const UUID & other) const { bool UUID::TestQueryObjects(const UUID & other) const {
if(!other.IsMagicNumberOK()) { if(!other.IsMagicNumberOK()) {
throw OSRMException("missing magic number. Check or reprocess the file"); throw OSRMException("missing magic number. Check or reprocess the file");

1
Util/UUID.h
View File

@ -58,7 +58,6 @@ private:
const unsigned magic_number; const unsigned magic_number;
char md5_prepare[33]; char md5_prepare[33];
char md5_tree[33]; char md5_tree[33];
char md5_nodeinfo[33];
char md5_graph[33]; char md5_graph[33];
char md5_objects[33]; char md5_objects[33];

1
cmake/UUID-Config.cmake
View File

@ -4,7 +4,6 @@ if (EXISTS ${OLDFILE})
endif() endif()
file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE) file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE)
file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE) file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE)
file(MD5 ${SOURCE_DIR}/DataStructures/NodeInformationHelpDesk.h MD5NODEINFO)
file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH) file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH)
file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS) file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)