diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-07-25 21:11:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-25 21:11:41 +0200 |
commit | 36695ac591ef013750e6a278e76121df6892055c (patch) | |
tree | 8b6154eeb445ba2a6bffd3d2b80ea90c636c7d64 /config-model/src/main/java | |
parent | 8a12e553a4aaad226d7e91eac8f0ba7b063ba328 (diff) | |
parent | 3a511e5d749f21e5d261c3ccbbea0943b0366b2f (diff) |
Merge pull request #23536 from vespa-engine/bratseth/cleanup-09v8.23.6
No functional changes
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java | 15 |
2 files changed, 5 insertions, 13 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java index e39b78d0d9f..648ed085a54 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java @@ -36,6 +36,7 @@ import java.util.logging.Level; */ public class CreatePositionZCurve extends Processor { + private boolean useV8GeoPositions = false; private final SDDocumentType repo; public CreatePositionZCurve(Schema schema, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { @@ -43,8 +44,6 @@ public class CreatePositionZCurve extends Processor { this.repo = schema.getDocument(); } - private boolean useV8GeoPositions = false; - @Override public void process(boolean validate, boolean documentsOnly, ModelContext.Properties properties) { this.useV8GeoPositions = properties.featureFlags().useV8GeoPositions(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java index d5a0b97a416..6f0e5a775e9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java @@ -7,8 +7,7 @@ import com.yahoo.vespa.model.AbstractService; import com.yahoo.vespa.model.PortAllocBridge; /** - * Represents the Logserver. There is exactly one logserver in a Vespa - * system. + * Represents the Logserver. There is exactly one logserver in a Vespa system. * * @author gjoranv * @author bjorncs @@ -42,9 +41,7 @@ public class Logserver extends AbstractService { return "exec $ROOT/bin/vespa-logserver-start " + getMyJVMArgs() + " " + getJvmOptions(); } - /** - * @return the jvm args to be used by the logserver. - */ + /** Returns the jvm args to be used by the logserver. */ private String getMyJVMArgs() { StringBuilder sb = new StringBuilder(); sb.append("--add-opens=java.base/java.io=ALL-UNNAMED"); @@ -57,9 +54,7 @@ public class Logserver extends AbstractService { return sb.toString(); } - /** - * Returns the desired base port for this service. - */ + /** Returns the desired base port for this service. */ public int getWantedPort() { return 19080; } @@ -73,9 +68,7 @@ public class Logserver extends AbstractService { return true; // TODO Support dynamic port allocation for logserver } - /** - * @return the number of ports needed by the logserver. - */ + /** Returns the number of ports needed by the logserver. */ public int getPortCount() { return 4; } |