Also support loading core information into shared memory

server/data_structures/internal_datafacade.hpp

@@ -181,6 +181,12 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         std::vector<char> unpacked_core_markers(number_of_markers);
         core_stream.read((char *)unpacked_core_markers.data(), sizeof(char)*number_of_markers);
 
+        // in this case we have nothing to do
+        if (number_of_markers <= 0)
+        {
+            return;
+        }
+
         m_is_core_node.resize(number_of_markers);
         for (auto i = 0u; i < number_of_markers; ++i)
         {
@@ -494,7 +500,14 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
 
     virtual bool IsCoreNode(const NodeID id) const override final
     {
-        return m_is_core_node[id];
+        if (m_is_core_node.size() > 0)
+        {
+            return m_is_core_node[id];
+        }
+        else
+        {
+            return false;
+        }
     }
 
     virtual void GetUncompressedGeometry(const unsigned id,

server/data_structures/shared_datafacade.hpp

@@ -194,6 +194,21 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
         m_names_char_list.swap(names_char_list);
     }
 
+    void LoadCoreInformation()
+    {
+        if (data_layout->num_entries[SharedDataLayout::CORE_MARKER] <= 0)
+        {
+            return;
+        }
+
+        unsigned *core_marker_ptr = data_layout->GetBlockPtr<unsigned>(
+            shared_memory, SharedDataLayout::CORE_MARKER);
+        typename ShM<bool, true>::vector is_core_node(
+            core_marker_ptr,
+            data_layout->num_entries[SharedDataLayout::CORE_MARKER]);
+        m_is_core_node.swap(is_core_node);
+    }
+
     void LoadGeometries()
     {
         unsigned *geometries_compressed_ptr = data_layout->GetBlockPtr<unsigned>(
@@ -269,6 +284,7 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
             LoadTimestamp();
             LoadViaNodeList();
             LoadNames();
+            LoadCoreInformation();
 
             data_layout->PrintInformation();
 
@@ -450,7 +466,11 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
 
     bool IsCoreNode(const NodeID id) const override final
     {
-        //return m_is_core_node[id];
+        if (m_is_core_node.size() > 0)
+        {
+            return m_is_core_node.at(id);
+        }
+
         return false;
     }
 

server/data_structures/shared_datatype.hpp

@@ -62,6 +62,7 @@ struct SharedDataLayout
         HSGR_CHECKSUM,
         TIMESTAMP,
         FILE_INDEX_PATH,
+        CORE_MARKER,
         NUM_BLOCKS
     };
 
@@ -72,40 +73,6 @@ struct SharedDataLayout
 
     void PrintInformation() const
     {
-        SimpleLogger().Write(logDEBUG) << "-";
-        SimpleLogger().Write(logDEBUG)
-            << "name_offsets_size:          " << num_entries[NAME_OFFSETS];
-        SimpleLogger().Write(logDEBUG)
-            << "name_blocks_size:           " << num_entries[NAME_BLOCKS];
-        SimpleLogger().Write(logDEBUG)
-            << "name_char_list_size:        " << num_entries[NAME_CHAR_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "name_id_list_size:          " << num_entries[NAME_ID_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "via_node_list_size:         " << num_entries[VIA_NODE_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "graph_node_list_size:       " << num_entries[GRAPH_NODE_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "graph_edge_list_size:       " << num_entries[GRAPH_EDGE_LIST];
-        SimpleLogger().Write(logDEBUG) << "timestamp_length:           " << num_entries[TIMESTAMP];
-        SimpleLogger().Write(logDEBUG)
-            << "coordinate_list_size:       " << num_entries[COORDINATE_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "turn_instruction_list_size: " << num_entries[TURN_INSTRUCTION];
-        SimpleLogger().Write(logDEBUG)
-            << "travel_mode_list_size:      " << num_entries[TRAVEL_MODE];
-        SimpleLogger().Write(logDEBUG)
-            << "r_search_tree_size:         " << num_entries[R_SEARCH_TREE];
-        SimpleLogger().Write(logDEBUG)
-            << "geometries_indicators:      " << num_entries[GEOMETRIES_INDICATORS] << "/"
-            << ((num_entries[GEOMETRIES_INDICATORS] / 8) + 1);
-        SimpleLogger().Write(logDEBUG)
-            << "geometries_index_list_size: " << num_entries[GEOMETRIES_INDEX];
-        SimpleLogger().Write(logDEBUG)
-            << "geometries_list_size:       " << num_entries[GEOMETRIES_LIST];
-        SimpleLogger().Write(logDEBUG)
-            << "sizeof(checksum):           " << entry_size[HSGR_CHECKSUM];
-
         SimpleLogger().Write(logDEBUG) << "NAME_OFFSETS         "
                                        << ": " << GetBlockSize(NAME_OFFSETS);
         SimpleLogger().Write(logDEBUG) << "NAME_BLOCKS          "
@@ -140,6 +107,8 @@ struct SharedDataLayout
                                        << ": " << GetBlockSize(TIMESTAMP);
         SimpleLogger().Write(logDEBUG) << "FILE_INDEX_PATH      "
                                        << ": " << GetBlockSize(FILE_INDEX_PATH);
+        SimpleLogger().Write(logDEBUG) << "CORE_MARKER          "
+                                       << ": " << GetBlockSize(CORE_MARKER);
     }
 
     template <typename T> inline void SetBlockSize(BlockID bid, uint64_t entries)
@@ -150,11 +119,11 @@ struct SharedDataLayout
 
     inline uint64_t GetBlockSize(BlockID bid) const
     {
-        // special encoding
-        if (bid == GEOMETRIES_INDICATORS)
+        // special bit encoding
+        if (bid == GEOMETRIES_INDICATORS || bid == CORE_MARKER)
         {
-            return (num_entries[GEOMETRIES_INDICATORS] / 32 + 1) *
-                   entry_size[GEOMETRIES_INDICATORS];
+            return (num_entries[bid] / 32 + 1) *
+                   entry_size[bid];
         }
 
         return num_entries[bid] * entry_size[bid];