diff options
3 files changed, 19 insertions, 19 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java index 0ce7a445ac4..0de5b5ac202 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java @@ -75,7 +75,7 @@ public class PreGeneratedFileRegistry implements FileRegistry { @Override public FileReference addUri(String uri) { - // TODO: uri's should also be pregenrated. + // TODO: uri's should also be pregenerated. return null; } diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java b/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java index 1f1e73c8eed..15ae4294762 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/FileRegistry.java @@ -1,13 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application.api; -import java.nio.ByteBuffer; import java.util.List; -import java.util.Set; import com.yahoo.config.FileReference; -import com.yahoo.text.Utf8; -import net.jpountz.xxhash.XXHashFactory; + /** * @author tonytv @@ -34,16 +31,4 @@ public interface FileRegistry { } } - static String uriToRelativeFile(String uri) { - String relative = "uri/" + String.valueOf(XXHashFactory.nativeInstance().hash64().hash(ByteBuffer.wrap(Utf8.toBytes(uri)), 0)); - if (uri.endsWith(".json")) { - relative += ".json"; - } else if (uri.endsWith(".json.lz4")) { - relative += ".json.lz4"; - } else if (uri.endsWith(".lz4")) { - relative += ".lz4"; - } - return relative; - } - } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java index 98403d109f3..b0a802d831d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java @@ -4,7 +4,10 @@ package com.yahoo.vespa.config.server.filedistribution; import com.yahoo.config.FileReference; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.net.HostName; +import com.yahoo.text.Utf8; +import net.jpountz.xxhash.XXHashFactory; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +38,7 @@ public class FileDBRegistry implements FileRegistry { } public synchronized FileReference addUri(String uri, FileReference reference) { - String relativePath = FileRegistry.uriToRelativeFile(uri); + String relativePath = uriToRelativeFile(uri); Optional<FileReference> cachedReference = Optional.ofNullable(fileReferenceCache.get(uri)); return cachedReference.orElseGet(() -> { FileReference newRef = manager.addUri(uri, relativePath, reference); @@ -58,7 +61,7 @@ public class FileDBRegistry implements FileRegistry { @Override public synchronized FileReference addUri(String uri) { - String relativePath = FileRegistry.uriToRelativeFile(uri); + String relativePath = uriToRelativeFile(uri); Optional<FileReference> cachedReference = Optional.ofNullable(fileReferenceCache.get(uri)); return cachedReference.orElseGet(() -> { FileReference newRef = manager.addUri(uri, relativePath); @@ -78,4 +81,16 @@ public class FileDBRegistry implements FileRegistry { return entries; } + private static String uriToRelativeFile(String uri) { + String relative = "uri/" + String.valueOf(XXHashFactory.nativeInstance().hash64().hash(ByteBuffer.wrap(Utf8.toBytes(uri)), 0)); + if (uri.endsWith(".json")) { + relative += ".json"; + } else if (uri.endsWith(".json.lz4")) { + relative += ".json.lz4"; + } else if (uri.endsWith(".lz4")) { + relative += ".lz4"; + } + return relative; + } + } |