You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2020/07/13 16:20:55 UTC
[geode-native] branch develop updated: GEODE-8342: Replace
non-inclusive language. (#626)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 7291852 GEODE-8342: Replace non-inclusive language. (#626)
7291852 is described below
commit 729185236e66377e5b367d40e43c8654314c60ed
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 13 09:20:46 2020 -0700
GEODE-8342: Replace non-inclusive language. (#626)
* 'blacklist' wasn't effectively in use anyway, so just remove it.
---
cppcache/include/geode/CqQuery.hpp | 2 +-
cppcache/src/CacheImpl.hpp | 5 -----
cppcache/src/ClientMetadataService.cpp | 4 ----
cppcache/src/ThinClientRegion.cpp | 6 ++----
4 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/cppcache/include/geode/CqQuery.hpp b/cppcache/include/geode/CqQuery.hpp
index eec70df..13807c3 100644
--- a/cppcache/include/geode/CqQuery.hpp
+++ b/cppcache/include/geode/CqQuery.hpp
@@ -62,7 +62,7 @@ class APACHE_GEODE_EXPORT CqQuery {
/**
* Get teh query object generated for this CQs query.
- * @return Query object fort he query string
+ * @return Query object for the query string
*/
virtual std::shared_ptr<Query> getQuery() const = 0;
diff --git a/cppcache/src/CacheImpl.hpp b/cppcache/src/CacheImpl.hpp
index db2899c..f00b84c 100644
--- a/cppcache/src/CacheImpl.hpp
+++ b/cppcache/src/CacheImpl.hpp
@@ -96,10 +96,6 @@ class APACHE_GEODE_EXPORT CacheImpl {
bool getAndResetNetworkHopFlag() { return m_networkhop.exchange(false); }
- int getBlackListBucketTimeouts() { return m_blacklistBucketTimeout; }
-
- void incBlackListBucketTimeouts() { ++m_blacklistBucketTimeout; }
-
int8_t getAndResetServerGroupFlag() { return m_serverGroupFlag.exchange(0); }
void setServerGroupFlag(int8_t serverGroupFlag) {
@@ -317,7 +313,6 @@ class APACHE_GEODE_EXPORT CacheImpl {
private:
std::atomic<bool> m_networkhop;
- std::atomic<int> m_blacklistBucketTimeout;
std::atomic<int8_t> m_serverGroupFlag;
bool m_ignorePdxUnreadFields;
bool m_readPdxSerialized;
diff --git a/cppcache/src/ClientMetadataService.cpp b/cppcache/src/ClientMetadataService.cpp
index e2d68ac..d844883 100644
--- a/cppcache/src/ClientMetadataService.cpp
+++ b/cppcache/src/ClientMetadataService.cpp
@@ -786,12 +786,8 @@ bool ClientMetadataService::isBucketMarkedForTimeout(const char* regionFullPath,
const auto& bs = m_bucketStatus.find(regionFullPath);
if (bs != m_bucketStatus.end()) {
bool m = bs->second->isBucketTimedOut(bucketid, m_bucketWaitTimeout);
- if (m) {
- m_cache->incBlackListBucketTimeouts();
- }
LOGFINE("isBucketMarkedForTimeout:: for bucket %d returning = %d", bucketid,
m);
-
return m;
}
diff --git a/cppcache/src/ThinClientRegion.cpp b/cppcache/src/ThinClientRegion.cpp
index 5a9c070..4703d92 100644
--- a/cppcache/src/ThinClientRegion.cpp
+++ b/cppcache/src/ThinClientRegion.cpp
@@ -3021,10 +3021,8 @@ void ThinClientRegion::executeFunction(
} else if (err == GF_CLIENT_WAIT_TIMEOUT ||
err == GF_CLIENT_WAIT_TIMEOUT_REFRESH_PRMETADATA) {
LOGINFO(
- "function timeout, possibly bucket is not available or bucket "
- "blacklisted. Name: %s, timeout: %s, params: %" PRIu8
- ", retryAttempts: "
- "%d ",
+ "function timeout, possibly bucket is not available. Name: %s, "
+ "timeout: %s, params: %" PRIu8 ", retryAttempts: %d ",
func.c_str(), to_string(timeout).c_str(), getResult, retryAttempts);
throwExceptionIfError("ExecuteOnRegion", GF_CLIENT_WAIT_TIMEOUT);
} else {