From 3d722314150838693299c1cdc35c3cfc10837987 Mon Sep 17 00:00:00 2001
From: Andreas Huber <bitbucket@lucares.de>
Date: Sat, 16 Oct 2021 15:33:04 +0200
Subject: [PATCH] move filename for keys.csv to UniqueStringIntegerPairs

---
 .../org/lucares/pdb/datastore/internal/DataStore.java     | 6 +-----
 .../main/java/org/lucares/pdb/api/StringCompressor.java   | 4 ++--
 .../org/lucares/pdb/api/UniqueStringIntegerPairs.java     | 8 ++++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
index 000093e..95ddb6d 100644
--- a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
@@ -123,7 +123,7 @@ public class DataStore implements AutoCloseable {
     public DataStore(final Path dataDirectory) throws IOException {
         storageBasePath = storageDirectory(dataDirectory);
 
-        stringCompressor = StringCompressor.create(keyCompressionFile(storageBasePath));
+        stringCompressor = StringCompressor.create(storageBasePath);
         Tags.STRING_COMPRESSOR = stringCompressor;
 
         diskStorage = new PartitionDiskStore(storageBasePath, "data.bs");
@@ -143,10 +143,6 @@ public class DataStore implements AutoCloseable {
         writerCache.addListener((key, value) -> value.close());
     }
 
-    private Path keyCompressionFile(final Path dataDirectory) throws IOException {
-        return dataDirectory.resolve("keys.csv");
-    }
-
     public static Path storageDirectory(final Path dataDirectory) throws IOException {
         return dataDirectory.resolve(SUBDIR_STORAGE);
     }
diff --git a/pdb-api/src/main/java/org/lucares/pdb/api/StringCompressor.java b/pdb-api/src/main/java/org/lucares/pdb/api/StringCompressor.java
index eb91da0..37834ba 100644
--- a/pdb-api/src/main/java/org/lucares/pdb/api/StringCompressor.java
+++ b/pdb-api/src/main/java/org/lucares/pdb/api/StringCompressor.java
@@ -21,8 +21,8 @@ public class StringCompressor {
         this.usip = usip;
     }
 
-    public static StringCompressor create(final Path path) {
-        final UniqueStringIntegerPairs mapsi = new UniqueStringIntegerPairs(path);
+    public static StringCompressor create(final Path storageBasePath) {
+        final UniqueStringIntegerPairs mapsi = new UniqueStringIntegerPairs(storageBasePath);
         final StringCompressor result = new StringCompressor(mapsi);
 
         result.put(ALL_DOCS_KEY);
diff --git a/pdb-api/src/main/java/org/lucares/pdb/api/UniqueStringIntegerPairs.java b/pdb-api/src/main/java/org/lucares/pdb/api/UniqueStringIntegerPairs.java
index 05e8960..61a8cf5 100644
--- a/pdb-api/src/main/java/org/lucares/pdb/api/UniqueStringIntegerPairs.java
+++ b/pdb-api/src/main/java/org/lucares/pdb/api/UniqueStringIntegerPairs.java
@@ -103,13 +103,17 @@ public class UniqueStringIntegerPairs {
         this(null);
     }
 
-    public UniqueStringIntegerPairs(final Path file) {
-        this.file = file;
+    public UniqueStringIntegerPairs(final Path storageBasePath) {
+        this.file = keyCompressionFile(storageBasePath);
         if (file != null) {
             init(file);
         }
     }
 
+    private Path keyCompressionFile(final Path dataDirectory) {
+        return dataDirectory.resolve("keys.csv");
+    }
+
     private void init(final Path file) throws RuntimeIOException {
 
         try {