Skip to content

Commit

Permalink
correct field name
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimchy
kimchy committed Dec 4, 2010
1 parent f9716df commit 22c27e4
Show file tree
Hide file tree
Showing 22 changed files with 151 additions and 151 deletions.
2 changes: 1 addition & 1 deletion .idea/copyright/profiles_settings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ...asticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ static class DoubleTypeLoader extends FieldDataLoader.FreqsTypeLoader<DoubleFiel
terms.add(FieldCache.NUMERIC_UTILS_DOUBLE_PARSER.parseDouble(term));
}

@Override public DoubleFieldData buildSingleValue(String field, int[] order) {
return new SingleValueDoubleFieldData(field, order, terms.toNativeArray());
@Override public DoubleFieldData buildSingleValue(String field, int[] ordinals) {
return new SingleValueDoubleFieldData(field, ordinals, terms.toNativeArray());
}

@Override public DoubleFieldData buildMultiValue(String field, int[][] order) {
return new MultiValueDoubleFieldData(field, order, terms.toNativeArray());
@Override public DoubleFieldData buildMultiValue(String field, int[][] ordinals) {
return new MultiValueDoubleFieldData(field, ordinals, terms.toNativeArray());
}
}
}
16 changes: 8 additions & 8 deletions ...h/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@ public class MultiValueDoubleFieldData extends DoubleFieldData {
};

// order with value 0 indicates no value
private final int[][] order;
private final int[][] ordinals;

public MultiValueDoubleFieldData(String fieldName, int[][] order, double[] values) {
public MultiValueDoubleFieldData(String fieldName, int[][] ordinals, double[] values) {
super(fieldName, values);
this.order = order;
this.ordinals = ordinals;
}

@Override public boolean multiValued() {
return true;
}

@Override public boolean hasValue(int docId) {
return order[docId] != null;
return ordinals[docId] != null;
}

@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -65,7 +65,7 @@ public MultiValueDoubleFieldData(String fieldName, int[][] order, double[] value
}

@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -79,15 +79,15 @@ public MultiValueDoubleFieldData(String fieldName, int[][] order, double[] value
}

@Override public double value(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return 0;
}
return values[docOrders[0]];
}

@Override public double[] values(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return EMPTY_DOUBLE_ARRAY;
}
Expand Down
16 changes: 8 additions & 8 deletions .../src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ public class SingleValueDoubleFieldData extends DoubleFieldData {
};

// order with value 0 indicates no value
private final int[] order;
private final int[] ordinals;

public SingleValueDoubleFieldData(String fieldName, int[] order, double[] values) {
public SingleValueDoubleFieldData(String fieldName, int[] ordinals, double[] values) {
super(fieldName, values);
this.order = order;
this.ordinals = ordinals;
}

@Override public boolean multiValued() {
return false;
}

@Override public boolean hasValue(int docId) {
return order[docId] != 0;
return ordinals[docId] != 0;
}

@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, Double.toString(values[loc]));
}

@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return;
}
Expand All @@ -69,11 +69,11 @@ public SingleValueDoubleFieldData(String fieldName, int[] order, double[] values
}

@Override public double value(int docId) {
return values[order[docId]];
return values[ordinals[docId]];
}

@Override public double[] values(int docId) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return EMPTY_DOUBLE_ARRAY;
}
Expand Down
8 changes: 4 additions & 4 deletions ...elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ static class FloatTypeLoader extends FieldDataLoader.FreqsTypeLoader<FloatFieldD
terms.add(FieldCache.NUMERIC_UTILS_FLOAT_PARSER.parseFloat(term));
}

@Override public FloatFieldData buildSingleValue(String field, int[] order) {
return new SingleValueFloatFieldData(field, order, terms.toNativeArray());
@Override public FloatFieldData buildSingleValue(String field, int[] ordinals) {
return new SingleValueFloatFieldData(field, ordinals, terms.toNativeArray());
}

@Override public FloatFieldData buildMultiValue(String field, int[][] order) {
return new MultiValueFloatFieldData(field, order, terms.toNativeArray());
@Override public FloatFieldData buildMultiValue(String field, int[][] ordinals) {
return new MultiValueFloatFieldData(field, ordinals, terms.toNativeArray());
}
}
}
18 changes: 9 additions & 9 deletions ...rch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ public class MultiValueFloatFieldData extends FloatFieldData {
};

// order with value 0 indicates no value
private final int[][] order;
private final int[][] ordinals;

public MultiValueFloatFieldData(String fieldName, int[][] order, float[] values) {
public MultiValueFloatFieldData(String fieldName, int[][] ordinals, float[] values) {
super(fieldName, values);
this.order = order;
this.ordinals = ordinals;
}

@Override public boolean multiValued() {
return true;
}

@Override public boolean hasValue(int docId) {
return order[docId] != null;
return ordinals[docId] != null;
}

@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -76,7 +76,7 @@ public MultiValueFloatFieldData(String fieldName, int[][] order, float[] values)
}

@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -86,7 +86,7 @@ public MultiValueFloatFieldData(String fieldName, int[][] order, float[] values)
}

@Override public double[] doubleValues(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return DoubleFieldData.EMPTY_DOUBLE_ARRAY;
}
Expand All @@ -103,15 +103,15 @@ public MultiValueFloatFieldData(String fieldName, int[][] order, float[] values)
}

@Override public float value(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return 0;
}
return values[docOrders[0]];
}

@Override public float[] values(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return EMPTY_FLOAT_ARRAY;
}
Expand Down
18 changes: 9 additions & 9 deletions ...ch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,39 @@ public class SingleValueFloatFieldData extends FloatFieldData {
};

// order with value 0 indicates no value
private final int[] order;
private final int[] ordinals;

public SingleValueFloatFieldData(String fieldName, int[] order, float[] values) {
public SingleValueFloatFieldData(String fieldName, int[] ordinals, float[] values) {
super(fieldName, values);
this.order = order;
this.ordinals = ordinals;
}

@Override public boolean multiValued() {
return false;
}

@Override public boolean hasValue(int docId) {
return order[docId] != 0;
return ordinals[docId] != 0;
}

@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, Float.toString(values[loc]));
}

@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc]);
}

@Override public double[] doubleValues(int docId) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return DoubleFieldData.EMPTY_DOUBLE_ARRAY;
}
Expand All @@ -82,11 +82,11 @@ public SingleValueFloatFieldData(String fieldName, int[] order, float[] values)
}

@Override public float value(int docId) {
return values[order[docId]];
return values[ordinals[docId]];
}

@Override public float[] values(int docId) {
int loc = order[docId];
int loc = ordinals[docId];
if (loc == 0) {
return EMPTY_FLOAT_ARRAY;
}
Expand Down
8 changes: 4 additions & 4 deletions ...les/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ static class IntTypeLoader extends FieldDataLoader.FreqsTypeLoader<IntFieldData>
terms.add(FieldCache.NUMERIC_UTILS_INT_PARSER.parseInt(term));
}

@Override public IntFieldData buildSingleValue(String field, int[] order) {
return new SingleValueIntFieldData(field, order, terms.toNativeArray());
@Override public IntFieldData buildSingleValue(String field, int[] ordinals) {
return new SingleValueIntFieldData(field, ordinals, terms.toNativeArray());
}

@Override public IntFieldData buildMultiValue(String field, int[][] order) {
return new MultiValueIntFieldData(field, order, terms.toNativeArray());
@Override public IntFieldData buildMultiValue(String field, int[][] ordinals) {
return new MultiValueIntFieldData(field, ordinals, terms.toNativeArray());
}
}
}
18 changes: 9 additions & 9 deletions ...csearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ public class MultiValueIntFieldData extends IntFieldData {
};

// order with value 0 indicates no value
private final int[][] order;
private final int[][] ordinals;

public MultiValueIntFieldData(String fieldName, int[][] order, int[] values) {
public MultiValueIntFieldData(String fieldName, int[][] ordinals, int[] values) {
super(fieldName, values);
this.order = order;
this.ordinals = ordinals;
}

@Override public boolean multiValued() {
return true;
}

@Override public boolean hasValue(int docId) {
return order[docId] != null;
return ordinals[docId] != null;
}

@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -76,7 +76,7 @@ public MultiValueIntFieldData(String fieldName, int[][] order, int[] values) {
}

@Override public void forEachValueInDoc(int docId, DoubleValueInDocProc proc) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return;
}
Expand All @@ -86,7 +86,7 @@ public MultiValueIntFieldData(String fieldName, int[][] order, int[] values) {
}

@Override public double[] doubleValues(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return DoubleFieldData.EMPTY_DOUBLE_ARRAY;
}
Expand All @@ -103,15 +103,15 @@ public MultiValueIntFieldData(String fieldName, int[][] order, int[] values) {
}

@Override public int value(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return 0;
}
return values[docOrders[0]];
}

@Override public int[] values(int docId) {
int[] docOrders = order[docId];
int[] docOrders = ordinals[docId];
if (docOrders == null) {
return EMPTY_INT_ARRAY;
}
Expand Down
Loading

0 comments on commit 22c27e4

Please sign in to comment.