8a3deab733
* WIP * WIP * WIP * Remove Filter::operator()(const Feature&) * WIP * WIP * WIP * WIP * Hook up expression filter evaluator * Replace `shared_ptr` with &reference * Fill in implementation of `void operator()(const ExpressionFilter&)` * Fix failing tests * Switch back to a shared_ptr per chat with @anandthakker * Fix benchmark compilation * Shot in the dark to fix CI * Shot in the dark to fix CI (part 2) * Shot in the dark to fix CI (part 3) * In src/mbgl/style/conversion/filter.cpp, add a port of isExpressionFilter and use it to decide in Converter<Filter>::operator() whether to parse the incoming JSON as an ExpressionFilter or one of the legacy filter types * Remove bool Filter::operator()(const GeometryTileFeature&) const * Ensure the map zoom is passed into filtering operations wherever applicable * Add expression filter tests * Addressed PR feedback * Implement `NSPredicate *operator()(mbgl::style::ExpressionFilter filter)` * Fix formatting& nit
36 lines
1.1 KiB
C++
36 lines
1.1 KiB
C++
#include <benchmark/benchmark.h>
|
|
|
|
#include <mbgl/style/filter.hpp>
|
|
#include <mbgl/style/filter_evaluator.hpp>
|
|
#include <mbgl/style/conversion.hpp>
|
|
#include <mbgl/style/conversion/json.hpp>
|
|
#include <mbgl/style/conversion/filter.hpp>
|
|
#include <mbgl/tile/geometry_tile_data.hpp>
|
|
#include <mbgl/benchmark/stub_geometry_tile_feature.hpp>
|
|
|
|
using namespace mbgl;
|
|
|
|
style::Filter parse(const char* expression) {
|
|
style::conversion::Error error;
|
|
return *style::conversion::convertJSON<style::Filter>(expression, error);
|
|
}
|
|
|
|
static void Parse_Filter(benchmark::State& state) {
|
|
while (state.KeepRunning()) {
|
|
parse(R"FILTER(["==", "foo", "bar"])FILTER");
|
|
}
|
|
}
|
|
|
|
static void Parse_EvaluateFilter(benchmark::State& state) {
|
|
const style::Filter filter = parse(R"FILTER(["==", "foo", "bar"])FILTER");
|
|
const StubGeometryTileFeature feature = { {}, FeatureType::Unknown , {}, {{ "foo", std::string("bar") }} };
|
|
const style::expression::EvaluationContext context = { &feature };
|
|
|
|
while (state.KeepRunning()) {
|
|
filter(context);
|
|
}
|
|
}
|
|
|
|
BENCHMARK(Parse_Filter);
|
|
BENCHMARK(Parse_EvaluateFilter);
|