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

add specific makeSafe method to make an unsafe (shared) bytes based value to a "safe" one

This commit is contained in:
Shay Banon 2013-01-20 15:01:31 +01:00
parent 1765b0b813
commit d88e3f73ac
4 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/elasticsearch/index/fielddata/BytesValues.java
View File

@ -28,15 +28,20 @@ import org.elasticsearch.index.fielddata.util.StringArrayRef;
*/
public interface BytesValues {
/**
* Is one of the documents in this field data values is multi valued?
*/
boolean isMultiValued();
/**
* Is there a value for this doc?
*/
boolean hasValue(int docId);
/**
* Is one of the documents in this field data values is multi valued?
* Converts the provided bytes to "safe" ones from a "non" safe call made (if needed).
*/
boolean isMultiValued();
BytesRef makeSafe(BytesRef bytes);
/**
* Returns a bytes value for a docId. Note, the content of it might be shared across invocation.
@ -147,14 +152,20 @@ public interface BytesValues {
this.values = values;
}
@Override
public boolean isMultiValued() {
return values.isMultiValued();
}
@Override
public boolean hasValue(int docId) {
return values.hasValue(docId);
}
@Override
public boolean isMultiValued() {
return values.isMultiValued();
public BytesRef makeSafe(BytesRef bytes) {
// we need to make a copy, since we use scratch to provide it
return BytesRef.deepCopyOf(bytes);
}
@Override

16
src/main/java/org/elasticsearch/index/fielddata/HashedBytesValues.java
View File

@ -37,6 +37,11 @@ public interface HashedBytesValues {
*/
boolean hasValue(int docId);
/**
* Converts the provided bytes to "safe" ones from a "non" safe call made (if needed).
*/
HashedBytesRef makeSafe(HashedBytesRef bytes);
/**
* Returns a bytes value for a docId. Note, the content of it might be shared across invocation.
*/
@ -146,6 +151,11 @@ public interface HashedBytesValues {
return values.hasValue(docId);
}
@Override
public HashedBytesRef makeSafe(HashedBytesRef bytes) {
return new HashedBytesRef(values.makeSafe(bytes.bytes), bytes.hash);
}
@Override
public HashedBytesRef getValue(int docId) {
BytesRef value = values.getValue(docId);
@ -289,6 +299,12 @@ public interface HashedBytesValues {
return values.hasValue(docId);
}
@Override
public HashedBytesRef makeSafe(HashedBytesRef bytes) {
// we use scratch to provide it, so just need to copy it over to a new instance
return new HashedBytesRef(bytes.bytes, bytes.hash);
}
@Override
public HashedBytesRef getValue(int docId) {
String value = values.getValue(docId);

13
src/main/java/org/elasticsearch/index/fielddata/plain/ConcreteBytesRefAtomicFieldData.java
View File

@ -146,6 +146,12 @@ public class ConcreteBytesRefAtomicFieldData implements AtomicOrdinalFieldData<S
return ordinals.getOrd(docId) != 0;
}
@Override
public BytesRef makeSafe(BytesRef bytes) {
// no need to do anything, its already concrete bytes...
return bytes;
}
@Override
public BytesRef getValue(int docId) {
return values[ordinals.getOrd(docId)];
@ -337,6 +343,13 @@ public class ConcreteBytesRefAtomicFieldData implements AtomicOrdinalFieldData<S
return ordinals.getOrd(docId) != 0;
}
@Override
public HashedBytesRef makeSafe(HashedBytesRef bytes) {
// we just need to create a copy of the bytes ref, no need
// to create a copy of the actual BytesRef, as its concrete
return new HashedBytesRef(bytes.bytes, bytes.hash);
}
@Override
public HashedBytesRef getValue(int docId) {
int ord = ordinals.getOrd(docId);

8
src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java
View File

@ -83,6 +83,7 @@ public class TermsStatsStringFacetCollector extends AbstractFacetCollector {
@Override
protected void doSetNextReader(AtomicReaderContext context) throws IOException {
keyValues = keyIndexFieldData.load(context).getHashedBytesValues();
aggregator.keyValues = keyValues;
if (script != null) {
script.setNextReader(context);
} else {
@ -127,6 +128,7 @@ public class TermsStatsStringFacetCollector extends AbstractFacetCollector {
int missing = 0;
HashedBytesValues keyValues;
DoubleValues valueValues;
ValueAggregator valueAggregator = new ValueAggregator();
@ -135,8 +137,7 @@ public class TermsStatsStringFacetCollector extends AbstractFacetCollector {
public void onValue(int docId, HashedBytesRef value) {
InternalTermsStatsStringFacet.StringEntry stringEntry = entries.get(value);
if (stringEntry == null) {
// we use "unsafe" hashedBytes, and only copy over if we "miss" on the map, and need to put it there
value = value.deepCopy();
value = keyValues.makeSafe(value);
stringEntry = new InternalTermsStatsStringFacet.StringEntry(value, 0, 0, 0, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY);
entries.put(value, stringEntry);
}
@ -183,8 +184,7 @@ public class TermsStatsStringFacetCollector extends AbstractFacetCollector {
public void onValue(int docId, HashedBytesRef value) {
InternalTermsStatsStringFacet.StringEntry stringEntry = entries.get(value);
if (stringEntry == null) {
// we use "unsafe" hashedBytes, and only copy over if we "miss" on the map, and need to put it there
value = value.deepCopy();
value = keyValues.makeSafe(value);
stringEntry = new InternalTermsStatsStringFacet.StringEntry(value, 1, 0, 0, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY);
entries.put(value, stringEntry);
} else {