Merge pull request QHedgeTech#3 from frodegill/master

Grouped index functions, and added function for adding index and deleting index or type

Author: will-iam

src/elasticsearch/elasticsearch.cpp

@@ -16,15 +16,6 @@ ElasticSearch::ElasticSearch(const std::string& node, bool readOnly): _http(node
 ElasticSearch::~ElasticSearch() {
 }
 
-// Refresh the index.
-void ElasticSearch::refresh(const std::string& index){
-    std::ostringstream oss;
-    oss << index << "/_refresh";
-
-    Json::Object msg;
-    _http.get(oss.str().c_str(), 0, &msg);
-}
-
 // Test connection with node.
 bool ElasticSearch::isActive() {
 
@@ -162,11 +153,6 @@ long unsigned int ElasticSearch::getDocumentCount(const char* index, const char*
     return pos;
 }
 
-// Test if index exists
-bool ElasticSearch::exist(const std::string& index){
-    return (200 == _http.head(index.c_str(), 0, 0));
-}
-
 // Test if document exists
 bool ElasticSearch::exist(const std::string& index, const std::string& type, const std::string& id){
     std::stringstream url;
@@ -322,3 +308,34 @@ long ElasticSearch::search(const std::string& index, const std::string& type, co
 
     return result.getValue("hits").getObject().getValue("total").getLong();
 }
+
+        /// Delete given type (and all documents, mappings)
+bool ElasticSearch::deleteType(const std::string& index, const std::string& type){
+    std::ostringstream uri;
+    uri << index << "/" << type;
+    return (200 == _http.remove(uri.str().c_str(), 0, 0));
+}
+
+// Test if index exists
+bool ElasticSearch::exist(const std::string& index){
+    return (200 == _http.head(index.c_str(), 0, 0));
+}
+
+// Create index, optionally with data (settings, mappings etc)
+bool ElasticSearch::createIndex(const std::string& index, const char* data){
+    return (200 == _http.put(index.c_str(), data, 0));
+}
+
+// Delete given index (and all types, documents, mappings)
+bool ElasticSearch::deleteIndex(const std::string& index){
+    return (200 == _http.remove(index.c_str(), 0, 0));
+}
+
+// Refresh the index.
+void ElasticSearch::refresh(const std::string& index){
+    std::ostringstream oss;
+    oss << index << "/_refresh";
+
+    Json::Object msg;
+    _http.get(oss.str().c_str(), 0, &msg);
+}

src/elasticsearch/elasticsearch.h

@@ -34,9 +34,6 @@ class ElasticSearch {
         /// Delete the document by index/type.
         bool deleteAll(const char* index, const char* type);
 
-         /// Test if index exists
-        bool exist(const std::string& index);
-
 		/// Test if document exists
         bool exist(const std::string& index, const std::string& type, const std::string& id);
 
@@ -64,9 +61,23 @@ class ElasticSearch {
         /// Perform a scan to get all results from a query.
         int fullScan(const std::string& index, const std::string& type, const std::string& query, Json::Array& resultArray, int scrollSize = 1000);
 
+    public:
+        /// Delete given type (and all documents, mappings)
+        bool deleteType(const std::string& index, const std::string& type);
+
+    public:
+        /// Test if index exists
+        bool exist(const std::string& index);
+
+        /// Create index, optionally with data (settings, mappings etc)
+        bool createIndex(const std::string& index, const char* data = NULL);
+        
+        /// Delete given index (and all types, documents, mappings)
+        bool deleteIndex(const std::string& index);
+        
         /// Refresh the index.
         void refresh(const std::string& index);
-
+    
     private:
         /// Private constructor.
         ElasticSearch();