tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Asynchronous GeometryTile deletion (#2051)

Browse Source 
Co-authored-by: Tim Sylvester <tim@wetdogweather.com>
This commit is contained in:
mwilsnd
2024-02-28 17:18:08 -05:00
committed by GitHub
parent e3cbdb63a8
commit 4fff8a5d33
80 changed files with 1180 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
test/tile/tile_cache.test.cpp
View File

@@ -7,6 +7,7 @@
#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/tile/vector_tile_data.hpp>
#include <mbgl/actor/scheduler.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/geometry/feature_index.hpp>
#include <mbgl/map/transform.hpp>
@@ -16,34 +17,16 @@
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/test/vector_tile_test.hpp>
#include <mbgl/text/glyph_manager.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/identity.hpp>
#include <memory>
using namespace mbgl;
class VectorTileTest {
public:
std::shared_ptr<FileSource> fileSource = std::make_shared<FakeFileSource>();
TransformState transformState;
util::RunLoop loop;
style::Style style{fileSource, 1};
AnnotationManager annotationManager{style};
ImageManager imageManager;
GlyphManager glyphManager;
Tileset tileset{{"https://example.com"}, {0, 22}, "none"};
TileParameters tileParameters{1.0,
MapDebugOptions(),
transformState,
fileSource,
MapMode::Continuous,
annotationManager.makeWeakPtr(),
imageManager,
glyphManager,
0};
};
namespace {
class VectorTileMock : public VectorTile {
public:
@@ -51,16 +34,20 @@ public:
std::string sourceID_,
const TileParameters& parameters,
const Tileset& tileset)
: VectorTile(id_, sourceID_, parameters, tileset) {
: VectorTile(id_, std::move(sourceID_), parameters, tileset) {
renderable = true;
}
util::SimpleIdentity uniqueId;
};
} // namespace
TEST(TileCache, Smoke) {
VectorTileTest test;
TileCache cache(1);
OverscaledTileID id(0, 0, 0);
std::unique_ptr<Tile> tile = std::make_unique<VectorTileMock>(id, "source", test.tileParameters, test.tileset);
TileCache cache(Scheduler::GetBackground(), 1);
const OverscaledTileID id(0, 0, 0);
auto tile = std::make_unique<VectorTileMock>(id, "source", test.tileParameters, test.tileset);
cache.add(id, std::move(tile));
EXPECT_TRUE(cache.has(id));
@@ -70,18 +57,36 @@ TEST(TileCache, Smoke) {
TEST(TileCache, Issue15926) {
VectorTileTest test;
TileCache cache(2);
OverscaledTileID id0(0, 0, 0);
OverscaledTileID id1(1, 0, 0);
std::unique_ptr<Tile> tile1 = std::make_unique<VectorTileMock>(id0, "source", test.tileParameters, test.tileset);
std::unique_ptr<Tile> tile2 = std::make_unique<VectorTileMock>(id0, "source", test.tileParameters, test.tileset);
std::unique_ptr<Tile> tile3 = std::make_unique<VectorTileMock>(id1, "source", test.tileParameters, test.tileset);
TileCache cache(test.threadPool, 2);
const OverscaledTileID id0(0, 0, 0);
const OverscaledTileID id1(1, 0, 0);
auto tile1 = std::make_unique<VectorTileMock>(id0, "source", test.tileParameters, test.tileset);
auto tile2 = std::make_unique<VectorTileMock>(id0, "source", test.tileParameters, test.tileset);
auto tile3 = std::make_unique<VectorTileMock>(id1, "source", test.tileParameters, test.tileset);
auto tile4 = std::make_unique<VectorTileMock>(id0, "source", test.tileParameters, test.tileset);
const auto tile1Id = tile1->uniqueId;
// add
cache.add(id0, std::move(tile1));
EXPECT_TRUE(cache.has(id0));
// adding a key already present doesn't replace the existing item
cache.add(id0, std::move(tile2));
EXPECT_EQ(tile1Id, static_cast<VectorTileMock*>(cache.get(id0))->uniqueId);
// Evict on add
cache.setSize(1);
cache.add(id1, std::move(tile3));
EXPECT_FALSE(cache.has(id0));
EXPECT_TRUE(cache.has(id1));
// Evict due to size limit change
cache.setSize(2);
cache.add(id0, std::move(tile4));
EXPECT_TRUE(cache.has(id0));
EXPECT_TRUE(cache.has(id1));
cache.setSize(1);
// older item should be evicted
EXPECT_TRUE(cache.has(id0));
EXPECT_FALSE(cache.has(id1));
}