Use PrimaryIndex

ebi-pf-team · Jan 5, 2025 · 1e05a1e · 1e05a1e
1 parent 5cf70ec
commit 1e05a1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...main/java/uk/ac/ebi/interpro/scan/precalc/server/service/impl/BerkeleyMatchDBService.java b/...main/java/uk/ac/ebi/interpro/scan/precalc/server/service/impl/BerkeleyMatchDBService.java
@@ -29,7 +29,7 @@ public class BerkeleyMatchDBService extends AbstractDBService {
 
     private String databasePath;
 
-    private SecondaryIndex<String, Long, KVSequenceEntry> secIDX = null;
+    private PrimaryIndex<String, KVSequenceEntry> index = null;
 
     private int cacheSizeInBytes;
 
@@ -65,8 +65,8 @@ protected void finalize() throws Throwable {
         shutdown();
     }
 
-    SecondaryIndex<String, Long, KVSequenceEntry> getMD5Index() {
-        return secIDX;
+    PrimaryIndex<String, KVSequenceEntry> getMD5Index() {
+        return index;
     }
 
     private void initializeMD5Index() {
@@ -89,9 +89,7 @@ private void initializeMD5Index() {
         myEnv = new Environment(file, myEnvConfig);
         store = new EntityStore(myEnv, "EntityStore", storeConfig);
 
-
-        PrimaryIndex<Long, KVSequenceEntry> primIDX = store.getPrimaryIndex(Long.class, KVSequenceEntry.class);
-        secIDX = store.getSecondaryIndex(primIDX, String.class, "proteinMD5");
+        index = store.getPrimaryIndex(String.class, KVSequenceEntry.class);
     }
 
     public void displayServerStats(){

diff --git a/.../main/java/uk/ac/ebi/interpro/scan/precalc/server/service/impl/BerkeleySiteDBService.java b/.../main/java/uk/ac/ebi/interpro/scan/precalc/server/service/impl/BerkeleySiteDBService.java
@@ -30,7 +30,7 @@ public class BerkeleySiteDBService extends AbstractDBService {
 
     private String databasePath;
 
-    private SecondaryIndex<String, Long, KVSequenceEntry> secIDX = null;
+    private PrimaryIndex<String, KVSequenceEntry> index = null;
 
     private int cacheSizeInBytes;
 
@@ -66,8 +66,8 @@ protected void finalize() throws Throwable {
         shutdown();
     }
 
-    SecondaryIndex<String, Long, KVSequenceEntry> getMD5Index() {
-        return secIDX;
+    PrimaryIndex<String, KVSequenceEntry> getMD5Index() {
+        return index;
     }
 
     private void initializeMD5Index() {
@@ -90,9 +90,7 @@ private void initializeMD5Index() {
         myEnv = new Environment(file, myEnvConfig);
         store = new EntityStore(myEnv, "EntityStore", storeConfig);
 
-
-        PrimaryIndex<Long, KVSequenceEntry> primIDX = store.getPrimaryIndex(Long.class, KVSequenceEntry.class);
-        secIDX = store.getSecondaryIndex(primIDX, String.class, "proteinMD5");
+        index = store.getPrimaryIndex(String.class, KVSequenceEntry.class);
     }
 
     public void displayServerStats(){