Skip to content

Fix testPurgeCacheEntriesForDatabase on Windows #129648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 19, 2025
Merged

Fix testPurgeCacheEntriesForDatabase on Windows #129648

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe9776f
Fix `testPurgeCacheEntriesForDatabase` on Windows
PeteGillinElastic Jun 18, 2025
d3fdec3
Finish incomplete implementation comment
PeteGillinElastic Jun 18, 2025
fbdc44a
Merge remote-tracking branch 'upstream/main' into fix-geoip-purge-tes…
PeteGillinElastic Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.ingest.geoip.stats.CacheStats;
import org.elasticsearch.test.ESTestCase;

import java.nio.file.Path;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
Expand Down Expand Up @@ -140,23 +141,24 @@ public void testPurgeCacheEntriesForDatabase() {
GeoIpCache cache = new GeoIpCache(100);
ProjectId projectId1 = randomUniqueProjectId();
ProjectId projectId2 = randomUniqueProjectId();
String databasePath1 = "path/to/db1";
String databasePath2 = "path/to/db2";
// Turn the path strings into Paths to ensure that
Path databasePath1 = PathUtils.get("path/to/db1");
Path databasePath2 = PathUtils.get("path/to/db2");
String ip1 = "127.0.0.1";
String ip2 = "127.0.0.2";

AbstractResponse response = mock(AbstractResponse.class);
cache.putIfAbsent(projectId1, ip1, databasePath1, ip -> response); // cache miss
cache.putIfAbsent(projectId1, ip2, databasePath1, ip -> response); // cache miss
cache.putIfAbsent(projectId2, ip1, databasePath1, ip -> response); // cache miss
cache.putIfAbsent(projectId1, ip1, databasePath2, ip -> response); // cache miss
cache.purgeCacheEntriesForDatabase(projectId1, PathUtils.get(databasePath1));
cache.putIfAbsent(projectId1, ip1, databasePath1.toString(), ip -> response); // cache miss
cache.putIfAbsent(projectId1, ip2, databasePath1.toString(), ip -> response); // cache miss
cache.putIfAbsent(projectId2, ip1, databasePath1.toString(), ip -> response); // cache miss
cache.putIfAbsent(projectId1, ip1, databasePath2.toString(), ip -> response); // cache miss
cache.purgeCacheEntriesForDatabase(projectId1, databasePath1);
// should have purged entries for projectId1 and databasePath1...
assertNull(cache.get(projectId1, ip1, databasePath1));
assertNull(cache.get(projectId1, ip2, databasePath1));
assertNull(cache.get(projectId1, ip1, databasePath1.toString()));
assertNull(cache.get(projectId1, ip2, databasePath1.toString()));
// ...but left the one for projectId2...
assertSame(response, cache.get(projectId2, ip1, databasePath1));
assertSame(response, cache.get(projectId2, ip1, databasePath1.toString()));
// ...and for databasePath2:
assertSame(response, cache.get(projectId1, ip1, databasePath2));
assertSame(response, cache.get(projectId1, ip1, databasePath2.toString()));
}
}