honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-05 20:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ids with # in them will cause search failures, also, fail when # is used in a type name, closes #728.

Browse Source
This commit is contained in:
kimchy 2011-02-28 22:43:48 +02:00
parent 3bac33e69e
commit 906ec57f20
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -148,7 +148,10 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
private void add(DocumentMapper mapper) {
synchronized (mutex) {
if (mapper.type().charAt(0) == '_') {
throw new InvalidTypeNameException("Document mapping type name can't start with '_'");
throw new InvalidTypeNameException("mapping type name [" + mapper.type() + "] can't start with '_'");
}
if (mapper.type().contains("#")) {
throw new InvalidTypeNameException("mapping type name [" + mapper.type() + "] should not include '#' in it");
}
remove(mapper.type()); // first remove it (in case its an update, we need to remove the aggregated mappers)
mappers = newMapBuilder(mappers).put(mapper.type(), mapper).immutableMap();

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Uid.java
View File

@ -66,7 +66,7 @@ public final class Uid {
}
public static Uid createUid(String uid) {
int delimiterIndex = uid.lastIndexOf(DELIMITER);
int delimiterIndex = uid.indexOf(DELIMITER); // type is not allowed to have # in it..., ids can
return new Uid(uid.substring(0, delimiterIndex), uid.substring(delimiterIndex + 1));
}