From 604ccf3fa0b7ba53b1a4593d610e89b11212ae5e Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Thu, 16 Jan 2025 20:51:59 -0500 Subject: [PATCH] remove cache --- .../topicreader/JsonIntVectorTopicReader.java | 19 +------------------ .../JsonStringVectorTopicReader.java | 19 +------------------ 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/main/java/io/anserini/search/topicreader/JsonIntVectorTopicReader.java b/src/main/java/io/anserini/search/topicreader/JsonIntVectorTopicReader.java index 10578b64a3..f8a7eb9120 100644 --- a/src/main/java/io/anserini/search/topicreader/JsonIntVectorTopicReader.java +++ b/src/main/java/io/anserini/search/topicreader/JsonIntVectorTopicReader.java @@ -28,16 +28,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class JsonIntVectorTopicReader extends TopicReader { - private final Map vectorCache = new HashMap<>(); public JsonIntVectorTopicReader(Path topicFile) throws IOException { super(topicFile); } - public float[] getVector(Integer qid) { - return vectorCache.get(qid); - } - @Override public SortedMap> read(BufferedReader reader) throws IOException { SortedMap> map = new TreeMap<>(); @@ -47,21 +42,9 @@ public SortedMap> read(BufferedReader reader) throw line = line.trim(); JsonNode lineNode = mapper.readerFor(JsonNode.class).readTree(line); Integer topicID = lineNode.get("qid").asInt(); - JsonNode vectorNode = lineNode.get("vector"); - - // Store vector string for backward compatibility Map fields = new HashMap<>(); - fields.put("vector", vectorNode.toString()); + fields.put("vector", lineNode.get("vector").toString()); map.put(topicID, fields); - - // Cache parsed vector - if (vectorNode.isArray()) { - float[] vector = new float[vectorNode.size()]; - for (int i = 0; i < vectorNode.size(); i++) { - vector[i] = (float) vectorNode.get(i).asDouble(); - } - vectorCache.put(topicID, vector); - } } return map; } diff --git a/src/main/java/io/anserini/search/topicreader/JsonStringVectorTopicReader.java b/src/main/java/io/anserini/search/topicreader/JsonStringVectorTopicReader.java index a9514d9ae9..9545c5162d 100644 --- a/src/main/java/io/anserini/search/topicreader/JsonStringVectorTopicReader.java +++ b/src/main/java/io/anserini/search/topicreader/JsonStringVectorTopicReader.java @@ -29,16 +29,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class JsonStringVectorTopicReader extends TopicReader { - private final Map vectorCache = new HashMap<>(); public JsonStringVectorTopicReader(Path topicFile) throws IOException { super(topicFile); } - public float[] getVector(String qid) { - return vectorCache.get(qid); - } - @Override public SortedMap> read(BufferedReader reader) throws IOException { SortedMap> map = new TreeMap<>(); @@ -48,21 +43,9 @@ public SortedMap> read(BufferedReader reader) throws line = line.trim(); JsonNode lineNode = mapper.readerFor(JsonNode.class).readTree(line); String topicID = lineNode.get("qid").asText(); - JsonNode vectorNode = lineNode.get("vector"); - - // Store vector string for backward compatibility Map fields = new HashMap<>(); - fields.put("vector", vectorNode.toString()); + fields.put("vector", lineNode.get("vector").toString()); map.put(topicID, fields); - - // Cache parsed vector - if (vectorNode.isArray()) { - float[] vector = new float[vectorNode.size()]; - for (int i = 0; i < vectorNode.size(); i++) { - vector[i] = (float) vectorNode.get(i).asDouble(); - } - vectorCache.put(topicID, vector); - } } return map; }