diff options
| author | Harald Musum <musum@oath.com> | 2017-11-08 08:42:22 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-11-08 08:42:22 +0100 |
| commit | 8fb495a3be28e17d3f712ab27f5723d96ed4bc70 (patch) | |
| tree | ee83efe80bd70b02ae533b523da23205dc39d7cd /configserver | |
| parent | 5de5543004c012df2b1a689d8d01bd01d27b9e60 (diff) | |
Depend on lz4 (for xxhash) and add no-arg FileServer constructor
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/pom.xml | 5 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index 8776fbd5ad1..4ebb76bd5fe 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -172,6 +172,11 @@ <artifactId>jersey-proxy-client</artifactId> </dependency> <dependency> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java index 4b0b19a34d0..eb8fb5bf4d7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java @@ -1,6 +1,8 @@ package com.yahoo.vespa.config.server.filedistribution; +import com.google.inject.Inject; import com.yahoo.config.FileReference; +import com.yahoo.config.model.api.FileDistribution; import com.yahoo.io.IOUtils; import com.yahoo.jrt.DataValue; import com.yahoo.jrt.Int32Value; @@ -27,9 +29,13 @@ public class FileServer { return rootDir + "/" + ref.value(); } + @Inject + public FileServer() { + this(FileDistribution.getDefaultFileDBRoot()); + } + public FileServer(String rootDir) { this(rootDir, Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())); - } public FileServer(String rootDir, ExecutorService executor) { |