Merge remote-tracking branch 'upstream/master'

Author: alolis

src/elasticsearch/elasticsearch.cpp

@@ -386,11 +386,17 @@ void BulkBuilder::create(const std::string &index, const std::string &type, cons
 	operations.push_back(fields);
 }
 
-void BulkBuilder::update(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields) {
+void BulkBuilder::update(const std::string &index, const std::string &type, const std::string &id, const Json::Object &body) {
+    createCommand("update", index, type, id);
+    operations.push_back(body);
+}
+
+void BulkBuilder::update_doc(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields, bool upsert) {
 	createCommand("update", index, type, id);
 
 	Json::Object updateFields;
 	updateFields.addMemberByKey("doc", fields);
+    updateFields.addMemberByKey("doc_as_upsert", upsert);
 
 	operations.push_back(updateFields);
 }
@@ -399,16 +405,6 @@ void BulkBuilder::del(const std::string &index, const std::string &type, const s
 	createCommand("delete", index, type, id);
 }
 
-void BulkBuilder::upsert(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields) {
-	createCommand("update", index, type, id);
-
-	Json::Object updateFields;
-	updateFields.addMemberByKey("doc", fields);
-	updateFields.addMemberByKey("doc_as_upsert", true);
-
-	operations.push_back(updateFields);
-}
-
 std::string BulkBuilder::str() {
 	std::stringstream json;
 

src/elasticsearch/elasticsearch.h

@@ -105,7 +105,8 @@ class BulkBuilder {
 		void create(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields);
 		void index(const std::string &index, const std::string &type, const Json::Object &fields);
 		void create(const std::string &index, const std::string &type, const Json::Object &fields);
-		void update(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields);
+		void update(const std::string &index, const std::string &type, const std::string &id, const Json::Object &body);
+        void update_doc(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields, bool update = false);
 		void del(const std::string &index, const std::string &type, const std::string &id);
 		void upsert(const std::string &index, const std::string &type, const std::string &id, const Json::Object &fields);
 		void clear();