From f965b7129b69ee39db46e383829391ea8817aee7 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 27 Sep 2013 12:00:58 +0200 Subject: [PATCH] Renaming variables to properly reflect its content --- Server/DataStructures/SharedDataFacade.h | 4 +- Server/DataStructures/SharedDataType.h | 52 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h index aefb2fc64..f13e0332f 100644 --- a/Server/DataStructures/SharedDataFacade.h +++ b/Server/DataStructures/SharedDataFacade.h @@ -160,7 +160,7 @@ private: ); typename ShM::vector name_begin_indices( street_names_index_ptr, - data_layout->names_index_size + data_layout->name_index_list_size ); m_name_begin_indices.swap(m_name_begin_indices); @@ -169,7 +169,7 @@ private: ); typename ShM::vector names_char_list( names_list_ptr, - data_layout->names_list_size + data_layout->name_char_list_size ); m_names_char_list.swap(names_char_list); } diff --git a/Server/DataStructures/SharedDataType.h b/Server/DataStructures/SharedDataType.h index ec20acc3e..d064a695f 100644 --- a/Server/DataStructures/SharedDataType.h +++ b/Server/DataStructures/SharedDataType.h @@ -38,8 +38,8 @@ typedef StaticRTree::TreeNode RTreeNode; typedef StaticGraph QueryGraph; struct SharedDataLayout { - uint64_t names_index_size; - uint64_t names_list_size; + uint64_t name_index_list_size; + uint64_t name_char_list_size; uint64_t name_id_list_size; uint64_t via_node_list_size; uint64_t graph_node_list_size; @@ -52,8 +52,8 @@ struct SharedDataLayout { unsigned timestamp_length; SharedDataLayout() : - names_index_size(0), - names_list_size(0), + name_index_list_size(0), + name_char_list_size(0), name_id_list_size(0), via_node_list_size(0), graph_node_list_size(0), @@ -67,8 +67,8 @@ struct SharedDataLayout { uint64_t GetSizeOfLayout() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -86,34 +86,34 @@ struct SharedDataLayout { } uint64_t GetNameListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ); + (name_index_list_size * sizeof(unsigned) ); return result; } uint64_t GetNameIDListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ); + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ); return result; } uint64_t GetViaNodeListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ); return result; } uint64_t GetGraphNodeListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ); return result; } uint64_t GetGraphEdgeListOffsett() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) ; @@ -121,8 +121,8 @@ struct SharedDataLayout { } uint64_t GetTimeStampOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -131,8 +131,8 @@ struct SharedDataLayout { } uint64_t GetCoordinateListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -142,8 +142,8 @@ struct SharedDataLayout { } uint64_t GetTurnInstructionListOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -154,8 +154,8 @@ struct SharedDataLayout { } uint64_t GetRSearchTreeOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -167,8 +167,8 @@ struct SharedDataLayout { } uint64_t GetChecksumOffset() const { uint64_t result = - (names_index_size * sizeof(unsigned) ) + - (names_list_size * sizeof(char) ) + + (name_index_list_size * sizeof(unsigned) ) + + (name_char_list_size * sizeof(char) ) + (name_id_list_size * sizeof(unsigned) ) + (via_node_list_size * sizeof(NodeID) ) + (graph_node_list_size * sizeof(QueryGraph::_StrNode)) + @@ -185,7 +185,7 @@ enum SharedDataType { // NAMES_INDEX = 0, // NAME_INDEX_SIZE, // NAMES_LIST, - // NAMES_LIST_SIZE, + // name_char_list_size, // NAME_ID_LIST, // NAME_ID_LIST_SIZE, // VIA_NODE_LIST,