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

kimchy · kimchy · commit cc290b147f9c · 2011-02-28T22:44:15.000+02:00
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -148,7 +148,10 @@ public void add(String type, String mappingSource) {
     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();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Uid.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Uid.java
@@ -66,7 +66,7 @@ public String id() {
     }
 
     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));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public String id() {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public static Uid createUid(String uid) {`
`69`		`- int delimiterIndex = uid.lastIndexOf(DELIMITER);`
	`69`	`+ int delimiterIndex = uid.indexOf(DELIMITER); // type is not allowed to have # in it..., ids can`
`70`	`70`	`return new Uid(uid.substring(0, delimiterIndex), uid.substring(delimiterIndex + 1));`
`71`	`71`	`}`
`72`	`72`