update

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ThreadPool"]
+	path = ThreadPool
+	url = https://github.com/EOSLaoMao/ThreadPool.git

CMakeLists.txt

@@ -2,7 +2,6 @@ file(GLOB HEADERS "include/eosio/elasticsearch_plugin/*.hpp")
 add_library( elasticsearch_plugin
              elasticsearch_plugin.cpp
              elastic_client.cpp
-             deserializer.cpp
              bulker.cpp
              ${HEADERS} )
 

benchmark/benchmark.md

@@ -2,12 +2,12 @@
 
 | Replay 10000 Block   | elapse(s) | speed(b/s) |
 | -------------------- |:---------:|:----------:|
-| elasticsearch_plugin | 548       | 18.25      |
+| elasticsearch_plugin | 266       | 37.59      |
 | mongo_db_plugin      | 694       | 14.41      |
 
 | Replay 100000 Block  | elapse(s) | speed(b/s) |
 | -------------------- |:---------:|:----------:|
-| elasticsearch_plugin | 663       | 150.83     |
+| elasticsearch_plugin | 354       | 282.49     |
 | mongo_db_plugin      | 987       | 101.32     |
 
 ## Hardware
@@ -28,16 +28,18 @@ The MongoDB and Elasticsearch are both running in the docker container with basi
 ### Command-line
 
 ```bash
-./build/programs/nodeos/nodeos --data-dir=dev_config/data \
-    --config-dir=dev_config \
+./build/programs/nodeos/nodeos \
+    --data-dir=data \
+    --config-dir=config \
+    --abi-serializer-max-time-ms=1000000 \
     --replay-blockchain \
     --elastic-url=http://localhost:9200/ \
     --elastic-queue-size=512 \
-    --elastic-abi-cache-size=8192 \
     --elastic-index-wipe
 
-./build/programs/nodeos/nodeos --data-dir=dev_config/data \
-    --config-dir=dev_config \
+./build/programs/nodeos/nodeos \
+    --data-dir=data \
+    --config-dir=config \
     --replay-blockchain \
     --mongodb-uri=mongodb://root:example@localhost:27017/eos?authSource=admin \
     --mongodb-queue-size=512 \

bulker.cpp

@@ -58,7 +58,7 @@ bulker_pool::bulker_pool(size_t size, size_t bulk_size,
                          const std::string &user, const std::string &password): pool_size(size), bulk_size(bulk_size)
 {
    for (int i = 0; i < pool_size; ++i) {
-      bulker_vec.emplace_back( new bulker(bulk_size, url_list, user, password) );
+      bulkers.emplace_back( new bulker(bulk_size, url_list, user, password) );
    }
 }
 
@@ -69,12 +69,12 @@ bulker& bulker_pool::get() {
 
    size_t cur_idx = index % pool_size;
 
-   auto ptr = bulker_vec[cur_idx].get();
+   auto ptr = bulkers[cur_idx].get();
 
    if ( ptr->size() >= bulk_size ) {
       cur_idx = (cur_idx + 1) % pool_size;
       index = cur_idx;
-      return *bulker_vec[cur_idx].get();
+      return *bulkers[cur_idx].get();
    } else {
       return *ptr;
    }

bulker.hpp

@@ -43,7 +43,7 @@ class bulker_pool
    bulker& get();
 
 private:
-   std::vector<std::unique_ptr<bulker>> bulker_vec;
+   std::vector<std::unique_ptr<bulker>> bulkers;
    size_t pool_size;
    size_t bulk_size;
    std::atomic<size_t> index {0};

elastic_client.hpp

@@ -11,7 +11,7 @@ class elastic_client
 {
 public:
    elastic_client(const std::vector<std::string> url_list, const std::string &user, const std::string &password)
-      :client(url_list, user, password, 100000) {};
+      :client(url_list, user, password, std::numeric_limits<int32_t>::max()) {};
 
    void delete_index(const std::string &index_name);
    void init_index(const std::string &index_name, const std::string &mappings);