diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-13 17:09:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 17:09:22 +0200 |
| commit | 6a64952133fc05136a0e445851b49bd0fc71c00e (patch) | |
| tree | adac15bff93c68cab36a260227aef3045e17901a /config-model | |
| parent | 7fb03521cec9c9d299ce9992cc0f92ead6194abd (diff) | |
| parent | 50d50dacdcc864f5ed6683e8f9887634846bbaae (diff) | |
Merge pull request #2720 from yahoo/balder/add-zstd-compressor
Balder/add zstd compressor
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java | 1 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/content.rnc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java index 5e02a6a84d1..38c7e8524b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java @@ -210,6 +210,7 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P public static class Compression { public enum Type { NONE("NONE"), + ZSTD("ZSTD"), LZ4("LZ4"); public final String name; diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc index 66e97e76aa4..88527951ccc 100644 --- a/config-model/src/main/resources/schema/content.rnc +++ b/config-model/src/main/resources/schema/content.rnc @@ -361,6 +361,6 @@ TuningIoOptionsLight = string "normal" | string "directio" TuningIoOptionsFull = string "normal" | string "directio" | string "mmap" | string "mlock" TuningCompression = element compression { - element type { string "none" | string "lz4" }? & + element type { string "none" | string "lz4" | string "zstd" }? & element level { xsd:nonNegativeInteger }? } |