add getCurrentIndex method for QueryHandler

dice-group · Sep 21, 2023 · abe29cc · abe29cc
1 parent 2f0d94b
commit abe29cc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java b/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java
@@ -203,22 +203,15 @@ public QueryStreamWrapper getNextQueryStream() throws IOException {
         return new QueryStreamWrapper(queryIndex, this.queryList.getQueryStream(queryIndex));
     }
 
-    public QueryStreamSupplierWrapper getNextQueryStreamSupplier() {
-        final var queryIndex = this.querySelector.getNextIndex();
-        return new QueryStreamSupplierWrapper(queryIndex, () -> {
-            try {
-                return this.queryList.getQueryStream(queryIndex);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
     @Override
     public int hashCode() {
         return hashCode;
     }
 
+    public int getCurrentQueryID() {
+        return this.querySelector.getCurrentIndex();
+    }
+
     public int getQueryCount() {
         return this.queryList.size();
     }

diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java
@@ -26,4 +26,6 @@ public QuerySelector(int size) {
      * @return the next query index
      */
     public abstract int getNextIndex();
+
+    public abstract int getCurrentIndex();
 }
diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java
@@ -25,4 +25,9 @@ public int getNextIndex() {
         this.threadLocalIndex.set(index + 1);
         return index;
     }
+
+    @Override
+    public int getCurrentIndex() {
+        return threadLocalIndex.get();
+    }
 }
diff --git a/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java
@@ -14,7 +14,7 @@
 public class RandomQuerySelector extends QuerySelector {
 
     final protected Random indexGenerator;
-
+    int currentIndex;
 
     public RandomQuerySelector(int size, long seed) {
         super(size);
@@ -23,6 +23,11 @@ public RandomQuerySelector(int size, long seed) {
 
     @Override
     public int getNextIndex() {
-        return this.indexGenerator.nextInt(this.size);
+        return currentIndex = this.indexGenerator.nextInt(this.size);
+    }
+
+    @Override
+    public int getCurrentIndex() {
+        return currentIndex;
     }
 }