Skip to content

Fix opensearch types - requirement opensearch 2.0 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
o-alex wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix opensearch types - requirement opensearch 2.0 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1effe
remove _type from documents and bulk request
o-alex May 30, 2022
030cf18
update boost download location
o-alex May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rm -r cmake-${cmake_version}*
RUN echo Installing Boost; \
BOOST_V=`echo ${boost_version} | sed s/'\.'/'_'/g`; \
source scl_source enable devtoolset-8; \
wget --progress=bar:force https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
wget --progress=bar:force https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
tar xzf boost_${BOOST_V}.tar.gz; \
cd boost_${BOOST_V}; \
./bootstrap.sh; \
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rm -r cmake-${cmake_version}*

RUN echo Installing Boost; \
BOOST_V=`echo ${boost_version} | sed s/'\.'/'_'/g`; \
wget --progress=bar:force https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
wget --progress=bar:force https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
tar xzf boost_${BOOST_V}.tar.gz; \
cd boost_${BOOST_V}; \
./bootstrap.sh; \
Expand Down
1 change: 0 additions & 1 deletion include/ElasticSearchBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@ class ElasticSearchBase : public TimedRestBatcher, public

const bool mStats;
MovingCountersSet* const mCounters;
const std::string DEFAULT_TYPE;
};
#endif //EPIPE_ELASTICSEARCHBASE_H
4 changes: 2 additions & 2 deletions src/ElasticSearchBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ elastic_client_config, int time_to_wait_before_inserting, int bulk_size,
const bool statsEnabled, MovingCountersSet* const
metricsCounters) : TimedRestBatcher(elastic_client_config,
time_to_wait_before_inserting, bulk_size), mStats
(statsEnabled), mCounters(metricsCounters), DEFAULT_TYPE("_doc") {
(statsEnabled), mCounters(metricsCounters) {
}

std::string ElasticSearchBase::getElasticSearchBulkUrl(std::string index) {
std::string str = "/" + index + "/" + DEFAULT_TYPE + "/_bulk";
std::string str = "/" + index + "/_bulk";
return str;
}

Expand Down
9 changes: 0 additions & 9 deletions src/FileProvenanceElasticDataReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
op.AddMember("update", opVal, opAlloc);

Expand Down Expand Up @@ -80,7 +79,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
op.AddMember("update", opVal, opAlloc);

Expand Down Expand Up @@ -117,7 +115,6 @@ class ElasticHelper {

rapidjson::Value cleanupIdVal(rapidjson::kObjectType);
cleanupIdVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), cleanupAlloc), cleanupAlloc);
cleanupIdVal.AddMember("_type", rapidjson::Value().SetString("_doc", cleanupAlloc), cleanupAlloc);
cleanupIdVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), cleanupAlloc), cleanupAlloc);

cleanupId.AddMember("update", cleanupIdVal, cleanupId.GetAllocator());
Expand Down Expand Up @@ -147,7 +144,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
op.AddMember("update", opVal, opAlloc);

Expand Down Expand Up @@ -210,7 +206,6 @@ class ElasticHelper {

rapidjson::Value cleanupIdVal(rapidjson::kObjectType);
cleanupIdVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), cleanupAlloc), cleanupAlloc);
cleanupIdVal.AddMember("_type", rapidjson::Value().SetString("_doc", cleanupAlloc), cleanupAlloc);
cleanupIdVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), cleanupAlloc), cleanupAlloc);
cleanupId.AddMember("update", cleanupIdVal, cleanupAlloc);

Expand Down Expand Up @@ -253,7 +248,6 @@ class ElasticHelper {
rapidjson::Value opVal(rapidjson::kObjectType);

opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);

op.AddMember("delete", opVal, opAlloc);
Expand All @@ -275,7 +269,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);

op.AddMember("update", opVal, opAlloc);
Expand Down Expand Up @@ -327,7 +320,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);

op.AddMember("update", opVal, opAlloc);
Expand Down Expand Up @@ -392,7 +384,6 @@ class ElasticHelper {

rapidjson::Value opVal(rapidjson::kObjectType);
opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);

op.AddMember("update", opVal, opAlloc);
Expand Down