diff options
Diffstat (limited to 'config-model')
97 files changed, 36 insertions, 586 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index fa2fbb95689..87ff9d1bb2a 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -39,7 +39,6 @@ public class TestProperties implements ModelContext.Properties { private boolean useFdispatchByDefault = true; private boolean dispatchWithProtobuf = true; private boolean useAdaptiveDispatch = false; - private boolean enableMetricsProxyContainer = false; @Override public boolean multitenant() { return multitenant; } @@ -59,7 +58,6 @@ public class TestProperties implements ModelContext.Properties { @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @Override public boolean useFdispatchByDefault() { return useFdispatchByDefault; } @Override public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; } - @Override public boolean enableMetricsProxyContainer() { return enableMetricsProxyContainer; } public TestProperties setApplicationId(ApplicationId applicationId) { this.applicationId = applicationId; @@ -91,10 +89,6 @@ public class TestProperties implements ModelContext.Properties { return this; } - public TestProperties setEnableMetricsProxyContainer(boolean enableMetricsProxyContainer) { - this.enableMetricsProxyContainer = enableMetricsProxyContainer; - return this; - } public static class Spec implements ConfigServerSpec { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java index f846eabbff8..e75547a5bb2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java @@ -21,13 +21,13 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; */ public class AddExtraFieldsToDocument extends Processor { - public AddExtraFieldsToDocument(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { + AddExtraFieldsToDocument(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { super(search, deployLogger, rankProfileRegistry, queryProfiles); } //TODO This is a tempoarry hack to avoid producing illegal code for fields not wanted anyway. private boolean dirtyLegalFieldNameCheck(String fieldName) { - return ! fieldName.contains("."); + return ! fieldName.contains(".") && !"rankfeatures".equals(fieldName) && !"summaryfeatures".equals(fieldName); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 9e0bbc395df..0dde5c99d4a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -56,7 +56,8 @@ public class HostSystem extends AbstractConfigProducer<Host> { } if (! hostname.contains(".")) { deployLogger.log(Level.WARNING, "Host named '" + hostname + "' may not receive any config " + - "since it is not a canonical hostname"); + "since it is not a canonical hostname." + + "Disregard this warning when testing in a Docker container."); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java index fe40e6ffa84..29d1b557c49 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java @@ -10,14 +10,12 @@ import com.yahoo.vespa.model.admin.monitoring.MetricSet; import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.getDefaultMetricsConsumer; +import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID; /** * Helper class to generate config for metrics consumers. diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java index 3bc38cad1d1..2a698233713 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java @@ -19,10 +19,8 @@ import java.util.LinkedHashMap; import java.util.Map; import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; -import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CANONICAL_FLAVOR; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CLUSTER_ID; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CLUSTER_TYPE; -import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.FLAVOR; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.METRICS_PROXY_BUNDLE_NAME; /** @@ -37,8 +35,6 @@ public class MetricsProxyContainer extends Container implements { static final class NodeDimensionNames { - static final String FLAVOR = "flavor"; - static final String CANONICAL_FLAVOR = "canonicalFlavor"; static final String CLUSTER_TYPE = "clustertype"; static final String CLUSTER_ID = "clusterid"; } @@ -118,11 +114,6 @@ public class MetricsProxyContainer extends Container implements public void getConfig(NodeDimensionsConfig.Builder builder) { Map<String, String> dimensions = new LinkedHashMap<>(); if (isHostedVespa) { - getHostResource().getFlavor().ifPresent(flavor -> { - dimensions.put(FLAVOR, flavor.name()); - dimensions.put(CANONICAL_FLAVOR, flavor.canonicalName()); - }); - getHostResource().primaryClusterMembership().map(ClusterMembership::cluster).ifPresent(cluster -> { dimensions.put(CLUSTER_TYPE, cluster.type().name()); dimensions.put(CLUSTER_ID, cluster.id().value()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index 47c6b2dbb52..5a41696c6f2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -47,7 +47,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerClus import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.LEGACY_APPLICATION; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.TENANT; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.ZONE; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.getDefaultMetricsConsumer; +import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.getVespaMetricsConsumer; import static com.yahoo.vespa.model.admin.monitoring.MetricSet.emptyMetricSet; import static com.yahoo.vespa.model.container.xml.BundleMapper.JarSuffix.JAR_WITH_DEPS; import static com.yahoo.vespa.model.container.xml.BundleMapper.absoluteBundlePath; @@ -128,7 +128,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC @Override public void getConfig(ConsumersConfig.Builder builder) { - var amendedDefaultConsumer = addMetrics(getDefaultMetricsConsumer(), getAdditionalDefaultMetrics().getMetrics()); + var amendedDefaultConsumer = addMetrics(getVespaMetricsConsumer(), getAdditionalDefaultMetrics().getMetrics()); builder.consumer.addAll(generateConsumers(amendedDefaultConsumer, getUserMetricsConsumers())); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricsConsumer.java index e9eca67a55a..81e9cfcd6a0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetricsConsumer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricsConsumer.java @@ -10,22 +10,22 @@ import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricS import static java.util.Collections.emptyList; /** - * This class sets up the default 'Vespa' metrics consumer. + * This class sets up the 'Vespa' metrics consumer. * * @author trygve * @author gjoranv */ -public class DefaultMetricsConsumer { +public class VespaMetricsConsumer { public static final String VESPA_CONSUMER_ID = VespaMetrics.VESPA_CONSUMER_ID.id; - private static final MetricSet defaultConsumerMetrics = new MetricSet("default-consumer", + private static final MetricSet defaultConsumerMetrics = new MetricSet("vespa-consumer-metrics", emptyList(), ImmutableList.of(vespaMetricSet, systemMetricSet, networkMetricSet)); - public static MetricsConsumer getDefaultMetricsConsumer() { + public static MetricsConsumer getVespaMetricsConsumer() { return new MetricsConsumer(VESPA_CONSUMER_ID, defaultConsumerMetrics); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java index fab1e90cc03..0ad0d57c1c3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.admin.monitoring.builder.xml; import com.yahoo.config.model.ConfigModelContext.ApplicationType; import com.yahoo.text.XML; -import com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics; import com.yahoo.vespa.model.admin.monitoring.Metric; import com.yahoo.vespa.model.admin.monitoring.MetricSet; import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer; @@ -15,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; +import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 47adac637ee..7a6b1064b24 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -37,6 +37,7 @@ import com.yahoo.search.config.QrStartConfig; import com.yahoo.search.pagetemplates.PageTemplatesConfig; import com.yahoo.search.query.profile.config.QueryProfilesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; +import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.model.PortsMeta; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.admin.monitoring.Monitoring; @@ -63,6 +64,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -190,6 +192,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> addSimpleComponent("com.yahoo.container.handler.VipStatus"); addSimpleComponent(com.yahoo.container.handler.ClustersStatus.class.getName()); addJaxProviders(); + addTestrunnerComponentsIfTester(deployState); } public void setZone(Zone zone) { @@ -204,6 +207,11 @@ public abstract class ContainerCluster<CONTAINER extends Container> addVipHandler(); } + private void addTestrunnerComponentsIfTester(DeployState deployState) { + if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester()) + addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar"))); + } + public final void addDefaultHandlersExceptStatus() { addDefaultRootHandler(); addMetricStateHandler(); diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg index a6a56bf65c1..631886181d7 100644 --- a/config-model/src/test/configmodel/types/documentmanager.cfg +++ b/config-model/src/test/configmodel/types/documentmanager.cfg @@ -214,12 +214,6 @@ datatype[26].structtype[0].field[26].detailedtype "" datatype[26].structtype[0].field[27].name "other" datatype[26].structtype[0].field[27].datatype 4 datatype[26].structtype[0].field[27].detailedtype "" -datatype[26].structtype[0].field[28].name "rankfeatures" -datatype[26].structtype[0].field[28].datatype 2 -datatype[26].structtype[0].field[28].detailedtype "" -datatype[26].structtype[0].field[29].name "summaryfeatures" -datatype[26].structtype[0].field[29].datatype 2 -datatype[26].structtype[0].field[29].detailedtype "" datatype[27].id 348447225 datatype[27].structtype[0].name "types.body" datatype[27].structtype[0].version 0 diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg index 7ff795bc33c..0a78e18dd40 100644 --- a/config-model/src/test/configmodel/types/documenttypes.cfg +++ b/config-model/src/test/configmodel/types/documenttypes.cfg @@ -585,16 +585,6 @@ documenttype[0].datatype[25].sstruct.field[27].id 2443357 documenttype[0].datatype[25].sstruct.field[27].id_v6 903806222 documenttype[0].datatype[25].sstruct.field[27].datatype 4 documenttype[0].datatype[25].sstruct.field[27].detailedtype "" -documenttype[0].datatype[25].sstruct.field[28].name "rankfeatures" -documenttype[0].datatype[25].sstruct.field[28].id 1883197392 -documenttype[0].datatype[25].sstruct.field[28].id_v6 699950698 -documenttype[0].datatype[25].sstruct.field[28].datatype 2 -documenttype[0].datatype[25].sstruct.field[28].detailedtype "" -documenttype[0].datatype[25].sstruct.field[29].name "summaryfeatures" -documenttype[0].datatype[25].sstruct.field[29].id 1840337115 -documenttype[0].datatype[25].sstruct.field[29].id_v6 1981648971 -documenttype[0].datatype[25].sstruct.field[29].datatype 2 -documenttype[0].datatype[25].sstruct.field[29].detailedtype "" documenttype[0].datatype[26].id 348447225 documenttype[0].datatype[26].type STRUCT documenttype[0].datatype[26].array.element.id 0 diff --git a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg index 3073dd55fba..a24fa03a834 100644 --- a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg +++ b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg @@ -20,16 +20,6 @@ documenttype[0].datatype[0].sstruct.compression.type NONE documenttype[0].datatype[0].sstruct.compression.level 0 documenttype[0].datatype[0].sstruct.compression.threshold 95 documenttype[0].datatype[0].sstruct.compression.minsize 200 -documenttype[0].datatype[0].sstruct.field[0].name "rankfeatures" -documenttype[0].datatype[0].sstruct.field[0].id 1883197392 -documenttype[0].datatype[0].sstruct.field[0].id_v6 699950698 -documenttype[0].datatype[0].sstruct.field[0].datatype 2 -documenttype[0].datatype[0].sstruct.field[0].detailedtype "" -documenttype[0].datatype[0].sstruct.field[1].name "summaryfeatures" -documenttype[0].datatype[0].sstruct.field[1].id 1840337115 -documenttype[0].datatype[0].sstruct.field[1].id_v6 1981648971 -documenttype[0].datatype[0].sstruct.field[1].datatype 2 -documenttype[0].datatype[0].sstruct.field[1].detailedtype "" documenttype[0].datatype[1].id 549879017 documenttype[0].datatype[1].type STRUCT documenttype[0].datatype[1].array.element.id 0 @@ -86,16 +76,6 @@ documenttype[1].datatype[1].sstruct.field[0].id 819293364 documenttype[1].datatype[1].sstruct.field[0].id_v6 1634907905 documenttype[1].datatype[1].sstruct.field[0].datatype -1368624373 documenttype[1].datatype[1].sstruct.field[0].detailedtype "" -documenttype[1].datatype[1].sstruct.field[1].name "rankfeatures" -documenttype[1].datatype[1].sstruct.field[1].id 1883197392 -documenttype[1].datatype[1].sstruct.field[1].id_v6 699950698 -documenttype[1].datatype[1].sstruct.field[1].datatype 2 -documenttype[1].datatype[1].sstruct.field[1].detailedtype "" -documenttype[1].datatype[1].sstruct.field[2].name "summaryfeatures" -documenttype[1].datatype[1].sstruct.field[2].id 1840337115 -documenttype[1].datatype[1].sstruct.field[2].id_v6 1981648971 -documenttype[1].datatype[1].sstruct.field[2].datatype 2 -documenttype[1].datatype[1].sstruct.field[2].detailedtype "" documenttype[1].datatype[2].id 348447225 documenttype[1].datatype[2].type STRUCT documenttype[1].datatype[2].array.element.id 0 @@ -111,4 +91,4 @@ documenttype[1].datatype[2].sstruct.compression.type NONE documenttype[1].datatype[2].sstruct.compression.level 0 documenttype[1].datatype[2].sstruct.compression.threshold 95 documenttype[1].datatype[2].sstruct.compression.minsize 200 -documenttype[1].fieldsets{[document]}.fields[0] "doc_field"
\ No newline at end of file +documenttype[1].fieldsets{[document]}.fields[0] "doc_field" diff --git a/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg index 9bfba178915..e624ffdf7f5 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_ref_to_self_type.cfg @@ -24,12 +24,6 @@ datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "self_ref" datatype[].structtype[].field[].datatype -1895788438 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -255288561 datatype[].structtype[].name "ad.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg index 81498f03139..90ddb8c9f8d 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg @@ -29,12 +29,6 @@ datatype[3].structtype[0].field[0].detailedtype "" datatype[3].structtype[0].field[1].name "person_ref" datatype[3].structtype[0].field[1].datatype 542332920 datatype[3].structtype[0].field[1].detailedtype "" -datatype[3].structtype[0].field[2].name "rankfeatures" -datatype[3].structtype[0].field[2].datatype 2 -datatype[3].structtype[0].field[2].detailedtype "" -datatype[3].structtype[0].field[3].name "summaryfeatures" -datatype[3].structtype[0].field[3].datatype 2 -datatype[3].structtype[0].field[3].detailedtype "" datatype[4].id -255288561 datatype[4].structtype[0].name "ad.body" datatype[4].structtype[0].version 0 @@ -58,12 +52,6 @@ datatype[6].structtype[0].compresstype NONE datatype[6].structtype[0].compresslevel 0 datatype[6].structtype[0].compressthreshold 95 datatype[6].structtype[0].compressminsize 800 -datatype[6].structtype[0].field[0].name "rankfeatures" -datatype[6].structtype[0].field[0].datatype 2 -datatype[6].structtype[0].field[0].detailedtype "" -datatype[6].structtype[0].field[1].name "summaryfeatures" -datatype[6].structtype[0].field[1].datatype 2 -datatype[6].structtype[0].field[1].detailedtype "" datatype[7].id 1448849794 datatype[7].structtype[0].name "campaign.body" datatype[7].structtype[0].version 0 @@ -85,12 +73,6 @@ datatype[9].structtype[0].compresstype NONE datatype[9].structtype[0].compresslevel 0 datatype[9].structtype[0].compressthreshold 95 datatype[9].structtype[0].compressminsize 800 -datatype[9].structtype[0].field[0].name "rankfeatures" -datatype[9].structtype[0].field[0].datatype 2 -datatype[9].structtype[0].field[0].detailedtype "" -datatype[9].structtype[0].field[1].name "summaryfeatures" -datatype[9].structtype[0].field[1].datatype 2 -datatype[9].structtype[0].field[1].detailedtype "" datatype[10].id -2003767395 datatype[10].structtype[0].name "person.body" datatype[10].structtype[0].version 0 diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg index 181da48eac4..1807adeb68d 100644 --- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg +++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg @@ -27,12 +27,6 @@ datatype[2].structtype[0].field[0].detailedtype "" datatype[2].structtype[0].field[1].name "other_campaign_ref" datatype[2].structtype[0].field[1].datatype 595216861 datatype[2].structtype[0].field[1].detailedtype "" -datatype[2].structtype[0].field[2].name "rankfeatures" -datatype[2].structtype[0].field[2].datatype 2 -datatype[2].structtype[0].field[2].detailedtype "" -datatype[2].structtype[0].field[3].name "summaryfeatures" -datatype[2].structtype[0].field[3].datatype 2 -datatype[2].structtype[0].field[3].detailedtype "" datatype[3].id -255288561 datatype[3].structtype[0].name "ad.body" datatype[3].structtype[0].version 0 @@ -56,12 +50,6 @@ datatype[5].structtype[0].compresstype NONE datatype[5].structtype[0].compresslevel 0 datatype[5].structtype[0].compressthreshold 95 datatype[5].structtype[0].compressminsize 800 -datatype[5].structtype[0].field[0].name "rankfeatures" -datatype[5].structtype[0].field[0].datatype 2 -datatype[5].structtype[0].field[0].detailedtype "" -datatype[5].structtype[0].field[1].name "summaryfeatures" -datatype[5].structtype[0].field[1].datatype 2 -datatype[5].structtype[0].field[1].detailedtype "" datatype[6].id 1448849794 datatype[6].structtype[0].name "campaign.body" datatype[6].structtype[0].version 0 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg index ca4553f989c..d07b16431be 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg @@ -25,16 +25,6 @@ documenttype[].datatype[].sstruct.field[].id 852207313 documenttype[].datatype[].sstruct.field[].id_v6 768042879 documenttype[].datatype[].sstruct.field[].datatype -1895788438 documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].sstruct.field[].name "rankfeatures" -documenttype[].datatype[].sstruct.field[].id 1883197392 -documenttype[].datatype[].sstruct.field[].id_v6 699950698 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].sstruct.field[].name "summaryfeatures" -documenttype[].datatype[].sstruct.field[].id 1840337115 -documenttype[].datatype[].sstruct.field[].id_v6 1981648971 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -255288561 documenttype[].datatype[].type STRUCT documenttype[].datatype[].array.element.id 0 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg index 3492cd2632b..e3002074d04 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg @@ -30,16 +30,6 @@ documenttype[0].datatype[0].sstruct.field[1].id 100779805 documenttype[0].datatype[0].sstruct.field[1].id_v6 907695193 documenttype[0].datatype[0].sstruct.field[1].datatype 542332920 documenttype[0].datatype[0].sstruct.field[1].detailedtype "" -documenttype[0].datatype[0].sstruct.field[2].name "rankfeatures" -documenttype[0].datatype[0].sstruct.field[2].id 1883197392 -documenttype[0].datatype[0].sstruct.field[2].id_v6 699950698 -documenttype[0].datatype[0].sstruct.field[2].datatype 2 -documenttype[0].datatype[0].sstruct.field[2].detailedtype "" -documenttype[0].datatype[0].sstruct.field[3].name "summaryfeatures" -documenttype[0].datatype[0].sstruct.field[3].id 1840337115 -documenttype[0].datatype[0].sstruct.field[3].id_v6 1981648971 -documenttype[0].datatype[0].sstruct.field[3].datatype 2 -documenttype[0].datatype[0].sstruct.field[3].detailedtype "" documenttype[0].datatype[1].id -255288561 documenttype[0].datatype[1].type STRUCT documenttype[0].datatype[1].array.element.id 0 @@ -82,16 +72,6 @@ documenttype[1].datatype[0].sstruct.compression.type NONE documenttype[1].datatype[0].sstruct.compression.level 0 documenttype[1].datatype[0].sstruct.compression.threshold 95 documenttype[1].datatype[0].sstruct.compression.minsize 200 -documenttype[1].datatype[0].sstruct.field[0].name "rankfeatures" -documenttype[1].datatype[0].sstruct.field[0].id 1883197392 -documenttype[1].datatype[0].sstruct.field[0].id_v6 699950698 -documenttype[1].datatype[0].sstruct.field[0].datatype 2 -documenttype[1].datatype[0].sstruct.field[0].detailedtype "" -documenttype[1].datatype[0].sstruct.field[1].name "summaryfeatures" -documenttype[1].datatype[0].sstruct.field[1].id 1840337115 -documenttype[1].datatype[0].sstruct.field[1].id_v6 1981648971 -documenttype[1].datatype[0].sstruct.field[1].datatype 2 -documenttype[1].datatype[0].sstruct.field[1].detailedtype "" documenttype[1].datatype[1].id 1448849794 documenttype[1].datatype[1].type STRUCT documenttype[1].datatype[1].array.element.id 0 @@ -128,16 +108,6 @@ documenttype[2].datatype[0].sstruct.compression.type NONE documenttype[2].datatype[0].sstruct.compression.level 0 documenttype[2].datatype[0].sstruct.compression.threshold 95 documenttype[2].datatype[0].sstruct.compression.minsize 200 -documenttype[2].datatype[0].sstruct.field[0].name "rankfeatures" -documenttype[2].datatype[0].sstruct.field[0].id 1883197392 -documenttype[2].datatype[0].sstruct.field[0].id_v6 699950698 -documenttype[2].datatype[0].sstruct.field[0].datatype 2 -documenttype[2].datatype[0].sstruct.field[0].detailedtype "" -documenttype[2].datatype[0].sstruct.field[1].name "summaryfeatures" -documenttype[2].datatype[0].sstruct.field[1].id 1840337115 -documenttype[2].datatype[0].sstruct.field[1].id_v6 1981648971 -documenttype[2].datatype[0].sstruct.field[1].datatype 2 -documenttype[2].datatype[0].sstruct.field[1].detailedtype "" documenttype[2].datatype[1].id -2003767395 documenttype[2].datatype[1].type STRUCT documenttype[2].datatype[1].array.element.id 0 diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg index 40743213d9e..d2759d86715 100644 --- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg +++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg @@ -30,16 +30,6 @@ documenttype[0].datatype[0].sstruct.field[1].id 874751172 documenttype[0].datatype[0].sstruct.field[1].id_v6 895644372 documenttype[0].datatype[0].sstruct.field[1].datatype 595216861 documenttype[0].datatype[0].sstruct.field[1].detailedtype "" -documenttype[0].datatype[0].sstruct.field[2].name "rankfeatures" -documenttype[0].datatype[0].sstruct.field[2].id 1883197392 -documenttype[0].datatype[0].sstruct.field[2].id_v6 699950698 -documenttype[0].datatype[0].sstruct.field[2].datatype 2 -documenttype[0].datatype[0].sstruct.field[2].detailedtype "" -documenttype[0].datatype[0].sstruct.field[3].name "summaryfeatures" -documenttype[0].datatype[0].sstruct.field[3].id 1840337115 -documenttype[0].datatype[0].sstruct.field[3].id_v6 1981648971 -documenttype[0].datatype[0].sstruct.field[3].datatype 2 -documenttype[0].datatype[0].sstruct.field[3].detailedtype "" documenttype[0].datatype[1].id -255288561 documenttype[0].datatype[1].type STRUCT documenttype[0].datatype[1].array.element.id 0 @@ -80,16 +70,6 @@ documenttype[1].datatype[0].sstruct.compression.type NONE documenttype[1].datatype[0].sstruct.compression.level 0 documenttype[1].datatype[0].sstruct.compression.threshold 95 documenttype[1].datatype[0].sstruct.compression.minsize 200 -documenttype[1].datatype[0].sstruct.field[0].name "rankfeatures" -documenttype[1].datatype[0].sstruct.field[0].id 1883197392 -documenttype[1].datatype[0].sstruct.field[0].id_v6 699950698 -documenttype[1].datatype[0].sstruct.field[0].datatype 2 -documenttype[1].datatype[0].sstruct.field[0].detailedtype "" -documenttype[1].datatype[0].sstruct.field[1].name "summaryfeatures" -documenttype[1].datatype[0].sstruct.field[1].id 1840337115 -documenttype[1].datatype[0].sstruct.field[1].id_v6 1981648971 -documenttype[1].datatype[0].sstruct.field[1].datatype 2 -documenttype[1].datatype[0].sstruct.field[1].detailedtype "" documenttype[1].datatype[1].id 1448849794 documenttype[1].datatype[1].type STRUCT documenttype[1].datatype[1].array.element.id 0 diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg index 90948ea10d5..a0a59fbf7ac 100644 --- a/config-model/src/test/derived/advanced/documentmanager.cfg +++ b/config-model/src/test/derived/advanced/documentmanager.cfg @@ -67,12 +67,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "mysummary" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -704605648 datatype[].structtype[].name "advanced.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/advanced/index-info.cfg b/config-model/src/test/derived/advanced/index-info.cfg index 726398c1718..162a677be67 100644 --- a/config-model/src/test/derived/advanced/index-info.cfg +++ b/config-model/src/test/derived/advanced/index-info.cfg @@ -71,10 +71,6 @@ indexinfo[].command[].indexname "product3" indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "product3" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" diff --git a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg index 4d81b2e56ba..fae6bd46ad7 100644 --- a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg @@ -29,12 +29,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1503592268 datatype[].structtype[].name "annotationsimplicitstruct.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationsimplicitstruct/index-info.cfg b/config-model/src/test/derived/annotationsimplicitstruct/index-info.cfg index 90b9f1bd32c..f1e8326a3a6 100644 --- a/config-model/src/test/derived/annotationsimplicitstruct/index-info.cfg +++ b/config-model/src/test/derived/annotationsimplicitstruct/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg index 5dd3977e55e..21baed26dbf 100644 --- a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg @@ -94,12 +94,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 1181354668 datatype[].structtype[].name "annotationsinheritance.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationsinheritance/index-info.cfg b/config-model/src/test/derived/annotationsinheritance/index-info.cfg index 2c89b66f061..631bebd4468 100644 --- a/config-model/src/test/derived/annotationsinheritance/index-info.cfg +++ b/config-model/src/test/derived/annotationsinheritance/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg index 7ca4a4f0d6e..3ef71148f12 100644 --- a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg @@ -57,12 +57,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 1375438150 datatype[].structtype[].name "annotationsinheritance2.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationsinheritance2/index-info.cfg b/config-model/src/test/derived/annotationsinheritance2/index-info.cfg index 51527ae2ef9..804227cb88f 100644 --- a/config-model/src/test/derived/annotationsinheritance2/index-info.cfg +++ b/config-model/src/test/derived/annotationsinheritance2/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg index ffc3d4f439f..e9ec2cb3715 100644 --- a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg +++ b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg @@ -31,12 +31,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -570750959 datatype[].structtype[].name "annotationspolymorphy.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationspolymorphy/index-info.cfg b/config-model/src/test/derived/annotationspolymorphy/index-info.cfg index 056cc4dc570..be02d9ab314 100644 --- a/config-model/src/test/derived/annotationspolymorphy/index-info.cfg +++ b/config-model/src/test/derived/annotationspolymorphy/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg index c7d2d5c8753..6526f56a906 100644 --- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg @@ -65,12 +65,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 1692909067 datatype[].structtype[].name "annotationsreference.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationsreference/index-info.cfg b/config-model/src/test/derived/annotationsreference/index-info.cfg index dafe0e292f1..ab99342f4c0 100644 --- a/config-model/src/test/derived/annotationsreference/index-info.cfg +++ b/config-model/src/test/derived/annotationsreference/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationssimple/documentmanager.cfg b/config-model/src/test/derived/annotationssimple/documentmanager.cfg index 7d00cc4fc1a..d32f0addceb 100644 --- a/config-model/src/test/derived/annotationssimple/documentmanager.cfg +++ b/config-model/src/test/derived/annotationssimple/documentmanager.cfg @@ -19,12 +19,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -682121732 datatype[].structtype[].name "annotationssimple.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationssimple/index-info.cfg b/config-model/src/test/derived/annotationssimple/index-info.cfg index d6dbcba4217..8177896c431 100644 --- a/config-model/src/test/derived/annotationssimple/index-info.cfg +++ b/config-model/src/test/derived/annotationssimple/index-info.cfg @@ -3,7 +3,3 @@ indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sddocname" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg index 8677019593c..c91b5c5e97e 100644 --- a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg @@ -39,12 +39,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1180029319 datatype[].structtype[].name "annotationsstruct.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg index 28fa9f9dbc0..22b951b1b5d 100644 --- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg @@ -41,12 +41,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 1616435858 datatype[].structtype[].name "annotationsstructarray.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg b/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg index d2989f44e04..99942d83f91 100644 --- a/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg +++ b/config-model/src/test/derived/array_of_struct_attribute/index-info.cfg @@ -19,7 +19,3 @@ indexinfo[0].command[8].indexname "elem_array" indexinfo[0].command[8].command "index" indexinfo[0].command[9].indexname "elem_array" indexinfo[0].command[9].command "multivalue" -indexinfo[0].command[10].indexname "rankfeatures" -indexinfo[0].command[10].command "index" -indexinfo[0].command[11].indexname "summaryfeatures" -indexinfo[0].command[11].command "index"
\ No newline at end of file diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg index 58bdb56a8dc..a2d8e2e78b4 100644 --- a/config-model/src/test/derived/arrays/documentmanager.cfg +++ b/config-model/src/test/derived/arrays/documentmanager.cfg @@ -42,12 +42,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "c" datatype[].structtype[].field[].datatype 1328286588 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1747896808 datatype[].structtype[].name "arrays.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/arrays/index-info.cfg b/config-model/src/test/derived/arrays/index-info.cfg index b18f1eaf55f..e2a0ea9dedc 100644 --- a/config-model/src/test/derived/arrays/index-info.cfg +++ b/config-model/src/test/derived/arrays/index-info.cfg @@ -55,10 +55,6 @@ indexinfo[].command[].indexname "c" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "c" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "default" diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg index 946003f3aa9..e27c72fbe50 100644 --- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg +++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg @@ -109,12 +109,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "wsstring" datatype[].structtype[].field[].datatype 1328286588 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 932425403 datatype[].structtype[].name "prefetch.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/attributeprefetch/index-info.cfg b/config-model/src/test/derived/attributeprefetch/index-info.cfg index a54010e24df..a113e1f1b20 100644 --- a/config-model/src/test/derived/attributeprefetch/index-info.cfg +++ b/config-model/src/test/derived/attributeprefetch/index-info.cfg @@ -109,7 +109,3 @@ indexinfo[].command[].indexname "wsstring" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "wsstring" indexinfo[].command[].command "attribute" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/attributes/index-info.cfg b/config-model/src/test/derived/attributes/index-info.cfg index df33a41b066..4b06e8dec36 100644 --- a/config-model/src/test/derived/attributes/index-info.cfg +++ b/config-model/src/test/derived/attributes/index-info.cfg @@ -133,10 +133,6 @@ indexinfo[].command[].indexname "a8_arr" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "a8_arr" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "default" diff --git a/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg b/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg index d34b6557e3b..f88524ae220 100644 --- a/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg +++ b/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg @@ -31,10 +31,6 @@ indexinfo[].command[].indexname "attribute2" indexinfo[].command[].command "index" indexinfo[].command[].indexname "attribute2" indexinfo[].command[].command "attribute" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "default" diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg index cd4ea0b212a..42234e52211 100644 --- a/config-model/src/test/derived/complex/documentmanager.cfg +++ b/config-model/src/test/derived/complex/documentmanager.cfg @@ -98,12 +98,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "exact" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1665926686 datatype[].structtype[].name "complex.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/emptydefault/documentmanager.cfg b/config-model/src/test/derived/emptydefault/documentmanager.cfg index 20695652e07..b6cb2d06718 100644 --- a/config-model/src/test/derived/emptydefault/documentmanager.cfg +++ b/config-model/src/test/derived/emptydefault/documentmanager.cfg @@ -25,12 +25,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "two" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 311791038 datatype[].structtype[].name "emptydefault.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/emptydefault/index-info.cfg b/config-model/src/test/derived/emptydefault/index-info.cfg index fbb4c3ebbea..a506ef52b52 100644 --- a/config-model/src/test/derived/emptydefault/index-info.cfg +++ b/config-model/src/test/derived/emptydefault/index-info.cfg @@ -23,7 +23,3 @@ indexinfo[].command[].indexname "two" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "two" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/exactmatch/index-info.cfg b/config-model/src/test/derived/exactmatch/index-info.cfg index 55b6b2d8fcb..a17ff68642e 100644 --- a/config-model/src/test/derived/exactmatch/index-info.cfg +++ b/config-model/src/test/derived/exactmatch/index-info.cfg @@ -15,7 +15,3 @@ indexinfo[].command[].indexname "screweduserids" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "screweduserids" indexinfo[].command[].command "exact *!!!*" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/fieldset/index-info.cfg b/config-model/src/test/derived/fieldset/index-info.cfg index 47dcbe58805..25f37750cc9 100644 --- a/config-model/src/test/derived/fieldset/index-info.cfg +++ b/config-model/src/test/derived/fieldset/index-info.cfg @@ -19,10 +19,6 @@ indexinfo[].command[].indexname "word2" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "word2" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "words" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "words" diff --git a/config-model/src/test/derived/id/documentmanager.cfg b/config-model/src/test/derived/id/documentmanager.cfg index dc9ccf94830..5140abc65fa 100644 --- a/config-model/src/test/derived/id/documentmanager.cfg +++ b/config-model/src/test/derived/id/documentmanager.cfg @@ -22,12 +22,6 @@ datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "uri" datatype[].structtype[].field[].datatype 10 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1830022377 datatype[].structtype[].name "id.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/id/index-info.cfg b/config-model/src/test/derived/id/index-info.cfg index fe066c7d147..ca8daef9848 100644 --- a/config-model/src/test/derived/id/index-info.cfg +++ b/config-model/src/test/derived/id/index-info.cfg @@ -27,10 +27,6 @@ indexinfo[].command[].indexname "uri.hostname" indexinfo[].command[].command "urlhost" indexinfo[].command[].indexname "uri.hostname" indexinfo[].command[].command "lowercase" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "uri.fragment" indexinfo[].command[].command "index" indexinfo[].command[].indexname "uri.host" diff --git a/config-model/src/test/derived/imported_position_field/index-info.cfg b/config-model/src/test/derived/imported_position_field/index-info.cfg index d8fffbdfb2d..4d1f76c9b4c 100644 --- a/config-model/src/test/derived/imported_position_field/index-info.cfg +++ b/config-model/src/test/derived/imported_position_field/index-info.cfg @@ -9,10 +9,6 @@ indexinfo[0].command[3].indexname "parent_ref" indexinfo[0].command[3].command "attribute" indexinfo[0].command[4].indexname "parent_ref" indexinfo[0].command[4].command "word" -indexinfo[0].command[5].indexname "rankfeatures" -indexinfo[0].command[5].command "index" -indexinfo[0].command[6].indexname "summaryfeatures" -indexinfo[0].command[6].command "index" indexinfo[0].command[7].indexname "my_pos_zcurve" indexinfo[0].command[7].command "index" indexinfo[0].command[8].indexname "my_pos_zcurve" @@ -24,4 +20,4 @@ indexinfo[0].command[10].command "numerical" indexinfo[0].command[11].indexname "my_pos" indexinfo[0].command[11].command "default-position" indexinfo[0].command[12].indexname "my_pos" -indexinfo[0].command[12].command "index"
\ No newline at end of file +indexinfo[0].command[12].command "index" diff --git a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg index 356509fd818..bf7297851dd 100644 --- a/config-model/src/test/derived/imported_position_field_summary/index-info.cfg +++ b/config-model/src/test/derived/imported_position_field_summary/index-info.cfg @@ -9,10 +9,6 @@ indexinfo[].command[].indexname "parent_ref" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "parent_ref" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_pos_zcurve" indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_pos_zcurve" diff --git a/config-model/src/test/derived/imported_struct_fields/index-info.cfg b/config-model/src/test/derived/imported_struct_fields/index-info.cfg index 8d7f4d4bece..3723b06fcbe 100644 --- a/config-model/src/test/derived/imported_struct_fields/index-info.cfg +++ b/config-model/src/test/derived/imported_struct_fields/index-info.cfg @@ -11,10 +11,6 @@ indexinfo[].command[].indexname "parent_ref" indexinfo[].command[].command "word" indexinfo[].command[].indexname "documentid" indexinfo[].command[].command "index" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_elem_array.name" indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_elem_array.name" diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg index ef11247191f..bc688f48fc4 100644 --- a/config-model/src/test/derived/importedfields/index-info.cfg +++ b/config-model/src/test/derived/importedfields/index-info.cfg @@ -21,10 +21,6 @@ indexinfo[].command[].indexname "b_ref_with_summary" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "b_ref_with_summary" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_int_field" indexinfo[].command[].command "index" indexinfo[].command[].indexname "my_int_field" diff --git a/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg b/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg index 3e0bad5e172..15d50762134 100644 --- a/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg +++ b/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg @@ -47,10 +47,6 @@ indexinfo[].command[].indexname "exact2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "exact2" indexinfo[].command[].command "exact @@" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "nostemming" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "nostemming" diff --git a/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg b/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg index d397e37804c..f5815627d2b 100644 --- a/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg +++ b/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg @@ -49,10 +49,6 @@ indexinfo[].command[].indexname "lc_summary" indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_summary" indexinfo[].command[].command "lowercase" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_set1" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "lc_set1" diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg index d027ba8c102..46c2c3fc307 100644 --- a/config-model/src/test/derived/indexschema/index-info.cfg +++ b/config-model/src/test/derived/indexschema/index-info.cfg @@ -227,8 +227,6 @@ indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "fast-search" indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "numerical" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "sd_literal" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sd_literal" @@ -255,8 +253,6 @@ indexinfo[].command[].indexname "sh.query" indexinfo[].command[].command "index" indexinfo[].command[].indexname "sh.scheme" indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "sa" indexinfo[].command[].command "dynteaser" indexinfo[].command[].indexname "fs1" diff --git a/config-model/src/test/derived/indexswitches/documentmanager.cfg b/config-model/src/test/derived/indexswitches/documentmanager.cfg index 64d429cb2de..78dbdb7ae74 100644 --- a/config-model/src/test/derived/indexswitches/documentmanager.cfg +++ b/config-model/src/test/derived/indexswitches/documentmanager.cfg @@ -31,12 +31,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "source" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1892617122 datatype[].structtype[].name "indexswitches.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/indexswitches/index-info.cfg b/config-model/src/test/derived/indexswitches/index-info.cfg index 3af5f311d8b..1ba38ad554b 100644 --- a/config-model/src/test/derived/indexswitches/index-info.cfg +++ b/config-model/src/test/derived/indexswitches/index-info.cfg @@ -25,8 +25,6 @@ indexinfo[].command[].indexname "descr" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "source_src" indexinfo[].command[].command "index" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "source" indexinfo[].command[].command "index" indexinfo[].command[].indexname "source" @@ -35,8 +33,6 @@ indexinfo[].command[].indexname "source" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "source" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "default" diff --git a/config-model/src/test/derived/inheritance/documentmanager.cfg b/config-model/src/test/derived/inheritance/documentmanager.cfg index 47f697c80f7..b15ef13ed3f 100644 --- a/config-model/src/test/derived/inheritance/documentmanager.cfg +++ b/config-model/src/test/derived/inheritance/documentmanager.cfg @@ -25,12 +25,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "overridden" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 978262812 datatype[].structtype[].name "grandparent.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/inheritance/index-info.cfg b/config-model/src/test/derived/inheritance/index-info.cfg index e0be7b7d71f..ff3aad45906 100644 --- a/config-model/src/test/derived/inheritance/index-info.cfg +++ b/config-model/src/test/derived/inheritance/index-info.cfg @@ -37,7 +37,3 @@ indexinfo[].command[].indexname "onlychild" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "onlychild" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg index 7ecd9be403c..71da9265521 100644 --- a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg +++ b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg @@ -48,10 +48,6 @@ datatype[-1962244686].structtype[single].field[onlygrandparent].datatype 0 datatype[-1962244686].structtype[single].field[onlygrandparent].name "onlygrandparent" datatype[-1962244686].structtype[single].field[overridden].datatype 0 datatype[-1962244686].structtype[single].field[overridden].name "overridden" -datatype[-1962244686].structtype[single].field[rankfeatures].datatype 147991900 -datatype[-1962244686].structtype[single].field[rankfeatures].name "rankfeatures" -datatype[-1962244686].structtype[single].field[summaryfeatures].datatype 147991900 -datatype[-1962244686].structtype[single].field[summaryfeatures].name "summaryfeatures" datatype[-1989003153].id -1989003153 datatype[-1989003153].structtype[single].name "mother.body" datatype[-1989003153].structtype[single].version 0 @@ -68,10 +64,6 @@ datatype[-205818510].structtype[single].field[onlymother].datatype 2 datatype[-205818510].structtype[single].field[onlymother].name "onlymother" datatype[-205818510].structtype[single].field[overridden].datatype 0 datatype[-205818510].structtype[single].field[overridden].name "overridden" -datatype[-205818510].structtype[single].field[rankfeatures].datatype 147991900 -datatype[-205818510].structtype[single].field[rankfeatures].name "rankfeatures" -datatype[-205818510].structtype[single].field[summaryfeatures].datatype 147991900 -datatype[-205818510].structtype[single].field[summaryfeatures].name "summaryfeatures" datatype[-384824039].id -384824039 datatype[-384824039].structtype[single].name "mother_search.header" datatype[-384824039].structtype[single].version 0 @@ -81,10 +73,6 @@ datatype[-384824039].structtype[single].field[onlymother].datatype 2 datatype[-384824039].structtype[single].field[onlymother].name "onlymother" datatype[-384824039].structtype[single].field[overridden].datatype 0 datatype[-384824039].structtype[single].field[overridden].name "overridden" -datatype[-384824039].structtype[single].field[rankfeatures].datatype 147991900 -datatype[-384824039].structtype[single].field[rankfeatures].name "rankfeatures" -datatype[-384824039].structtype[single].field[summaryfeatures].datatype 147991900 -datatype[-384824039].structtype[single].field[summaryfeatures].name "summaryfeatures" datatype[-52742073].id -52742073 datatype[-52742073].structtype[single].name "father_search.body" datatype[-52742073].structtype[single].version 0 @@ -119,10 +107,6 @@ datatype[1530060044].structtype[single].field[onlygrandparent].datatype 0 datatype[1530060044].structtype[single].field[onlygrandparent].name "onlygrandparent" datatype[1530060044].structtype[single].field[overridden].datatype 0 datatype[1530060044].structtype[single].field[overridden].name "overridden" -datatype[1530060044].structtype[single].field[rankfeatures].datatype 147991900 -datatype[1530060044].structtype[single].field[rankfeatures].name "rankfeatures" -datatype[1530060044].structtype[single].field[summaryfeatures].datatype 147991900 -datatype[1530060044].structtype[single].field[summaryfeatures].name "summaryfeatures" datatype[1845861921].id 1845861921 datatype[1845861921].structtype[single].name "grandparent_search.body" datatype[1845861921].structtype[single].version 0 diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg index 36c1098c119..c3ead0d31f8 100644 --- a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg +++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg @@ -66,10 +66,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id -52742073 datatype[].structtype[].name "father_search.body" datatype[].structtype[].version 0 @@ -98,10 +94,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id 1561776723 datatype[].structtype[].name "mother_struct" datatype[].structtype[].version 0 @@ -148,10 +140,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id -1467672569 datatype[].structtype[].name "child_search.body" datatype[].structtype[].version 0 @@ -212,10 +200,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id 328953555 datatype[].documenttype[].name "grandparent_search" datatype[].documenttype[].version 0 diff --git a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg index 8d5bc57ef31..8e2ee3bbc4e 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg @@ -29,12 +29,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 978262812 datatype[].structtype[].name "grandparent.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg index 154b6524c33..7c65a7b72f3 100644 --- a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg @@ -35,12 +35,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "weight" datatype[].structtype[].field[].datatype 1 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -389494616 datatype[].structtype[].name "parent.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg index 70c4bc4297c..a5ea3dbf8ed 100644 --- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg +++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg @@ -50,16 +50,6 @@ documenttype[].datatype[].sstruct.field[].id 1001392207 documenttype[].datatype[].sstruct.field[].id_v6 1329620545 documenttype[].datatype[].sstruct.field[].datatype 1 documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].sstruct.field[].name "rankfeatures" -documenttype[].datatype[].sstruct.field[].id 1883197392 -documenttype[].datatype[].sstruct.field[].id_v6 699950698 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].sstruct.field[].name "summaryfeatures" -documenttype[].datatype[].sstruct.field[].id 1840337115 -documenttype[].datatype[].sstruct.field[].id_v6 1981648971 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -389494616 documenttype[].datatype[].type STRUCT documenttype[].datatype[].array.element.id 0 diff --git a/config-model/src/test/derived/inheritstruct/index-info.cfg b/config-model/src/test/derived/inheritstruct/index-info.cfg index e0f3fdb5dde..2d5b832a07f 100644 --- a/config-model/src/test/derived/inheritstruct/index-info.cfg +++ b/config-model/src/test/derived/inheritstruct/index-info.cfg @@ -19,7 +19,3 @@ indexinfo[].command[].indexname "child_struct_field" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "child_struct_field" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/mail/documentmanager.cfg b/config-model/src/test/derived/mail/documentmanager.cfg index accc0ba9578..2fa9e5923c9 100644 --- a/config-model/src/test/derived/mail/documentmanager.cfg +++ b/config-model/src/test/derived/mail/documentmanager.cfg @@ -37,10 +37,6 @@ datatype[].structtype[].field[].name "subject" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "snippet" datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id -1206550296 datatype[].arraytype[].datatype 12 datatype[].id -953584901 diff --git a/config-model/src/test/derived/mail/index-info.cfg b/config-model/src/test/derived/mail/index-info.cfg index 0d45f7c120f..39b12b64285 100644 --- a/config-model/src/test/derived/mail/index-info.cfg +++ b/config-model/src/test/derived/mail/index-info.cfg @@ -145,11 +145,7 @@ indexinfo[].command[].indexname "attachments" indexinfo[].command[].command "index" indexinfo[].command[].indexname "attachments" indexinfo[].command[].command "multivalue" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "snippet" indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "snippet" indexinfo[].command[].command "dynteaser" diff --git a/config-model/src/test/derived/map_attribute/index-info.cfg b/config-model/src/test/derived/map_attribute/index-info.cfg index 8d9f6a2a36f..1d44648ef6f 100644 --- a/config-model/src/test/derived/map_attribute/index-info.cfg +++ b/config-model/src/test/derived/map_attribute/index-info.cfg @@ -31,7 +31,3 @@ indexinfo[0].command[14].indexname "int_map" indexinfo[0].command[14].command "index" indexinfo[0].command[15].indexname "int_map" indexinfo[0].command[15].command "multivalue" -indexinfo[0].command[16].indexname "rankfeatures" -indexinfo[0].command[16].command "index" -indexinfo[0].command[17].indexname "summaryfeatures" -indexinfo[0].command[17].command "index"
\ No newline at end of file diff --git a/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg b/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg index 55de436716c..659bd86b9f0 100644 --- a/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg +++ b/config-model/src/test/derived/map_of_struct_attribute/index-info.cfg @@ -47,7 +47,3 @@ indexinfo[0].command[22].indexname "int_elem_map" indexinfo[0].command[22].command "index" indexinfo[0].command[23].indexname "int_elem_map" indexinfo[0].command[23].command "multivalue" -indexinfo[0].command[24].indexname "rankfeatures" -indexinfo[0].command[24].command "index" -indexinfo[0].command[25].indexname "summaryfeatures" -indexinfo[0].command[25].command "index"
\ No newline at end of file diff --git a/config-model/src/test/derived/music/index-info.cfg b/config-model/src/test/derived/music/index-info.cfg index 5d4cb8133e5..9e26df5fbea 100644 --- a/config-model/src/test/derived/music/index-info.cfg +++ b/config-model/src/test/derived/music/index-info.cfg @@ -209,10 +209,6 @@ indexinfo[].command[].indexname "metalvalue_arr" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "metalvalue_arr" indexinfo[].command[].command "word" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "bgndata" indexinfo[].command[].command "dynteaser" indexinfo[].command[].indexname "ew" diff --git a/config-model/src/test/derived/newrank/index-info.cfg b/config-model/src/test/derived/newrank/index-info.cfg index 96d34ee2548..6967bf43538 100644 --- a/config-model/src/test/derived/newrank/index-info.cfg +++ b/config-model/src/test/derived/newrank/index-info.cfg @@ -171,10 +171,6 @@ indexinfo[].command[].indexname "cbid" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "cbid" indexinfo[].command[].command "numerical" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" indexinfo[].command[].indexname "bgndata" indexinfo[].command[].command "dynteaser" indexinfo[].command[].indexname "ew" diff --git a/config-model/src/test/derived/position_array/index-info.cfg b/config-model/src/test/derived/position_array/index-info.cfg index 45ec2b69350..e4b9ebb5008 100644 --- a/config-model/src/test/derived/position_array/index-info.cfg +++ b/config-model/src/test/derived/position_array/index-info.cfg @@ -25,7 +25,3 @@ indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "attribute" indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "fast-search" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/position_attribute/index-info.cfg b/config-model/src/test/derived/position_attribute/index-info.cfg index 94d9ed9ad38..75a8ada6193 100644 --- a/config-model/src/test/derived/position_attribute/index-info.cfg +++ b/config-model/src/test/derived/position_attribute/index-info.cfg @@ -23,7 +23,3 @@ indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "fast-search" indexinfo[].command[].indexname "pos_zcurve" indexinfo[].command[].command "numerical" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/position_extra/index-info.cfg b/config-model/src/test/derived/position_extra/index-info.cfg index d4eef66c589..945508f9518 100644 --- a/config-model/src/test/derived/position_extra/index-info.cfg +++ b/config-model/src/test/derived/position_extra/index-info.cfg @@ -17,7 +17,3 @@ indexinfo[].command[].indexname "pos_ext_zcurve" indexinfo[].command[].command "fast-search" indexinfo[].command[].indexname "pos_ext_zcurve" indexinfo[].command[].command "numerical" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/predicate_attribute/index-info.cfg b/config-model/src/test/derived/predicate_attribute/index-info.cfg index 7441ca98daa..3d9f57dd84b 100644 --- a/config-model/src/test/derived/predicate_attribute/index-info.cfg +++ b/config-model/src/test/derived/predicate_attribute/index-info.cfg @@ -9,7 +9,3 @@ indexinfo[].command[].indexname "some_predicate_field" indexinfo[].command[].command "index" indexinfo[].command[].indexname "some_predicate_field" indexinfo[].command[].command "attribute" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg index adc1d7b3de6..060510c3578 100644 --- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg +++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg @@ -34,12 +34,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "indexfield2" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -480519133 datatype[].structtype[].name "prefixexactattribute.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/prefixexactattribute/index-info.cfg b/config-model/src/test/derived/prefixexactattribute/index-info.cfg index 7a84f0515f8..e0d5786ef13 100644 --- a/config-model/src/test/derived/prefixexactattribute/index-info.cfg +++ b/config-model/src/test/derived/prefixexactattribute/index-info.cfg @@ -37,7 +37,3 @@ indexinfo[].command[].indexname "indexfield2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "indexfield2" indexinfo[].command[].command "exact @" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg index cba480489b4..072a0fff126 100644 --- a/config-model/src/test/derived/ranktypes/documentmanager.cfg +++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg @@ -34,12 +34,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "identity_literal" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id 1374506021 datatype[].structtype[].name "ranktypes.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/ranktypes/index-info.cfg b/config-model/src/test/derived/ranktypes/index-info.cfg index 0b9777ca488..112183ceac5 100644 --- a/config-model/src/test/derived/ranktypes/index-info.cfg +++ b/config-model/src/test/derived/ranktypes/index-info.cfg @@ -51,7 +51,3 @@ indexinfo[].command[].indexname "identity_literal" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "identity_literal" indexinfo[].command[].command "plain-tokens" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg index 28690ba807f..2cd35c7bdfa 100644 --- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg +++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg @@ -113,12 +113,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "anothersummaryfield" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "snippet" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg index 21503c3ad76..c18b1cc11b0 100644 --- a/config-model/src/test/derived/structanyorder/documentmanager.cfg +++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg @@ -69,12 +69,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "structarrayfield" datatype[].structtype[].field[].datatype -1244829667 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -1503592268 datatype[].structtype[].name "annotationsimplicitstruct.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/structanyorder/index-info.cfg b/config-model/src/test/derived/structanyorder/index-info.cfg index 9cd84d8578f..7a8b06bceec 100644 --- a/config-model/src/test/derived/structanyorder/index-info.cfg +++ b/config-model/src/test/derived/structanyorder/index-info.cfg @@ -241,7 +241,3 @@ indexinfo[].command[].indexname "structarrayfield" indexinfo[].command[].command "index" indexinfo[].command[].indexname "structarrayfield" indexinfo[].command[].command "multivalue" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg index 56818298eb8..3b85e9b3a58 100644 --- a/config-model/src/test/derived/tensor/documenttypes.cfg +++ b/config-model/src/test/derived/tensor/documenttypes.cfg @@ -40,16 +40,6 @@ documenttype[].datatype[].sstruct.field[].id 1224191509 documenttype[].datatype[].sstruct.field[].id_v6 1039544782 documenttype[].datatype[].sstruct.field[].datatype 21 documenttype[].datatype[].sstruct.field[].detailedtype "tensor(x[10],y[20])" -documenttype[].datatype[].sstruct.field[].name "rankfeatures" -documenttype[].datatype[].sstruct.field[].id 1883197392 -documenttype[].datatype[].sstruct.field[].id_v6 699950698 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].sstruct.field[].name "summaryfeatures" -documenttype[].datatype[].sstruct.field[].id 1840337115 -documenttype[].datatype[].sstruct.field[].id_v6 1981648971 -documenttype[].datatype[].sstruct.field[].datatype 2 -documenttype[].datatype[].sstruct.field[].detailedtype "" documenttype[].datatype[].id -1903234535 documenttype[].datatype[].type STRUCT documenttype[].datatype[].array.element.id 0 diff --git a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg index f74b4e7b458..bb5bb001036 100644 --- a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg +++ b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg @@ -86,10 +86,6 @@ datatype[].structtype[].field[].name "g" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "anothersummaryfield" datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "snippet" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "snippet2" @@ -143,10 +139,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 datatype[].id -1417926544 datatype[].structtype[].name "whatever.body" datatype[].structtype[].version 0 diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg index 0644659cae7..a4fcd4f49f6 100644 --- a/config-model/src/test/derived/types/documentmanager.cfg +++ b/config-model/src/test/derived/types/documentmanager.cfg @@ -209,12 +209,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "other" datatype[].structtype[].field[].datatype 4 datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "rankfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" -datatype[].structtype[].field[].name "summaryfeatures" -datatype[].structtype[].field[].datatype 2 -datatype[].structtype[].field[].detailedtype "" datatype[].id -372512406 datatype[].maptype[].keytype 0 datatype[].maptype[].valtype 1707615575 diff --git a/config-model/src/test/derived/types/index-info.cfg b/config-model/src/test/derived/types/index-info.cfg index d6b914e5b1b..6332316e7d0 100644 --- a/config-model/src/test/derived/types/index-info.cfg +++ b/config-model/src/test/derived/types/index-info.cfg @@ -439,7 +439,3 @@ indexinfo[].command[].indexname "pst_sta_boldingoff_nomatch_tag_01" indexinfo[].command[].command "index" indexinfo[].command[].indexname "pst_sta_boldingoff_nomatch_tag_01" indexinfo[].command[].command "multivalue" -indexinfo[].command[].indexname "rankfeatures" -indexinfo[].command[].command "index" -indexinfo[].command[].indexname "summaryfeatures" -indexinfo[].command[].command "index" diff --git a/config-model/src/test/examples/fieldoftypedocument.cfg b/config-model/src/test/examples/fieldoftypedocument.cfg index d3dd0d06b66..b7bb444ec93 100644 --- a/config-model/src/test/examples/fieldoftypedocument.cfg +++ b/config-model/src/test/examples/fieldoftypedocument.cfg @@ -22,12 +22,6 @@ datatype[1].structtype[0].compressminsize 800 datatype[1].structtype[0].field[0].name "soundtrack" datatype[1].structtype[0].field[0].datatype 1412693671 datatype[1].structtype[0].field[0].detailedtype "" -datatype[1].structtype[0].field[1].name "rankfeatures" -datatype[1].structtype[0].field[1].datatype 2 -datatype[1].structtype[0].field[1].detailedtype "" -datatype[1].structtype[0].field[2].name "summaryfeatures" -datatype[1].structtype[0].field[2].datatype 2 -datatype[1].structtype[0].field[2].detailedtype "" datatype[2].id -820813431 datatype[2].structtype[0].name "book.body" datatype[2].structtype[0].version 0 @@ -59,12 +53,6 @@ datatype[4].structtype[0].field[1].detailedtype "" datatype[4].structtype[0].field[2].name "longfield" datatype[4].structtype[0].field[2].datatype 4 datatype[4].structtype[0].field[2].detailedtype "" -datatype[4].structtype[0].field[3].name "rankfeatures" -datatype[4].structtype[0].field[3].datatype 2 -datatype[4].structtype[0].field[3].detailedtype "" -datatype[4].structtype[0].field[4].name "summaryfeatures" -datatype[4].structtype[0].field[4].datatype 2 -datatype[4].structtype[0].field[4].detailedtype "" datatype[5].id 993120973 datatype[5].structtype[0].name "music.body" datatype[5].structtype[0].version 0 diff --git a/config-model/src/test/examples/structresult.cfg b/config-model/src/test/examples/structresult.cfg index 075ac54b983..eff48f18914 100755 --- a/config-model/src/test/examples/structresult.cfg +++ b/config-model/src/test/examples/structresult.cfg @@ -54,12 +54,6 @@ datatype[4].structtype[0].field[1].detailedtype "" datatype[4].structtype[0].field[2].name "advanced" datatype[4].structtype[0].field[2].datatype 93505813 datatype[4].structtype[0].field[2].detailedtype "" -datatype[4].structtype[0].field[3].name "rankfeatures" -datatype[4].structtype[0].field[3].datatype 2 -datatype[4].structtype[0].field[3].detailedtype "" -datatype[4].structtype[0].field[4].name "summaryfeatures" -datatype[4].structtype[0].field[4].datatype 2 -datatype[4].structtype[0].field[4].detailedtype "" datatype[5].id 993120973 datatype[5].structtype[0].name "music.body" datatype[5].structtype[0].version 0 diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java index 3331bf4cdba..9942b563297 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java @@ -33,7 +33,7 @@ public class FieldOfTypeDocumentTestCase extends SearchDefinitionTestCase { DocumentType musicType = manager.getDocumentType("music"); - assertEquals(5, musicType.getFieldCount()); + assertEquals(3, musicType.getFieldCount()); Field intField = musicType.getField("intfield"); assertEquals(DataType.INT, intField.getDataType()); @@ -41,21 +41,13 @@ public class FieldOfTypeDocumentTestCase extends SearchDefinitionTestCase { assertEquals(DataType.STRING, stringField.getDataType()); Field longField = musicType.getField("longfield"); assertEquals(DataType.LONG, longField.getDataType()); - Field summaryfeatures = musicType.getField("summaryfeatures"); - assertEquals(DataType.STRING, summaryfeatures.getDataType()); - Field rankfeatures = musicType.getField("rankfeatures"); - assertEquals(DataType.STRING, rankfeatures.getDataType()); DocumentType bookType = manager.getDocumentType("book"); - assertEquals(3, bookType.getFieldCount()); + assertEquals(1, bookType.getFieldCount()); Field musicField = bookType.getField("soundtrack"); assertSame(musicType, musicField.getDataType()); - summaryfeatures = musicType.getField("summaryfeatures"); - assertEquals(DataType.STRING, summaryfeatures.getDataType()); - rankfeatures = musicType.getField("rankfeatures"); - assertEquals(DataType.STRING, rankfeatures.getDataType()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java index 89e551fa789..a94c8e76684 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java @@ -45,7 +45,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase { SDDocumentType document = search.getDocument(); assertEquals("simple", document.getName()); - assertEquals(25, document.getFieldCount()); + assertEquals(23, document.getFieldCount()); SDField field; Attribute attribute; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java index b66105009cd..52c36ca240c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSearchFieldsTestCase.java @@ -25,11 +25,9 @@ public class ImplicitSearchFieldsTestCase extends SearchDefinitionTestCase { SDDocumentType docType = search.getDocument(); assertNotNull(docType); - assertNotNull(docType.getField("rankfeatures")); - assertNotNull(docType.getField("summaryfeatures")); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); - assertEquals(4, docType.getFieldCount()); + assertEquals(2, docType.getFieldCount()); } @Test @@ -39,12 +37,10 @@ public class ImplicitSearchFieldsTestCase extends SearchDefinitionTestCase { SDDocumentType docType = search.getDocument(); assertNotNull(docType); - assertNotNull(docType.getField("rankfeatures")); - assertNotNull(docType.getField("summaryfeatures")); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); assertNotNull(docType.getField("cox")); - assertEquals(5, docType.getFieldCount()); + assertEquals(3, docType.getFieldCount()); } @Test @@ -54,13 +50,11 @@ public class ImplicitSearchFieldsTestCase extends SearchDefinitionTestCase { SDDocumentType docType = search.getDocument(); assertNotNull(docType); - assertNotNull(docType.getField("rankfeatures")); - assertNotNull(docType.getField("summaryfeatures")); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); assertNotNull(docType.getField("baz")); assertNotNull(docType.getField("cox")); - assertEquals(6, docType.getFieldCount()); + assertEquals(4, docType.getFieldCount()); } @Test @@ -70,12 +64,10 @@ public class ImplicitSearchFieldsTestCase extends SearchDefinitionTestCase { SDDocumentType docType = search.getDocument(); assertNotNull(docType); - assertNotNull(docType.getField("rankfeatures")); - assertNotNull(docType.getField("summaryfeatures")); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); assertNotNull(docType.getField("baz")); - assertEquals(5, docType.getFieldCount()); + assertEquals(3, docType.getFieldCount()); } @Test @@ -85,11 +77,9 @@ public class ImplicitSearchFieldsTestCase extends SearchDefinitionTestCase { SDDocumentType docType = search.getDocument(); assertNotNull(docType); - assertNotNull(docType.getField("rankfeatures")); - assertNotNull(docType.getField("summaryfeatures")); assertNotNull(docType.getField("foo")); assertNotNull(docType.getField("bar")); - assertEquals(4, docType.getFieldCount()); + assertEquals(2, docType.getFieldCount()); } @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java index 88c85452cb3..f2d81414b5a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java @@ -35,8 +35,6 @@ public class ImplicitStructTypesTestCase extends SearchDefinitionTestCase { assertField(docType, "doc_str_sum", DataType.STRING); assertField(docType, "doc_uri", DataType.URI); assertField(docType, "docsum_str", DataType.STRING); - assertField(docType, "rankfeatures", DataType.STRING); - assertField(docType, "summaryfeatures", DataType.STRING); } @SuppressWarnings({ "UnusedDeclaration" }) diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java index 34b727f9f4e..412264aec57 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java @@ -26,7 +26,7 @@ public class VespaMlModelTestCase { private final String expectedRankConfig = "constant(constant1).type : tensor(x[3])\n" + - "constant(constant1).value : tensor(x[3]):{{x:0}:0.5,{x:1}:1.5,{x:2}:2.5}\n" + + "constant(constant1).value : tensor(x[3]):[0.5, 1.5, 2.5]\n" + "rankingExpression(foo1).rankingScript : reduce(reduce(input1 * input2, sum, name) * constant(constant1), max, x) * 3.0\n" + "rankingExpression(foo1).input2.type : tensor(x[3])\n" + "rankingExpression(foo1).input1.type : tensor(name{},x[3])\n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index a08c5394dda..ff38a184eec 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -33,7 +33,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getHostedModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getQrStartConfig; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; +import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet; import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java index d2bf4b601a6..f755871ac4b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CLUSTER_CONFIG_ID; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CONTAINER_CONFIG_ID; -import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.MY_FLAVOR; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getHostedModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig; @@ -33,7 +32,6 @@ public class MetricsProxyContainerTest { public void one_metrics_proxy_container_is_added_to_every_node() { var numberOfHosts = 4; var tester = new VespaModelTester(); - tester.enableMetricsProxyContainer(true); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(servicesWithManyNodes(), true); @@ -108,8 +106,6 @@ public class MetricsProxyContainerTest { assertEquals("content", config.dimensions(NodeDimensionNames.CLUSTER_TYPE)); assertEquals("my-content", config.dimensions(NodeDimensionNames.CLUSTER_ID)); - assertEquals(MY_FLAVOR, config.dimensions(NodeDimensionNames.FLAVOR)); - assertEquals(MY_FLAVOR, config.dimensions(NodeDimensionNames.CANONICAL_FLAVOR)); } @@ -162,7 +158,7 @@ public class MetricsProxyContainerTest { " </admin>", " <content version='1.0' id='my-content'>", " <documents />", - " <nodes count='1' flavor='" + MY_FLAVOR + "' />", + " <nodes count='1' />", " </content>", "</services>" ); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java index 13589c763e2..59b7110e96e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java @@ -16,7 +16,7 @@ import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.monitoring.Metric; import com.yahoo.vespa.model.test.VespaModelTester; -import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; +import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID; import static org.junit.Assert.assertEquals; /** @@ -27,7 +27,6 @@ class MetricsProxyModelTester { static final String MY_TENANT = "mytenant"; static final String MY_APPLICATION = "myapp"; static final String MY_INSTANCE = "myinstance"; - static final String MY_FLAVOR = "myflavor"; static final String CLUSTER_CONFIG_ID = "admin/metrics"; @@ -37,7 +36,6 @@ class MetricsProxyModelTester { static VespaModel getModel(String servicesXml) { var numberOfHosts = 1; var tester = new VespaModelTester(); - tester.enableMetricsProxyContainer(true); tester.addHosts(numberOfHosts); tester.setHosted(false); return tester.createModel(servicesXml, true); @@ -46,8 +44,7 @@ class MetricsProxyModelTester { static VespaModel getHostedModel(String servicesXml) { var numberOfHosts = 2; var tester = new VespaModelTester(); - tester.enableMetricsProxyContainer(true); - tester.addHosts(flavorFromString(MY_FLAVOR), numberOfHosts); + tester.addHosts(numberOfHosts); tester.setHosted(true); tester.setApplicationId(MY_TENANT, MY_APPLICATION, MY_INSTANCE); return tester.createModel(servicesXml, true); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java index 866c4027711..2e5acb9025d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java @@ -48,7 +48,6 @@ public class VespaModelTester { private Map<NodeResources, Collection<Host>> hostsByResources = new HashMap<>(); private ApplicationId applicationId = ApplicationId.defaultId(); private boolean useDedicatedNodeForLogserver = false; - private boolean enableMetricsProxyContainer = false; public VespaModelTester() { this(new NullConfigModelRegistry()); @@ -105,10 +104,6 @@ public class VespaModelTester { this.useDedicatedNodeForLogserver = useDedicatedNodeForLogserver; } - public void enableMetricsProxyContainer(boolean enableMetricsProxyContainer) { - this.enableMetricsProxyContainer = enableMetricsProxyContainer; - } - /** Creates a model which uses 0 as start index and fails on out of capacity */ public VespaModel createModel(String services, String ... retiredHostNames) { return createModel(Zone.defaultZone(), services, true, retiredHostNames); @@ -149,8 +144,7 @@ public class VespaModelTester { .setMultitenant(true) .setHostedVespa(hosted) .setApplicationId(applicationId) - .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver) - .setEnableMetricsProxyContainer(enableMetricsProxyContainer); + .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver); DeployState deployState = new DeployState.Builder() .applicationPackage(appPkg) |