Always compare item content fully in Item.equals

1 files changed, 58 insertions, 25 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index d191659f085..484f4cf2a0e 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -320,7 +320,8 @@
     "methods": [
       "public void <init>()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
-      "public java.lang.String getName()"
+      "public java.lang.String getName()",
+      "public boolean equals(java.lang.Object)"
     ],
     "fields": []
   },
@@ -881,8 +882,8 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
       "protected void appendHeadingString(java.lang.StringBuilder)",
-      "public int hashCode()",
-      "public boolean equals(java.lang.Object)"
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": [
       "protected int distance",
@@ -913,7 +914,9 @@
       "public int getTermCount()",
       "public int encode(java.nio.ByteBuffer)",
       "protected void appendBodyString(java.lang.StringBuilder)",
-      "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
+      "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1056,7 +1059,6 @@
       "protected boolean shouldParenthize()",
       "protected void appendHeadingString(java.lang.StringBuilder)",
       "protected void appendBodyString(java.lang.StringBuilder)",
-      "public boolean equals(java.lang.Object)",
       "public java.lang.String getIndexedString()",
       "public boolean isExplicit()",
       "public void setExplicit(boolean)",
@@ -1074,7 +1076,9 @@
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, java.lang.String, long)",
       "public java.lang.String getValue()",
-      "public void encode(java.nio.ByteBuffer)"
+      "public void encode(java.nio.ByteBuffer)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1090,7 +1094,9 @@
       "public java.lang.String getKey()",
       "public long getSubQueryBitmap()",
       "public void setSubQueryBitmap(long)",
-      "public abstract void encode(java.nio.ByteBuffer)"
+      "public abstract void encode(java.nio.ByteBuffer)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1104,7 +1110,9 @@
       "public void <init>(java.lang.String, long)",
       "public void <init>(java.lang.String, long, long)",
       "public long getValue()",
-      "public void encode(java.nio.ByteBuffer)"
+      "public void encode(java.nio.ByteBuffer)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1132,6 +1140,8 @@
       "public int getTermCount()",
       "protected void appendBodyString(java.lang.StringBuilder)",
       "public com.yahoo.prelude.query.PredicateQueryItem clone()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
@@ -1168,7 +1178,9 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public int getTermCount()",
       "protected void appendBodyString(java.lang.StringBuilder)",
-      "public long getValue()"
+      "public long getValue()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1201,7 +1213,9 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public int getTermCount()",
       "protected void appendBodyString(java.lang.StringBuilder)",
-      "public java.lang.String getString()"
+      "public java.lang.String getString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1317,7 +1331,9 @@
       "public java.util.Optional extractSingleChild()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
-      "public java.lang.String getFieldName()"
+      "public java.lang.String getFieldName()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1353,6 +1369,8 @@
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
       "public com.yahoo.prelude.query.SegmentingRule getSegmentingRule()",
       "public void setSegmentingRule(com.yahoo.prelude.query.SegmentingRule)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
       "public bridge synthetic com.yahoo.prelude.query.CompositeItem clone()",
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
@@ -1436,7 +1454,9 @@
       "public java.lang.String getSuperstring()",
       "public char charAfter(int)",
       "public char charBefore(int)",
-      "public java.lang.String toString()"
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": [
       "public final int start",
@@ -1540,6 +1560,7 @@
       "public abstract java.lang.String getRawWord()",
       "public com.yahoo.prelude.query.Substring getOrigin()",
       "public boolean isFromQuery()",
+      "public void setFromQuery(boolean)",
       "public abstract boolean isWords()",
       "public void setOrigin(com.yahoo.prelude.query.Substring)",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
@@ -1547,7 +1568,9 @@
       "public boolean isNormalizable()",
       "public void setNormalizable(boolean)",
       "public com.yahoo.prelude.query.SegmentingRule getSegmentingRule()",
-      "public void setSegmentingRule(com.yahoo.prelude.query.SegmentingRule)"
+      "public void setSegmentingRule(com.yahoo.prelude.query.SegmentingRule)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1568,13 +1591,13 @@
       "public java.lang.String toString()"
     ],
     "fields": [
-      "public static com.yahoo.prelude.query.TermType RANK",
-      "public static com.yahoo.prelude.query.TermType AND",
-      "public static com.yahoo.prelude.query.TermType OR",
-      "public static com.yahoo.prelude.query.TermType NOT",
-      "public static com.yahoo.prelude.query.TermType PHRASE",
-      "public static com.yahoo.prelude.query.TermType EQUIV",
-      "public static com.yahoo.prelude.query.TermType DEFAULT",
+      "public static final com.yahoo.prelude.query.TermType RANK",
+      "public static final com.yahoo.prelude.query.TermType AND",
+      "public static final com.yahoo.prelude.query.TermType OR",
+      "public static final com.yahoo.prelude.query.TermType NOT",
+      "public static final com.yahoo.prelude.query.TermType PHRASE",
+      "public static final com.yahoo.prelude.query.TermType EQUIV",
+      "public static final com.yahoo.prelude.query.TermType DEFAULT",
       "public final java.lang.String name"
     ]
   },
@@ -1641,7 +1664,9 @@
       "public boolean isEndAnchorDefault()",
       "public void setEndAnchorDefault(boolean)",
       "public void setSourceString(java.lang.String)",
-      "public java.lang.String getArgumentString()"
+      "public java.lang.String getArgumentString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1662,7 +1687,9 @@
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "protected void encodeThis(java.nio.ByteBuffer)",
       "protected void appendHeadingString(java.lang.StringBuilder)",
-      "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
+      "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1719,6 +1746,8 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public int getTermCount()",
       "public com.yahoo.prelude.query.WeightedSetItem clone()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
@@ -1733,7 +1762,9 @@
     ],
     "methods": [
       "public void <init>(java.lang.String, double)",
-      "public java.lang.String toString()"
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": [
       "public final java.lang.String word",
@@ -1760,7 +1791,9 @@
       "public java.lang.String getName()",
       "public java.util.List getAlternatives()",
       "public void encodeThis(java.nio.ByteBuffer)",
-      "public void addTerm(java.lang.String, double)"
+      "public void addTerm(java.lang.String, double)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
     ],
     "fields": []
   },
@@ -1796,8 +1829,8 @@
       "public int getSegmentIndex()",
       "public void setSegmentIndex(int)",
       "protected void appendHeadingString(java.lang.StringBuilder)",
-      "public int hashCode()",
       "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
       "public int getNumWords()",
       "public java.lang.String getIndexedString()",
       "public boolean isWords()",