-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#10: RapidJSON instead of slow JsonCpp (in scroll api). Still WIP, as…
… this must be resolved: * reconsider using std::unique_ptr on the interface, maybe raw pointer would be more ABI secure * CMake && doc update
- Loading branch information
Showing
7 changed files
with
162 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /** | ||
| * \file | ||
| * \brief Scroll parser implemented using rapidjson library. | ||
| * | ||
| * Parsing of JSON result exposed due to header-only rapidjson library. | ||
| * Result parsing could be completely hidden inside elasticlient implementation | ||
| * thus resulting in necessity to parse result twice - for error detection and | ||
| * scrollId retrieval, and later by the client code to get the data. | ||
| * Or it can be (and it is) exposed, so the client code compiles exactly same | ||
| * rapidjson::Document class for result parsing and for result hits processing. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
| #include <memory> | ||
| #include <rapidjson/document.h> | ||
| #include <elasticlient/scroll.h> | ||
|
|
||
|
|
||
| namespace elasticlient { | ||
|
|
||
|
|
||
| /** | ||
| * Parse scroll result and set it into \p parsedResult. | ||
| * | ||
| * \note Function implemented in public header to assure binary compatibility | ||
| * of parsed rapidjson document. Otherwise there would be a risk of using binary | ||
| * incompatible versions inside elasticlient.so and the client's side... | ||
| * | ||
| * \param result Scroll result (json). | ||
| * \param parsedResult Parsed json result. | ||
| * \param scrollId ScrollId read from the result. | ||
| * \return true on success. | ||
| */ | ||
| bool parseScrollResult( | ||
| const std::string &result, std::unique_ptr<JsonResult> &parsedResult, | ||
| std::string &scrollId) | ||
| { | ||
| parsedResult.reset(new elasticlient::JsonResult{}); | ||
|
|
||
| rapidjson::ParseResult ok = parsedResult->document.Parse(result.c_str()); | ||
| if (!ok || !parsedResult->document.IsObject()) { | ||
| // something is weird, only report error | ||
| return false; | ||
| } | ||
|
|
||
| if (parsedResult->document.HasMember("error")) { | ||
| const rapidjson::Value &err = parsedResult->document["error"]; | ||
| if (!err.IsBool() || err.GetBool()) { | ||
| // an error was reported | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (parsedResult->document.HasMember("timed_out")) { | ||
| const rapidjson::Value &doc = parsedResult->document["timed_out"]; | ||
| if (!doc.IsBool() || doc.GetBool()) { | ||
| // request timed out | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (parsedResult->document.HasMember("_shards") | ||
| && parsedResult->document["_shards"].IsObject()) { | ||
| const rapidjson::Value &shards = parsedResult->document["_shards"]; | ||
| if (shards.HasMember("failed") && shards["failed"].IsInt()) { | ||
| const int failed = shards["failed"].GetInt(); | ||
| if (failed > 0) { | ||
| // failed shards, do not trust the data | ||
| return false; | ||
| } | ||
| } else { | ||
| // no information about failed shards, but it has to be here | ||
| return false; | ||
| } | ||
| } else { | ||
| // no information about shards, but it has to be here | ||
| return false; | ||
| } | ||
|
|
||
| if (parsedResult->document.HasMember("hits")) { | ||
| rapidjson::Value &hits = parsedResult->document["hits"]; | ||
| // just make sure the hits array is present | ||
| if (hits.HasMember("hits") && hits["hits"].IsArray()) { | ||
| if (parsedResult->document.HasMember("_scroll_id") | ||
| && parsedResult->document["_scroll_id"].IsString()) { | ||
| scrollId = parsedResult->document["_scroll_id"].GetString(); | ||
| return true; | ||
| } | ||
| // missing _scroll_id, is that scroll response? | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| // scroll response is not ok | ||
| return false; | ||
| } | ||
|
|
||
|
|
||
| } // namespace elasticlient |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.