mapped everything

Author: hmottestad

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/SketchBasedJoinEstimator.java

@@ -75,6 +75,9 @@ private void run() {
 
 	void checkMemory() {
 		double heapPressure = (double) memoryProbe.usedHeapBytes() / Math.max(1L, memoryProbe.maxMemoryBytes());
+//		if (heapPressure > 0.5) {
+//		System.out.println("Heap pressure: " + (int) (heapPressure * 100) + "%");
+//		}
 		if (heapPressure < memoryPolicy.highMemoryPressurePercent) {
 			evictionController.enforceResidentCeiling();
 			return;
@@ -83,6 +86,11 @@ void checkMemory() {
 		while (!closed && heapPressure >= memoryPolicy.highMemoryPressurePercent
 				&& evictionController.activeLoadedBucketCount() > floor) {
 			int evicted = evictionController.evictLruBatch(memoryPolicy.memoryPressureUnloadBatchSize);
+			System.gc();
+			logger.warn(
+					"High memory pressure detected ({}% used), evicted {} loaded buckets, active loaded buckets: {}, heap pressure after eviction: {}%",
+					(int) (heapPressure * 100), evicted, evictionController.activeLoadedBucketCount(),
+					(int) (heapPressure * 100));
 			if (evicted <= 0) {
 				return;
 			}

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/SketchEstimatorMemoryMonitor.java

@@ -62,11 +62,11 @@ private SketchEstimatorMemoryPolicy(int bucketCount, int sketchNominalEntries, b
 	static SketchEstimatorMemoryPolicy resolve(SketchBasedJoinEstimator.Config config,
 			SketchEstimatorMemoryProbe memoryProbe) {
 		long maxMemoryBytes = Math.max(1L, memoryProbe.maxMemoryBytes());
-		double estimatorBudget = clampPercent(config.estimatorMemoryBudgetPercent, 0.50d);
-		double residentTarget = clampPercent(config.residentSketchMemoryTargetPercent, 0.25d);
+		double estimatorBudget = clampPercent(config.estimatorMemoryBudgetPercent, 0.70d);
+		double residentTarget = clampPercent(config.residentSketchMemoryTargetPercent, 0.50d);
 		double residentCeiling = Math.max(residentTarget,
-				clampPercent(config.residentSketchMemoryCeilingPercent, 0.30d));
-		double highPressure = clampPercent(config.highMemoryPressurePercent, 0.80d);
+				clampPercent(config.residentSketchMemoryCeilingPercent, 0.70d));
+		double highPressure = clampPercent(config.highMemoryPressurePercent, 0.75d);
 		double loadedFloor = clampPercent(config.loadedBucketFloorPercent, 0.05d);
 
 		int bucketCount = Math.max(MIN_BUCKET_COUNT, config.nominalEntries);