start elasticsearch container in CI

setup listener in CI

adjust

use libcurl

remove some useless curl

impl http client with libcurl

refactor es client

abandon multi field in single fulltext index

compile

remove useless curl

fix compile

fix unittest

add elasticsearch container service in CI

fix CI

fix CI

.github/workflows/pull_request.yml

@@ -254,6 +254,18 @@ jobs:
  volumes:
  - /tmp/ccache/nebula/${{ matrix.os }}-${{ matrix.compiler }}:/tmp/ccache/nebula/${{ matrix.os }}-${{ matrix.compiler }}
  options: --cap-add=SYS_PTRACE
+ services:
+ elasticsearch:
+ image: elasticsearch:7.17.7
+ ports:
+ - 9200:9200
+ env:
+ discovery.type: single-node
+ options: >-
+ --health-cmd "curl elasticsearch:9200"
+ --health-interval 10s
+ --health-timeout 5s
+ --health-retries 5
  steps:
  - uses: webiny/action-post-run@2.0.1
  with:

src/common/expression/test/CMakeLists.txt

@@ -33,7 +33,7 @@ set(expression_test_common_libs
  $<TARGET_OBJECTS:file_based_cluster_id_man_obj>
  $<TARGET_OBJECTS:process_obj>
  $<TARGET_OBJECTS:time_utils_obj>
- $<TARGET_OBJECTS:ft_es_graph_adapter_obj>
+ $<TARGET_OBJECTS:es_adapter_obj>
  $<TARGET_OBJECTS:ws_common_obj>
  $<TARGET_OBJECTS:version_obj>
  $<TARGET_OBJECTS:graph_session_obj>
@@ -47,6 +47,7 @@ set(expression_test_common_libs
  $<TARGET_OBJECTS:ssl_obj>
  $<TARGET_OBJECTS:memory_obj>
  $<TARGET_OBJECTS:gc_obj>
+ $<TARGET_OBJECTS:http_client_obj>
 )
 
 
@@ -95,6 +96,7 @@ nebula_add_test(
  gtest
  ${THRIFT_LIBRARIES}
  ${PROXYGEN_LIBRARIES}
+ curl
 )
 
 nebula_add_executable(
@@ -110,6 +112,7 @@ nebula_add_executable(
  boost_regex
  ${THRIFT_LIBRARIES}
  ${PROXYGEN_LIBRARIES}
+ curl
 )
 
 nebula_add_executable(

src/common/http/test/CMakeLists.txt

@@ -23,5 +23,4 @@ nebula_add_test(
  ${PROXYGEN_LIBRARIES}
  gtest
  curl
-
 )

src/common/http/test/HttpClientTest.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019 vesoft inc. All rights reserved.
+/* Copyright (c) 2022 vesoft inc. All rights reserved.
  *
  * This source code is licensed under Apache 2.0 License.
  */

src/common/plugin/fulltext/CMakeLists.txt

@@ -3,13 +3,9 @@
 # This source code is licensed under Apache 2.0 License.
 
 nebula_add_library(
- ft_es_graph_adapter_obj OBJECT
- elasticsearch/ESGraphAdapter.cpp
-)
-
-nebula_add_library(
- ft_es_storage_adapter_obj OBJECT
- elasticsearch/ESStorageAdapter.cpp
+ es_adapter_obj OBJECT
+ elasticsearch/ESAdapter.cpp
+ elasticsearch/ESClient.cpp
 )
 
 nebula_add_subdirectory(test)