remove ohc cache library from the simulator as no longer maintained

ben-manes · Nov 26, 2023 · 5456ce4 · 5456ce4
1 parent 57851e2
commit 5456ce4
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 152 deletions.
diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml
@@ -24,6 +24,8 @@ jobs:
           allowed-endpoints: ${{ env.ALLOWED_ENDPOINTS }}
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
       - name: Run gitleaks
         uses: gitleaks/gitleaks-action@1f2d10fb689bc07a5f56f48d6db61f5bbbe772fa # v2.3.2
         env:

diff --git a/gradle/config/spotbugs/exclude.xml b/gradle/config/spotbugs/exclude.xml
@@ -8,6 +8,7 @@
       ACEM_ABSTRACT_CLASS_EMPTY_METHODS,
       AI_ANNOTATION_ISSUES_NEEDS_NULLABLE,
       AOM_ABSTRACT_OVERRIDDEN_METHOD,
+      BAS_BLOATED_ASSIGNMENT_SCOPE,
       BL_BURYING_LOGIC,
       CE_CLASS_ENVY,
       CFS_CONFUSING_FUNCTION_SEMANTICS,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ commons-text = "1.11.0"
 concurrentlinkedhashmap = "1.4.2"
 config = "1.4.3"
 coveralls = "2.12.2"
-dependency-check = "9.0.0"
+dependency-check = "9.0.1"
 eclipse-collections = "12.0.0.M3"
 ehcache3 = "3.10.8"
 errorprone-core = "2.23.0"
@@ -67,7 +67,6 @@ mockito = "5.7.0"
 nexus-publish = "2.0.0-rc-1"
 nullaway-core = "0.10.17"
 nullaway-plugin = "1.6.0"
-ohc = "0.6.1"
 okhttp = "4.12.0"
 osgi-annotations = "1.5.1"
 osgi-function = "1.2.0"
@@ -81,7 +80,7 @@ slf4j = "2.0.9"
 slf4j-test = "3.0.1"
 snakeyaml = "2.2"
 sonarqube = "4.4.1.3373"
-spotbugs-contrib = "7.6.0"
+spotbugs-contrib = "7.6.1"
 spotbugs-core = "4.8.1"
 spotbugs-plugin = "6.0.0-rc.2"
 stream = "2.9.8"
@@ -176,7 +175,6 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "nexus-publish" }
 nullaway-core = { module = "com.uber.nullaway:nullaway", version.ref = "nullaway-core" }
 nullaway-plugin = { module = "net.ltgt.gradle:gradle-nullaway-plugin", version.ref = "nullaway-plugin" }
-ohc = { module = "org.caffinitas.ohc:ohc-core-j8", version.ref = "ohc" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 osgi-annotations = { module = "org.osgi:org.osgi.service.component.annotations", version.ref = "osgi-annotations" }
 osgi-function = { module = "org.osgi:org.osgi.util.function", version.ref = "osgi-function" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-4-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/simulator/build.gradle.kts b/simulator/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
   implementation(project(":caffeine"))
 
   implementation(libs.xz)
-  implementation(libs.ohc)
   implementation(libs.ycsb) {
     isTransitive = false
   }

diff --git a/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/Registry.java b/simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/Registry.java
@@ -58,7 +58,6 @@
 import com.github.benmanes.caffeine.cache.simulator.policy.product.ExpiringMapPolicy;
 import com.github.benmanes.caffeine.cache.simulator.policy.product.GuavaPolicy;
 import com.github.benmanes.caffeine.cache.simulator.policy.product.HazelcastPolicy;
-import com.github.benmanes.caffeine.cache.simulator.policy.product.OhcPolicy;
 import com.github.benmanes.caffeine.cache.simulator.policy.product.TCachePolicy;
 import com.github.benmanes.caffeine.cache.simulator.policy.sampled.SampledPolicy;
 import com.github.benmanes.caffeine.cache.simulator.policy.sketch.WindowTinyLfuPolicy;
@@ -223,7 +222,6 @@ private void registerGreedyDual() {
   private void registerProduct() {
     register(GuavaPolicy.class, GuavaPolicy::new);
     register(Cache2kPolicy.class, Cache2kPolicy::new);
-    registerMany(OhcPolicy.class, OhcPolicy::policies);
     register(CaffeinePolicy.class, CaffeinePolicy::new);
     register(Ehcache3Policy.class, Ehcache3Policy::new);
     registerMany(TCachePolicy.class, TCachePolicy::policies);

diff --git a/.../src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/product/OhcPolicy.java b/.../src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/product/OhcPolicy.java
diff --git a/simulator/src/main/resources/reference.conf b/simulator/src/main/resources/reference.conf
@@ -98,7 +98,6 @@ caffeine.simulator {
     adaptive.Cart,
 
     # Caching products
-    product.OHC,
     product.Guava,
     product.TCache,
     product.Cache2k,
@@ -451,13 +450,6 @@ caffeine.simulator {
     policy = [ lru ]
   }
 
-  ohc {
-    # Policies: Lru, W-TinyLfu
-    policy = [lru, w-tinylfu]
-    # The percentage for the EDEN space (admission window)
-    percent-eden = 0.20
-  }
-
   tcache {
     # Policies: Lru, Lfu
     policy = [ lru, lfu ]