From bf70836e9251d2a7f92e1d328f8f9fab3a0501d7 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Fri, 9 Sep 2011 14:06:54 +0300 Subject: [PATCH] don't do double int[] lookup for ordinal --- .../index/field/data/bytes/MultiValueByteFieldData.java | 2 +- .../index/field/data/doubles/MultiValueDoubleFieldData.java | 2 +- .../index/field/data/floats/MultiValueFloatFieldData.java | 2 +- .../index/field/data/ints/MultiValueIntFieldData.java | 2 +- .../index/field/data/longs/MultiValueLongFieldData.java | 2 +- .../index/field/data/shorts/MultiValueShortFieldData.java | 2 +- .../index/field/data/strings/MultiValueStringFieldData.java | 2 +- .../index/mapper/geo/MultiValueGeoPointFieldData.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java index e68b1cd5ad8..553b82a238b 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java @@ -160,7 +160,7 @@ public class MultiValueByteFieldData extends ByteFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java index 92426e3667e..2f6290d850c 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java @@ -149,7 +149,7 @@ public class MultiValueDoubleFieldData extends DoubleFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java index a1ed1c15a9a..6ca2cdf9719 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java @@ -160,7 +160,7 @@ public class MultiValueFloatFieldData extends FloatFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java index dad25b498fb..38d89ad641d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java @@ -160,7 +160,7 @@ public class MultiValueIntFieldData extends IntFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java index 4b36631373d..e52adfcfb75 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java @@ -162,7 +162,7 @@ public class MultiValueLongFieldData extends LongFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java index 322243aa3de..39907bf18f4 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java @@ -160,7 +160,7 @@ public class MultiValueShortFieldData extends ShortFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java index a0264c9aef9..d5c6f944c15 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java @@ -90,7 +90,7 @@ public class MultiValueStringFieldData extends StringFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java index 3e9b49e88cc..9e02dedfee5 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java @@ -123,7 +123,7 @@ public class MultiValueGeoPointFieldData extends GeoPointFieldData { int loc = ordinal[docId]; if (loc != 0) { found = true; - proc.onOrdinal(docId, ordinal[docId]); + proc.onOrdinal(docId, loc); } } if (!found) {