diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-13 23:02:41 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-13 23:02:41 +0100 |
commit | 0b1267cf363481eb31833bff454f693a8b517682 (patch) | |
tree | f1631f411401e787d3e3adbf6f1f072f8a311889 /streamingvisitors | |
parent | 92aa7222852ac9dba38246faec0be6ec80425d2c (diff) |
Remove redundant cast.
Diffstat (limited to 'streamingvisitors')
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 51c01a40fac..6621173657a 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -204,27 +204,26 @@ void SearchVisitor::init(const Parameters & params) _attrMan.add(_rankAttributeBacking); Parameters::ValueRef valueRef; if ( params.get("summaryclass", valueRef) ) { - _summaryClass = vespalib::string(static_cast<const char *>(valueRef.data()), - static_cast<unsigned>(valueRef.size())); + _summaryClass = vespalib::string(valueRef.data(), valueRef.size()); LOG(debug, "Received summary class: %s", _summaryClass.c_str()); } size_t wantedSummaryCount(10); if (params.get("summarycount", valueRef) ) { - vespalib::string tmp(static_cast<const char *>(valueRef.data()), valueRef.size()); + vespalib::string tmp(valueRef.data(), valueRef.size()); wantedSummaryCount = strtoul(tmp.c_str(), NULL, 0); LOG(debug, "Received summary count: %ld", wantedSummaryCount); } _queryResult->getSearchResult().setWantedHitCount(wantedSummaryCount); if (params.get("rankprofile", valueRef) ) { - vespalib::string tmp(static_cast<const char *>(valueRef.data()), valueRef.size()); + vespalib::string tmp(valueRef.data(), valueRef.size()); _rankController.setRankProfile(tmp); LOG(debug, "Received rank profile: %s", _rankController.getRankProfile().c_str()); } if (params.get("queryflags", valueRef) ) { - vespalib::string tmp(static_cast<const char *>(valueRef.data()), valueRef.size()); + vespalib::string tmp(valueRef.data(), valueRef.size()); LOG(debug, "Received query flags: 0x%lx", strtoul(tmp.c_str(), NULL, 0)); uint32_t queryFlags = strtoul(tmp.c_str(), NULL, 0); _rankController.setDumpFeatures((queryFlags & search::fs4transport::QFLAG_DUMP_FEATURES) != 0); @@ -234,7 +233,7 @@ void SearchVisitor::init(const Parameters & params) if (params.get("rankproperties", valueRef) && valueRef.size() > 0) { LOG(spam, "Received rank properties of %zd bytes", valueRef.size()); uint32_t len = static_cast<uint32_t>(valueRef.size()); - char * data = const_cast<char *>(static_cast<const char *>(valueRef.data())); + char * data = const_cast<char *>(valueRef.data()); FNET_DataBuffer src(data, len); uint32_t cnt = src.ReadInt32(); len -= sizeof(uint32_t); @@ -259,7 +258,7 @@ void SearchVisitor::init(const Parameters & params) } if (params.get("rankprofile", valueRef)) { - vespalib::string tmp(static_cast<const char *>(valueRef.data()), valueRef.size()); + vespalib::string tmp(valueRef.data(), valueRef.size()); _summaryGenerator.getDocsumState()._args.SetRankProfile(tmp); } @@ -270,7 +269,7 @@ void SearchVisitor::init(const Parameters & params) vespalib::string location; if (params.get("location", valueRef)) { - location = vespalib::string(static_cast<const char *>(valueRef.data()), valueRef.size()); + location = vespalib::string(valueRef.data(), valueRef.size()); LOG(debug, "Location = '%s'", location.c_str()); _summaryGenerator.getDocsumState()._args.SetLocation(valueRef.size(), (const char*)valueRef.data()); } @@ -278,14 +277,12 @@ void SearchVisitor::init(const Parameters & params) Parameters::ValueRef searchClusterBlob; if (params.get("searchcluster", searchClusterBlob)) { LOG(spam, "Received searchcluster blob of %zd bytes", searchClusterBlob.size()); - vespalib::string searchCluster(static_cast<const char *>(searchClusterBlob.data()), searchClusterBlob.size()); + vespalib::string searchCluster(searchClusterBlob.data(), searchClusterBlob.size()); _vsmAdapter = _env.getVSMAdapter(searchCluster); if ( params.get("sort", valueRef) ) { search::uca::UcaConverterFactory ucaFactory; - _sortSpec = search::common::SortSpec(vespalib::string(static_cast<const char *>(valueRef.data()), - static_cast<unsigned>(valueRef.size())), - ucaFactory); + _sortSpec = search::common::SortSpec(vespalib::string(valueRef.data(), valueRef.size()), ucaFactory); LOG(debug, "Received sort specification: '%s'", _sortSpec.getSpec().c_str()); } |