diff options
Diffstat (limited to 'flags')
3 files changed, 7 insertions, 16 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 95704e3240e..feac5d668e7 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -233,20 +233,6 @@ public class Flags { "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); - public static final UnboundIntFlag MAX_CONCURRENT_MERGES_PER_NODE = defineIntFlag( - "max-concurrent-merges-per-node", 16, - List.of("balder", "vekterli"), "2021-06-06", "2022-12-01", - "Specifies max concurrent merges per content node.", - "Takes effect at redeploy", - ZONE_ID, APPLICATION_ID); - - public static final UnboundIntFlag MAX_MERGE_QUEUE_SIZE = defineIntFlag( - "max-merge-queue-size", 100, - List.of("balder", "vekterli"), "2021-06-06", "2022-12-01", - "Specifies max size of merge queue.", - "Takes effect at redeploy", - ZONE_ID, APPLICATION_ID); - public static final UnboundDoubleFlag MIN_NODE_RATIO_PER_GROUP = defineDoubleFlag( "min-node-ratio-per-group", 0.0, List.of("geirst", "vekterli"), "2021-07-16", "2022-11-01", diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java index c2a7ce56054..ad1242aa7e9 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java @@ -11,7 +11,9 @@ import java.util.stream.Collectors; * @author hakonhall */ public class DimensionHelper { - private static Map<FetchVector.Dimension, String> serializedDimensions = new HashMap<>(); + + private static final Map<FetchVector.Dimension, String> serializedDimensions = new HashMap<>(); + static { serializedDimensions.put(FetchVector.Dimension.ZONE_ID, "zone"); serializedDimensions.put(FetchVector.Dimension.HOSTNAME, "hostname"); @@ -29,7 +31,7 @@ public class DimensionHelper { } } - private static Map<String, FetchVector.Dimension> deserializedDimensions = serializedDimensions. + private static final Map<String, FetchVector.Dimension> deserializedDimensions = serializedDimensions. entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); public static String toWire(FetchVector.Dimension dimension) { @@ -51,4 +53,5 @@ public class DimensionHelper { } private DimensionHelper() { } + } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java b/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java index 0b19be21b76..c0bb3128924 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; * @author hakonhall */ public class FetchVectorHelper { + public static Map<String, String> toWire(FetchVector vector) { Map<FetchVector.Dimension, String> map = vector.toMap(); if (map.isEmpty()) return null; @@ -24,4 +25,5 @@ public class FetchVectorHelper { entry -> DimensionHelper.fromWire(entry.getKey()), Map.Entry::getValue))); } + } |