Github user dgkimura commented on a diff in the pull request:
https://github.com/apache/geode-native/pull/107#discussion_r128660879
--- Diff: src/cppcache/src/StructSetImpl.cpp ---
@@ -66,25 +66,22 @@ SelectResultsIterator StructSetImpl::getIterator() {
return SelectResultsIterator(m_structVector, shared_from_this());
}
-int32_t StructSetImpl::getFieldIndex(const char* fieldname) {
- std::map<std::string, int32_t>::iterator iter =
+const int32_t StructSetImpl::getFieldIndex(const std::string& fieldname) {
+ const auto& iter =
m_fieldNameIndexMap.find(fieldname);
if (iter != m_fieldNameIndexMap.end()) {
return iter->second;
} else {
- // std::string tmp = "fieldname ";
- // tmp += fieldname + " not found";
- throw IllegalArgumentException("fieldname not found");
+ throw std::invalid_argument("fieldname not found");
}
}
-const char* StructSetImpl::getFieldName(int32_t index) {
- for (std::map<std::string, int32_t>::iterator iter =
- m_fieldNameIndexMap.begin();
- iter != m_fieldNameIndexMap.end(); ++iter) {
- if (iter->second == index) return iter->first.c_str();
+const std::string& StructSetImpl::getFieldName(int32_t index) {
+ for (const auto& iter : m_fieldNameIndexMap) {
+ if (iter.second == index) return (iter.first);
}
- return nullptr;
+
+ throw std::out_of_range("Struct: fieldName not found.");
--- End diff --
Would it add any value having the index in the error message?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
