honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

break field data value iterator into two callback types, one with support for missing, and one without

This commit is contained in:
kimchy 2011-04-04 19:53:09 +03:00
parent c9838d5c75
commit 58c606d6d9
20 changed files with 110 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java
View File

@ -94,8 +94,14 @@ public abstract class NumericFieldData<Doc extends NumericDocFieldData> extends
public abstract void forEachValueInDoc(int docId, DoubleValueInDocProc proc);
public abstract void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc);
public static interface DoubleValueInDocProc {
void onValue(int docId, double value);
}
public static interface MissingDoubleValueInDocProc {
void onValue(int docId, double value);
void onMissing(int docId);
}

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java
View File

@ -95,6 +95,15 @@ public class MultiValueByteFieldData extends ByteFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java
View File

@ -71,6 +71,14 @@ public class SingleValueByteFieldData extends ByteFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java
View File

@ -84,6 +84,15 @@ public class MultiValueDoubleFieldData extends DoubleFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java
View File

@ -64,6 +64,14 @@ public class SingleValueDoubleFieldData extends DoubleFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java
View File

@ -95,6 +95,15 @@ public class MultiValueFloatFieldData extends FloatFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java
View File

@ -71,6 +71,14 @@ public class SingleValueFloatFieldData extends FloatFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java
View File

@ -95,6 +95,15 @@ public class MultiValueIntFieldData extends IntFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java
View File

@ -71,6 +71,14 @@ public class SingleValueIntFieldData extends IntFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java
View File

@ -111,6 +111,15 @@ public class MultiValueLongFieldData extends LongFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java
View File

@ -81,6 +81,14 @@ public class SingleValueLongFieldData extends LongFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java
View File

@ -95,6 +95,15 @@ public class MultiValueShortFieldData extends ShortFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];
if (loc != 0) {
proc.onValue(docId, values[loc]);
}
}
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
boolean found = false;
for (int[] ordinal : ordinals) {
int loc = ordinal[docId];

8
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java
View File

@ -71,6 +71,14 @@ public class SingleValueShortFieldData extends ShortFieldData {
}
@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}
@Override public void forEachValueInDoc(int docId, MissingDoubleValueInDocProc proc) {
int loc = ordinals[docId];
if (loc == 0) {
proc.onMissing(docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/CountAndTotalHistogramFacetCollector.java
View File

@ -101,8 +101,6 @@ public class CountAndTotalHistogramFacetCollector extends AbstractFacetCollector
private final TLongDoubleHashMap totals = new TLongDoubleHashMap();
private int missing;
public HistogramProc(long interval) {
this.interval = interval;
}
@ -113,10 +111,6 @@ public class CountAndTotalHistogramFacetCollector extends AbstractFacetCollector
totals.adjustOrPutValue(bucket, value, value);
}
@Override public void onMissing(int docId) {
missing++;
}
public TLongLongHashMap counts() {
return counts;
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/CountHistogramFacetCollector.java
View File

@ -100,8 +100,6 @@ public class CountHistogramFacetCollector extends AbstractFacetCollector {
private final TLongLongHashMap counts = CacheRecycler.popLongLongMap();
private int missing;
public HistogramProc(long interval) {
this.interval = interval;
}
@ -111,10 +109,6 @@ public class CountHistogramFacetCollector extends AbstractFacetCollector {
counts.adjustOrPutValue(bucket, 1, 1);
}
@Override public void onMissing(int docId) {
missing++;
}
public TLongLongHashMap counts() {
return counts;
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueScriptHistogramFacetCollector.java
View File

@ -115,8 +115,6 @@ public class KeyValueScriptHistogramFacetCollector extends AbstractFacetCollecto
private final TLongDoubleHashMap totals = new TLongDoubleHashMap();
private int missing;
public HistogramProc(long interval, SearchScript valueScript) {
this.interval = interval;
this.valueScript = valueScript;
@ -131,10 +129,6 @@ public class KeyValueScriptHistogramFacetCollector extends AbstractFacetCollecto
totals.adjustOrPutValue(bucket, scriptValue, scriptValue);
}
@Override public void onMissing(int docId) {
missing++;
}
public TLongLongHashMap counts() {
return counts;
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java
View File

@ -101,8 +101,6 @@ public class KeyValueRangeFacetCollector extends AbstractFacetCollector {
private final RangeFacet.Entry[] entries;
private int missing;
NumericFieldData valueFieldData;
public RangeProc(RangeFacet.Entry[] entries) {
@ -129,9 +127,5 @@ public class KeyValueRangeFacetCollector extends AbstractFacetCollector {
}
}
}
@Override public void onMissing(int docId) {
missing++;
}
}
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java
View File

@ -88,8 +88,6 @@ public class RangeFacetCollector extends AbstractFacetCollector {
private final RangeFacet.Entry[] entries;
private int missing;
public RangeProc(RangeFacet.Entry[] entries) {
this.entries = entries;
}
@ -106,9 +104,5 @@ public class RangeFacetCollector extends AbstractFacetCollector {
}
}
}
@Override public void onMissing(int docId) {
missing++;
}
}
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java
View File

@ -82,7 +82,7 @@ public class StatisticalFacetCollector extends AbstractFacetCollector {
return new InternalStatisticalFacet(facetName, statsProc.min(), statsProc.max(), statsProc.total(), statsProc.sumOfSquares(), statsProc.count());
}
public static class StatsProc implements NumericFieldData.DoubleValueInDocProc {
public static class StatsProc implements NumericFieldData.MissingDoubleValueInDocProc {
double min = Double.MAX_VALUE;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java
View File

@ -87,7 +87,7 @@ public class StatisticalFieldsFacetCollector extends AbstractFacetCollector {
return new InternalStatisticalFacet(facetName, statsProc.min(), statsProc.max(), statsProc.total(), statsProc.sumOfSquares(), statsProc.count());
}
public static class StatsProc implements NumericFieldData.DoubleValueInDocProc {
public static class StatsProc implements NumericFieldData.MissingDoubleValueInDocProc {
double min = Double.MAX_VALUE;