Merge pull request #5566 from akashihi/flatbuffernosoptional

gardster · web-flow · commit f520379419aa · 2019-10-02T11:12:19.000+03:00
Flatbuffers is not a boost::optional friendly
diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp
@@ -106,7 +106,7 @@ class BaseAPI
         auto name_string = builder->CreateString(
             facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id)).to_string());
 
-        boost::optional<flatbuffers::Offset<flatbuffers::String>> hint_string = boost::none;
+        flatbuffers::Offset<flatbuffers::String> hint_string;
         if (parameters.generate_hints)
         {
             hint_string = builder->CreateString(Hint{phantom, facade.GetCheckSum()}.ToBase64());
@@ -117,9 +117,9 @@ class BaseAPI
         waypoint->add_distance(util::coordinate_calculation::fccApproximateDistance(
             phantom.location, phantom.input_location));
         waypoint->add_name(name_string);
-        if (hint_string)
+        if (parameters.generate_hints)
         {
-            waypoint->add_hint(*hint_string);
+            waypoint->add_hint(hint_string);
         }
         return waypoint;
     }
diff --git a/include/engine/api/match_api.hpp b/include/engine/api/match_api.hpp
@@ -50,7 +50,7 @@ class MatchAPI final : public RouteAPI
                       flatbuffers::FlatBufferBuilder &fb_result) const
     {
         auto data_timestamp = facade.GetTimestamp();
-        boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;
+        flatbuffers::Offset<flatbuffers::String> data_version_string;
         if (!data_timestamp.empty())
         {
             data_version_string = fb_result.CreateString(data_timestamp);
@@ -60,9 +60,9 @@ class MatchAPI final : public RouteAPI
             return MakeTracepoints(fb_result, sub_matchings);
         });
 
-        if (data_version_string)
+        if (!data_timestamp.empty())
         {
-            response->add_data_version(*data_version_string);
+            response->add_data_version(data_version_string);
         }
 
         fb_result.Finish(response->Finish());
diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
@@ -73,7 +73,7 @@ class RouteAPI : public BaseAPI
     {
 
         auto data_timestamp = facade.GetTimestamp();
-        boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;
+        flatbuffers::Offset<flatbuffers::String> data_version_string;
         if (!data_timestamp.empty())
         {
             data_version_string = fb_result.CreateString(data_timestamp);
@@ -84,9 +84,9 @@ class RouteAPI : public BaseAPI
                 return BaseAPI::MakeWaypoints(&fb_result, all_start_end_points);
             });
 
-        if (data_version_string)
+        if (!data_timestamp.empty())
         {
-            response->add_data_version(*data_version_string);
+            response->add_data_version(data_version_string);
         }
         fb_result.Finish(response->Finish());
     }
@@ -373,8 +373,7 @@ class RouteAPI : public BaseAPI
                 requested_annotations = RouteParameters::AnnotationsType::All;
             }
 
-            boost::optional<flatbuffers::Offset<fbresult::Annotation>> annotation_buffer =
-                boost::none;
+            flatbuffers::Offset<fbresult::Annotation> annotation_buffer;
             if (requested_annotations != RouteParameters::AnnotationsType::None)
             {
                 annotation_buffer =
@@ -397,9 +396,9 @@ class RouteAPI : public BaseAPI
             }
             legBuilder.add_steps(steps_vector);
 
-            if (annotation_buffer)
+            if (requested_annotations != RouteParameters::AnnotationsType::None)
             {
-                legBuilder.add_annotations(*annotation_buffer);
+                legBuilder.add_annotations(annotation_buffer);
             }
             routeLegs.emplace_back(legBuilder.Finish());
         }
@@ -506,8 +505,9 @@ class RouteAPI : public BaseAPI
         }
         auto nodes_vector = fb_result.CreateVector(nodes);
         // Add any supporting metadata, if needed
-        boost::optional<flatbuffers::Offset<fbresult::Metadata>> metadata_buffer = boost::none;
-        if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
+        bool use_metadata = requested_annotations & RouteParameters::AnnotationsType::Datasources;
+        flatbuffers::Offset<fbresult::Metadata> metadata_buffer;
+        if (use_metadata)
         {
             const auto MAX_DATASOURCE_ID = 255u;
             std::vector<flatbuffers::Offset<flatbuffers::String>> names;
@@ -529,9 +529,9 @@ class RouteAPI : public BaseAPI
         annotation.add_weight(weight);
         annotation.add_datasources(datasources);
         annotation.add_nodes(nodes_vector);
-        if (metadata_buffer)
+        if (use_metadata)
         {
-            annotation.add_metadata(*metadata_buffer);
+            annotation.add_metadata(metadata_buffer);
         }
 
         return annotation.Finish();
diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp
@@ -74,7 +74,7 @@ class TableAPI final : public BaseAPI
         auto number_of_destinations = parameters.destinations.size();
 
         auto data_timestamp = facade.GetTimestamp();
-        boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;
+        flatbuffers::Offset<flatbuffers::String> data_version_string;
         if (!data_timestamp.empty())
         {
             data_version_string = fb_result.CreateString(data_timestamp);
@@ -116,21 +116,24 @@ class TableAPI final : public BaseAPI
             }
         }
 
-        boost::optional<flatbuffers::Offset<flatbuffers::Vector<float>>> durations = boost::none;
-        if (parameters.annotations & TableParameters::AnnotationsType::Duration)
+        bool use_durations = parameters.annotations & TableParameters::AnnotationsType::Duration;
+        flatbuffers::Offset<flatbuffers::Vector<float>> durations;
+        if (use_durations)
         {
             durations = MakeDurationTable(fb_result, tables.first);
         }
 
-        boost::optional<flatbuffers::Offset<flatbuffers::Vector<float>>> distances = boost::none;
-        if (parameters.annotations & TableParameters::AnnotationsType::Distance)
+        bool use_distances = parameters.annotations & TableParameters::AnnotationsType::Distance;
+        flatbuffers::Offset<flatbuffers::Vector<float>> distances;
+        if (use_distances)
         {
             distances = MakeDistanceTable(fb_result, tables.second);
         }
 
-        boost::optional<flatbuffers::Offset<flatbuffers::Vector<uint32_t>>> speed_cells =
-            boost::none;
-        if (parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0)
+        bool have_speed_cells =
+            parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0;
+        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> speed_cells;
+        if (have_speed_cells)
         {
             speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells);
         }
@@ -139,24 +142,24 @@ class TableAPI final : public BaseAPI
         table.add_destinations(destinations);
         table.add_rows(number_of_sources);
         table.add_cols(number_of_destinations);
-        if (durations)
+        if (use_durations)
         {
-            table.add_durations(*durations);
+            table.add_durations(durations);
         }
-        if (distances)
+        if (use_distances)
         {
-            table.add_distances(*distances);
+            table.add_distances(distances);
         }
-        if (speed_cells)
+        if (have_speed_cells)
         {
-            table.add_fallback_speed_cells(*speed_cells);
+            table.add_fallback_speed_cells(speed_cells);
         }
         auto table_buffer = table.Finish();
 
         fbresult::FBResultBuilder response(fb_result);
-        if (data_version_string)
+        if (!data_timestamp.empty())
         {
-            response.add_data_version(*data_version_string);
+            response.add_data_version(data_version_string);
         }
         response.add_table(table_buffer);
         response.add_waypoints(sources);
diff --git a/include/engine/api/trip_api.hpp b/include/engine/api/trip_api.hpp
@@ -48,7 +48,7 @@ class TripAPI final : public RouteAPI
                       flatbuffers::FlatBufferBuilder &fb_result) const
     {
         auto data_timestamp = facade.GetTimestamp();
-        boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;
+        flatbuffers::Offset<flatbuffers::String> data_version_string;
         if (!data_timestamp.empty())
         {
             data_version_string = fb_result.CreateString(data_timestamp);
@@ -59,9 +59,9 @@ class TripAPI final : public RouteAPI
                 return MakeWaypoints(fb_result, sub_trips, phantoms);
             });
 
-        if (data_version_string)
+        if (!data_timestamp.empty())
         {
-            response->add_data_version(*data_version_string);
+            response->add_data_version(data_version_string);
         }
         fb_result.Finish(response->Finish());
     }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class BaseAPI`
`106`	`106`	`auto name_string = builder->CreateString(`
`107`	`107`	`facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id)).to_string());`
`108`	`108`
`109`		`- boost::optional<flatbuffers::Offset<flatbuffers::String>> hint_string = boost::none;`
	`109`	`+ flatbuffers::Offset<flatbuffers::String> hint_string;`
`110`	`110`	`if (parameters.generate_hints)`
`111`	`111`	`{`
`112`	`112`	`hint_string = builder->CreateString(Hint{phantom, facade.GetCheckSum()}.ToBase64());`
`@@ -117,9 +117,9 @@ class BaseAPI`
`117`	`117`	`waypoint->add_distance(util::coordinate_calculation::fccApproximateDistance(`
`118`	`118`	`phantom.location, phantom.input_location));`
`119`	`119`	`waypoint->add_name(name_string);`
`120`		`- if (hint_string)`
	`120`	`+ if (parameters.generate_hints)`
`121`	`121`	`{`
`122`		`- waypoint->add_hint(*hint_string);`
	`122`	`+ waypoint->add_hint(hint_string);`
`123`	`123`	`}`
`124`	`124`	`return waypoint;`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class MatchAPI final : public RouteAPI`
`50`	`50`	`flatbuffers::FlatBufferBuilder &fb_result) const`
`51`	`51`	`{`
`52`	`52`	`auto data_timestamp = facade.GetTimestamp();`
`53`		`- boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;`
	`53`	`+ flatbuffers::Offset<flatbuffers::String> data_version_string;`
`54`	`54`	`if (!data_timestamp.empty())`
`55`	`55`	`{`
`56`	`56`	`data_version_string = fb_result.CreateString(data_timestamp);`
`@@ -60,9 +60,9 @@ class MatchAPI final : public RouteAPI`
`60`	`60`	`return MakeTracepoints(fb_result, sub_matchings);`
`61`	`61`	`});`
`62`	`62`
`63`		`- if (data_version_string)`
	`63`	`+ if (!data_timestamp.empty())`
`64`	`64`	`{`
`65`		`- response->add_data_version(*data_version_string);`
	`65`	`+ response->add_data_version(data_version_string);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`fb_result.Finish(response->Finish());`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class RouteAPI : public BaseAPI`
`73`	`73`	`{`
`74`	`74`
`75`	`75`	`auto data_timestamp = facade.GetTimestamp();`
`76`		`- boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;`
	`76`	`+ flatbuffers::Offset<flatbuffers::String> data_version_string;`
`77`	`77`	`if (!data_timestamp.empty())`
`78`	`78`	`{`
`79`	`79`	`data_version_string = fb_result.CreateString(data_timestamp);`
`@@ -84,9 +84,9 @@ class RouteAPI : public BaseAPI`
`84`	`84`	`return BaseAPI::MakeWaypoints(&fb_result, all_start_end_points);`
`85`	`85`	`});`
`86`	`86`
`87`		`- if (data_version_string)`
	`87`	`+ if (!data_timestamp.empty())`
`88`	`88`	`{`
`89`		`- response->add_data_version(*data_version_string);`
	`89`	`+ response->add_data_version(data_version_string);`
`90`	`90`	`}`
`91`	`91`	`fb_result.Finish(response->Finish());`
`92`	`92`	`}`
`@@ -373,8 +373,7 @@ class RouteAPI : public BaseAPI`
`373`	`373`	`requested_annotations = RouteParameters::AnnotationsType::All;`
`374`	`374`	`}`
`375`	`375`
`376`		`- boost::optional<flatbuffers::Offset<fbresult::Annotation>> annotation_buffer =`
`377`		`- boost::none;`
	`376`	`+ flatbuffers::Offset<fbresult::Annotation> annotation_buffer;`
`378`	`377`	`if (requested_annotations != RouteParameters::AnnotationsType::None)`
`379`	`378`	`{`
`380`	`379`	`annotation_buffer =`
`@@ -397,9 +396,9 @@ class RouteAPI : public BaseAPI`
`397`	`396`	`}`
`398`	`397`	`legBuilder.add_steps(steps_vector);`
`399`	`398`
`400`		`- if (annotation_buffer)`
	`399`	`+ if (requested_annotations != RouteParameters::AnnotationsType::None)`
`401`	`400`	`{`
`402`		`- legBuilder.add_annotations(*annotation_buffer);`
	`401`	`+ legBuilder.add_annotations(annotation_buffer);`
`403`	`402`	`}`
`404`	`403`	`routeLegs.emplace_back(legBuilder.Finish());`
`405`	`404`	`}`
`@@ -506,8 +505,9 @@ class RouteAPI : public BaseAPI`
`506`	`505`	`}`
`507`	`506`	`auto nodes_vector = fb_result.CreateVector(nodes);`
`508`	`507`	`// Add any supporting metadata, if needed`
`509`		`- boost::optional<flatbuffers::Offset<fbresult::Metadata>> metadata_buffer = boost::none;`
`510`		`- if (requested_annotations & RouteParameters::AnnotationsType::Datasources)`
	`508`	`+ bool use_metadata = requested_annotations & RouteParameters::AnnotationsType::Datasources;`
	`509`	`+ flatbuffers::Offset<fbresult::Metadata> metadata_buffer;`
	`510`	`+ if (use_metadata)`
`511`	`511`	`{`
`512`	`512`	`const auto MAX_DATASOURCE_ID = 255u;`
`513`	`513`	`std::vector<flatbuffers::Offset<flatbuffers::String>> names;`
`@@ -529,9 +529,9 @@ class RouteAPI : public BaseAPI`
`529`	`529`	`annotation.add_weight(weight);`
`530`	`530`	`annotation.add_datasources(datasources);`
`531`	`531`	`annotation.add_nodes(nodes_vector);`
`532`		`- if (metadata_buffer)`
	`532`	`+ if (use_metadata)`
`533`	`533`	`{`
`534`		`- annotation.add_metadata(*metadata_buffer);`
	`534`	`+ annotation.add_metadata(metadata_buffer);`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`return annotation.Finish();`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class TableAPI final : public BaseAPI`
`74`	`74`	`auto number_of_destinations = parameters.destinations.size();`
`75`	`75`
`76`	`76`	`auto data_timestamp = facade.GetTimestamp();`
`77`		`- boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;`
	`77`	`+ flatbuffers::Offset<flatbuffers::String> data_version_string;`
`78`	`78`	`if (!data_timestamp.empty())`
`79`	`79`	`{`
`80`	`80`	`data_version_string = fb_result.CreateString(data_timestamp);`
`@@ -116,21 +116,24 @@ class TableAPI final : public BaseAPI`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`- boost::optional<flatbuffers::Offset<flatbuffers::Vector<float>>> durations = boost::none;`
`120`		`- if (parameters.annotations & TableParameters::AnnotationsType::Duration)`
	`119`	`+ bool use_durations = parameters.annotations & TableParameters::AnnotationsType::Duration;`
	`120`	`+ flatbuffers::Offset<flatbuffers::Vector<float>> durations;`
	`121`	`+ if (use_durations)`
`121`	`122`	`{`
`122`	`123`	`durations = MakeDurationTable(fb_result, tables.first);`
`123`	`124`	`}`
`124`	`125`
`125`		`- boost::optional<flatbuffers::Offset<flatbuffers::Vector<float>>> distances = boost::none;`
`126`		`- if (parameters.annotations & TableParameters::AnnotationsType::Distance)`
	`126`	`+ bool use_distances = parameters.annotations & TableParameters::AnnotationsType::Distance;`
	`127`	`+ flatbuffers::Offset<flatbuffers::Vector<float>> distances;`
	`128`	`+ if (use_distances)`
`127`	`129`	`{`
`128`	`130`	`distances = MakeDistanceTable(fb_result, tables.second);`
`129`	`131`	`}`
`130`	`132`
`131`		`- boost::optional<flatbuffers::Offset<flatbuffers::Vector<uint32_t>>> speed_cells =`
`132`		`- boost::none;`
`133`		`- if (parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0)`
	`133`	`+ bool have_speed_cells =`
	`134`	`+ parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0;`
	`135`	`+ flatbuffers::Offset<flatbuffers::Vector<uint32_t>> speed_cells;`
	`136`	`+ if (have_speed_cells)`
`134`	`137`	`{`
`135`	`138`	`speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells);`
`136`	`139`	`}`
`@@ -139,24 +142,24 @@ class TableAPI final : public BaseAPI`
`139`	`142`	`table.add_destinations(destinations);`
`140`	`143`	`table.add_rows(number_of_sources);`
`141`	`144`	`table.add_cols(number_of_destinations);`
`142`		`- if (durations)`
	`145`	`+ if (use_durations)`
`143`	`146`	`{`
`144`		`- table.add_durations(*durations);`
	`147`	`+ table.add_durations(durations);`
`145`	`148`	`}`
`146`		`- if (distances)`
	`149`	`+ if (use_distances)`
`147`	`150`	`{`
`148`		`- table.add_distances(*distances);`
	`151`	`+ table.add_distances(distances);`
`149`	`152`	`}`
`150`		`- if (speed_cells)`
	`153`	`+ if (have_speed_cells)`
`151`	`154`	`{`
`152`		`- table.add_fallback_speed_cells(*speed_cells);`
	`155`	`+ table.add_fallback_speed_cells(speed_cells);`
`153`	`156`	`}`
`154`	`157`	`auto table_buffer = table.Finish();`
`155`	`158`
`156`	`159`	`fbresult::FBResultBuilder response(fb_result);`
`157`		`- if (data_version_string)`
	`160`	`+ if (!data_timestamp.empty())`
`158`	`161`	`{`
`159`		`- response.add_data_version(*data_version_string);`
	`162`	`+ response.add_data_version(data_version_string);`
`160`	`163`	`}`
`161`	`164`	`response.add_table(table_buffer);`
`162`	`165`	`response.add_waypoints(sources);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class TripAPI final : public RouteAPI`
`48`	`48`	`flatbuffers::FlatBufferBuilder &fb_result) const`
`49`	`49`	`{`
`50`	`50`	`auto data_timestamp = facade.GetTimestamp();`
`51`		`- boost::optional<flatbuffers::Offset<flatbuffers::String>> data_version_string = boost::none;`
	`51`	`+ flatbuffers::Offset<flatbuffers::String> data_version_string;`
`52`	`52`	`if (!data_timestamp.empty())`
`53`	`53`	`{`
`54`	`54`	`data_version_string = fb_result.CreateString(data_timestamp);`
`@@ -59,9 +59,9 @@ class TripAPI final : public RouteAPI`
`59`	`59`	`return MakeWaypoints(fb_result, sub_trips, phantoms);`
`60`	`60`	`});`
`61`	`61`
`62`		`- if (data_version_string)`
	`62`	`+ if (!data_timestamp.empty())`
`63`	`63`	`{`
`64`		`- response->add_data_version(*data_version_string);`
	`64`	`+ response->add_data_version(data_version_string);`
`65`	`65`	`}`
`66`	`66`	`fb_result.Finish(response->Finish());`
`67`	`67`	`}`