Change keystore implementation to live in a module

Signed-off-by: Peter Alfonsi <[email protected]>

modules/roaringbitmap-keystore/build.gradle

@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+opensearchplugin {
+  description 'Roaring bitmap-based implementation of a key lookup store, used for tiered caching.'
+  classname 'org.opensearch.cache.RoaringBitmapKeystorePlugin'
+  hasClientJar = true
+}
+
+dependencies {
+  api 'org.roaringbitmap:RoaringBitmap:0.9.49'
+  runtimeOnly 'org.roaringbitmap:shims:0.9.49'
+}

server/src/main/java/org/opensearch/common/cache/tier/keystore/KeyStoreStats.java → modules/roaringbitmap-keystore/src/main/java/org/opensearch/cache/KeyStoreStats.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier.keystore;
+package org.opensearch.cache;
 
 import org.opensearch.common.metrics.CounterMetric;
 
@@ -35,3 +35,4 @@ protected KeyStoreStats(long memSizeCapInBytes) {
         this.numSuccessfulRemovals = new CounterMetric();
     }
 }
+

server/src/main/java/org/opensearch/common/cache/tier/keystore/RBMIntKeyLookupStore.java → modules/roaringbitmap-keystore/src/main/java/org/opensearch/cache/RBMIntKeyLookupStore.java

@@ -6,35 +6,11 @@
  * compatible open source license.
  */
 
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+package org.opensearch.cache;
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-package org.opensearch.common.cache.tier.keystore;
 
+import org.opensearch.common.cache.tier.keystore.KeyLookupStore;
 import org.opensearch.common.metrics.CounterMetric;
-import org.opensearch.common.settings.ClusterSettings;
-import org.opensearch.common.settings.Setting;
 import org.opensearch.core.common.unit.ByteSizeValue;
 
 import java.util.HashMap;
@@ -407,3 +383,4 @@ protected void setMemSizeCap(ByteSizeValue newMemSizeCap) {
         }
     }
 }
+

modules/roaringbitmap-keystore/src/main/java/org/opensearch/cache/RoaringBitmapKeystoreModulePlugin.java

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.cache;
+import org.opensearch.plugins.Plugin;
+
+public class RoaringBitmapKeystoreModulePlugin extends Plugin {
+}

server/src/test/java/org/opensearch/common/cache/tier/keystore/RBMIntKeyLookupStoreTests.java → modules/roaringbitmap-keystore/src/test/java/org/opensearch/cache/RBMIntKeyLookupStoreTests.java

@@ -6,30 +6,7 @@
  * compatible open source license.
  */
 
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-package org.opensearch.common.cache.tier.keystore;
+package org.opensearch.cache;
 
 import org.opensearch.common.Randomness;
 import org.opensearch.common.metrics.CounterMetric;
@@ -429,3 +406,4 @@ public void testSetMemSizeCap() throws Exception {
         assertFalse(kls.add(rand.nextInt()));
     }
 }
+

server/build.gradle

@@ -124,10 +124,6 @@ dependencies {
   api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"
 
-  // roaring bitmaps
-  api 'org.roaringbitmap:RoaringBitmap:0.9.49'
-  runtimeOnly 'org.roaringbitmap:shims:0.9.49' // might fix complaining about ArraysShims?
-
   testImplementation(project(":test:framework")) {
     // tests use the locally compiled version of server
     exclude group: 'org.opensearch', module: 'server'