diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-10-18 15:39:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 15:39:17 +0200 |
commit | 24f8d5ab63a193aeb6660eafb83a22956a679a75 (patch) | |
tree | 9986c985a85eacd4b595e46d9f467eb66a452905 /config-model/src | |
parent | 1eda7c64c9817a935a597d3cd3da7b8b0dee591b (diff) | |
parent | e2fc2d05193e20224cedd20f277cb6e1c253cefb (diff) |
Merge pull request #29009 from vespa-engine/bratseth/non-functional-only
Non-functional changes only
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Ranking.java | 3 | ||||
-rw-r--r-- | config-model/src/test/derived/schemainheritance/schema-info.cfg | 127 |
2 files changed, 128 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/document/Ranking.java b/config-model/src/main/java/com/yahoo/schema/document/Ranking.java index d00abfcb9aa..2a2b1431057 100644 --- a/config-model/src/main/java/com/yahoo/schema/document/Ranking.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Ranking.java @@ -44,9 +44,8 @@ public class Ranking implements Cloneable, Serializable { /** Returns true if the given rank settings are the same */ @Override public boolean equals(Object o) { - if ( ! (o instanceof Ranking)) return false; + if ( ! (o instanceof Ranking other)) return false; - Ranking other=(Ranking)o; if (this.filter != other.filter) return false; if (this.literal != other.literal) return false; if (this.normal != other.normal) return false; diff --git a/config-model/src/test/derived/schemainheritance/schema-info.cfg b/config-model/src/test/derived/schemainheritance/schema-info.cfg new file mode 100644 index 00000000000..9fe71780c7a --- /dev/null +++ b/config-model/src/test/derived/schemainheritance/schema-info.cfg @@ -0,0 +1,127 @@ +schema[].name "child" +schema[].field[].name "parent_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "child_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "pf1" +schema[].field[].type "string" +schema[].field[].attribute false +schema[].field[].index false +schema[].field[].name "importedschema_ref" +schema[].field[].type "reference<importedschema>" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "parent_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "cf1" +schema[].field[].type "string" +schema[].field[].attribute false +schema[].field[].index false +schema[].field[].name "child_field" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index true +schema[].field[].name "parent_imported" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "importedfield1" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "child_imported" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].field[].name "importedfield2" +schema[].field[].type "string" +schema[].field[].attribute true +schema[].field[].index false +schema[].fieldset[].name "[document]" +schema[].fieldset[].field[] "cf1" +schema[].fieldset[].field[] "importedschema_ref" +schema[].fieldset[].field[] "pf1" +schema[].fieldset[].name "[search]" +schema[].fieldset[].field[] "child_field" +schema[].fieldset[].field[] "parent_field" +schema[].fieldset[].name "parent_set" +schema[].fieldset[].field[] "pf1" +schema[].fieldset[].name "child_set" +schema[].fieldset[].field[] "cf1" +schema[].fieldset[].field[] "pf1" +schema[].summaryclass[].name "default" +schema[].summaryclass[].fields[].name "parent_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "child_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "cf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "documentid" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "parent_summary" +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "attributeprefetch" +schema[].summaryclass[].fields[].name "parent_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "child_field" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].name "child_summary" +schema[].summaryclass[].fields[].name "pf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "rankfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "summaryfeatures" +schema[].summaryclass[].fields[].type "featuredata" +schema[].summaryclass[].fields[].dynamic false +schema[].summaryclass[].fields[].name "cf1" +schema[].summaryclass[].fields[].type "longstring" +schema[].summaryclass[].fields[].dynamic false +schema[].rankprofile[].name "default" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "unranked" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "child_profile" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false +schema[].rankprofile[].name "parent_profile" +schema[].rankprofile[].hasSummaryFeatures false +schema[].rankprofile[].hasRankFeatures false |