Make merging mappings smarter

[clintongormley]

Currently, if you put a mapping that is exactly the same as an existing mapping (with ignore_conflicts set to false) then ES throws an error.

Could this be changed to only throw an error if an actual conflict occurs? (eg if trying to change the type of an existing field)

[kimchy]

Make merging mappings smarter, closed by 2344555.

[clintongormley]

This works, but when there is a conflict, the error isn't very helpful:

curl -XPUT 'http://127.0.0.1:9200/es_test_1,es_test_2/test/_mapping'  -d '
{
   "properties" : {
      "num" : {
         "type" : "string"
      },
      "text" : {
         "type" : "integer"
      }
   }
}
'
# {
#    "error" : "nested: "
# }

[kimchy]

I've tried to crete conflicts, and get proper exception message. Can you paste a full recreation for the fugly message?

[clintongormley]

It is not that the error is fugly, it is that it is too short, doesn't explain what the issue is:

curl -XPUT 'http://127.0.0.1:9200/es_test_1/'  -d '
{}
'
# {
#    "ok" : true,
#    "acknowledged" : true
# }


curl -XPUT 'http://127.0.0.1:9200/es_test_1/test/_mapping'  -d '
{
   "properties" : {
      "num" : {
         "type" : "integer"
      },
      "text" : {
         "type" : "string"
      }
   }
}
'
# {
#    "ok" : true,
#    "acknowledged" : true
# }


curl -XPUT 'http://127.0.0.1:9200/es_test_1/test/_mapping'  -d '
{
   "properties" : {
      "num" : {
         "type" : "string"
      },
      "text" : {
         "type" : "integer"
      }
   }
}
'
# {
#    "error" : "nested: "
# }

Also, it appears that ignore_conflicts is now being ignored:

curl -XPUT 'http://127.0.0.1:9200/es_test_1/test/_mapping?ignore_conflicts=true'  -d '
{
   "properties" : {
      "num" : {
         "type" : "string"
      },
      "text" : {
         "type" : "integer"
      }
   }
}
'
# {
#    "error" : "nested: "
# }

[kimchy]

ok ,just pushed a fix for this, can you check? ignore conflicts should work as well.

[clintongormley]

Error message much better.

However, the version with ignore_conflicts is now giving me this error:

ElasticSearchException[org.elasticsearch.index.mapper.xcontent.XContentStringFieldMapper cannot be cast to org.elasticsearch.index.mapper.xcontent.XContentNumberFieldMapper]; nested: ClassCastException[org.elasticsearch.index.mapper.xcontent.XContentStringFieldMapper cannot be cast to org.elasticsearch.index.mapper.xcontent.XContentNumberFieldMapper];

[kimchy]

ok, hope its fixed now, otherwise, I am testing something wrong, which I don't really undersand how...

[clintongormley]

Splendid. Fixed++