[
https://issues.apache.org/jira/browse/GEODE-3149?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16254309#comment-16254309
]
ASF GitHub Bot commented on GEODE-3149:
---------------------------------------
mhansonp closed pull request #151: GEODE-3149: Removing unneeded file
URL: https://github.com/apache/geode-native/pull/151
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/clicache/src/IGeodeSerializable.hpp
b/clicache/src/IGeodeSerializable.hpp
index 3055f478..ff34a148 100644
--- a/clicache/src/IGeodeSerializable.hpp
+++ b/clicache/src/IGeodeSerializable.hpp
@@ -19,7 +19,7 @@
#include "geode_defs.hpp"
#include "begin_native.hpp"
-#include <geode/geode_types.hpp>
+#include <geode/geode_globals.hpp>
#include "end_native.hpp"
using namespace System;
diff --git a/cppcache/include/geode/AttributesFactory.hpp
b/cppcache/include/geode/AttributesFactory.hpp
index 22941b6e..fad65c38 100644
--- a/cppcache/include/geode/AttributesFactory.hpp
+++ b/cppcache/include/geode/AttributesFactory.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "ExpirationAction.hpp"
#include "CacheLoader.hpp"
diff --git a/cppcache/include/geode/AttributesMutator.hpp
b/cppcache/include/geode/AttributesMutator.hpp
index 363d2712..491732f9 100644
--- a/cppcache/include/geode/AttributesMutator.hpp
+++ b/cppcache/include/geode/AttributesMutator.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExpirationAction.hpp"
#include "util/chrono/duration.hpp"
diff --git a/cppcache/include/geode/AuthInitialize.hpp
b/cppcache/include/geode/AuthInitialize.hpp
index 0fab2da3..9f746a90 100644
--- a/cppcache/include/geode/AuthInitialize.hpp
+++ b/cppcache/include/geode/AuthInitialize.hpp
@@ -25,7 +25,7 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
+#include <memory>
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/Cache.hpp b/cppcache/include/geode/Cache.hpp
index f7bb2148..e88766fd 100644
--- a/cppcache/include/geode/Cache.hpp
+++ b/cppcache/include/geode/Cache.hpp
@@ -23,9 +23,7 @@
#include <string>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "GeodeCache.hpp"
-#include "geode_types.hpp"
#include "Region.hpp"
#include "DistributedSystem.hpp"
#include "QueryService.hpp"
diff --git a/cppcache/include/geode/CacheAttributes.hpp
b/cppcache/include/geode/CacheAttributes.hpp
index da1cae8a..0416dde4 100644
--- a/cppcache/include/geode/CacheAttributes.hpp
+++ b/cppcache/include/geode/CacheAttributes.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/CacheFactory.hpp
b/cppcache/include/geode/CacheFactory.hpp
index f3397af5..2a5211fb 100644
--- a/cppcache/include/geode/CacheFactory.hpp
+++ b/cppcache/include/geode/CacheFactory.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "util/chrono/duration.hpp"
#include "DistributedSystem.hpp"
#include "Cache.hpp"
diff --git a/cppcache/include/geode/CacheListener.hpp
b/cppcache/include/geode/CacheListener.hpp
index dd51ab9d..d93ec8ab 100644
--- a/cppcache/include/geode/CacheListener.hpp
+++ b/cppcache/include/geode/CacheListener.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include <memory>
/**
diff --git a/cppcache/include/geode/CacheLoader.hpp
b/cppcache/include/geode/CacheLoader.hpp
index 044bf13f..446dc9de 100644
--- a/cppcache/include/geode/CacheLoader.hpp
+++ b/cppcache/include/geode/CacheLoader.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "Cacheable.hpp"
diff --git a/cppcache/include/geode/CacheStatistics.hpp
b/cppcache/include/geode/CacheStatistics.hpp
index f127b104..cd38601a 100644
--- a/cppcache/include/geode/CacheStatistics.hpp
+++ b/cppcache/include/geode/CacheStatistics.hpp
@@ -24,7 +24,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
/**
* @file
diff --git a/cppcache/include/geode/CacheTransactionManager.hpp
b/cppcache/include/geode/CacheTransactionManager.hpp
index b43175ae..0f9e1f98 100644
--- a/cppcache/include/geode/CacheTransactionManager.hpp
+++ b/cppcache/include/geode/CacheTransactionManager.hpp
@@ -23,8 +23,8 @@
//#### Warning: DO NOT directly include Region.hpp, include Cache.hpp instead.
#include <chrono>
+#include <memory>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/CacheWriter.hpp
b/cppcache/include/geode/CacheWriter.hpp
index d8692adc..f5854805 100644
--- a/cppcache/include/geode/CacheWriter.hpp
+++ b/cppcache/include/geode/CacheWriter.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
/**
* @file
diff --git a/cppcache/include/geode/Cacheable.hpp
b/cppcache/include/geode/Cacheable.hpp
index f914c267..d2ae52f9 100644
--- a/cppcache/include/geode/Cacheable.hpp
+++ b/cppcache/include/geode/Cacheable.hpp
@@ -24,6 +24,9 @@
* @file
*/
#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include "util/functional.hpp"
#include "geode_globals.hpp"
#include "Serializable.hpp"
@@ -40,6 +43,19 @@ inline std::shared_ptr<Cacheable> createValue(
return std::dynamic_pointer_cast<Cacheable>(value);
}
+class CacheableKey;
+typedef std::unordered_map<std::shared_ptr<CacheableKey>,
+ std::shared_ptr<Cacheable>,
+ dereference_hash<std::shared_ptr<CacheableKey>>,
+dereference_equal_to<std::shared_ptr<CacheableKey>>>
+HashMapOfCacheable;
+
+typedef std::unordered_set<std::shared_ptr<CacheableKey>,
+ dereference_hash<std::shared_ptr<CacheableKey>>,
+dereference_equal_to<std::shared_ptr<CacheableKey>>>
+HashSetOfCacheableKey;
+
+
} // namespace client
} // namespace geode
} // namespace apache
diff --git a/cppcache/include/geode/CacheableDate.hpp
b/cppcache/include/geode/CacheableDate.hpp
index 1ee36ec3..b0bc71d6 100644
--- a/cppcache/include/geode/CacheableDate.hpp
+++ b/cppcache/include/geode/CacheableDate.hpp
@@ -21,7 +21,6 @@
#define GEODE_CACHEABLEDATE_H_
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "CacheableString.hpp"
#include "GeodeTypeIds.hpp"
diff --git a/cppcache/include/geode/CacheableFileName.hpp
b/cppcache/include/geode/CacheableFileName.hpp
index 5b1a0efb..ec6720c9 100644
--- a/cppcache/include/geode/CacheableFileName.hpp
+++ b/cppcache/include/geode/CacheableFileName.hpp
@@ -21,7 +21,6 @@
#define GEODE_CACHEABLEFILENAME_H_
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "CacheableString.hpp"
diff --git a/cppcache/include/geode/CacheableKey.hpp
b/cppcache/include/geode/CacheableKey.hpp
index 1a00fba2..a663e16a 100644
--- a/cppcache/include/geode/CacheableKey.hpp
+++ b/cppcache/include/geode/CacheableKey.hpp
@@ -23,7 +23,6 @@
#include <functional>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Cacheable.hpp"
/**
diff --git a/cppcache/include/geode/CacheableObjectArray.hpp
b/cppcache/include/geode/CacheableObjectArray.hpp
index 63e171de..618af98c 100644
--- a/cppcache/include/geode/CacheableObjectArray.hpp
+++ b/cppcache/include/geode/CacheableObjectArray.hpp
@@ -23,7 +23,6 @@
#include <memory>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Cacheable.hpp"
/** @file
*/
diff --git a/cppcache/include/geode/CacheableString.hpp
b/cppcache/include/geode/CacheableString.hpp
index d1d9fc32..457150ec 100644
--- a/cppcache/include/geode/CacheableString.hpp
+++ b/cppcache/include/geode/CacheableString.hpp
@@ -21,7 +21,6 @@
#define GEODE_CACHEABLESTRING_H_
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "GeodeTypeIds.hpp"
#include "ExceptionTypes.hpp"
diff --git a/cppcache/include/geode/CacheableUndefined.hpp
b/cppcache/include/geode/CacheableUndefined.hpp
index 1dd7e786..5e5d33c7 100644
--- a/cppcache/include/geode/CacheableUndefined.hpp
+++ b/cppcache/include/geode/CacheableUndefined.hpp
@@ -21,7 +21,6 @@
#define GEODE_CACHEABLEUNDEFINED_H_
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Cacheable.hpp"
/** @file
diff --git a/cppcache/include/geode/CqAttributes.hpp
b/cppcache/include/geode/CqAttributes.hpp
index bbf15b92..805aa427 100644
--- a/cppcache/include/geode/CqAttributes.hpp
+++ b/cppcache/include/geode/CqAttributes.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include <vector>
#include "CqListener.hpp"
diff --git a/cppcache/include/geode/CqAttributesFactory.hpp
b/cppcache/include/geode/CqAttributesFactory.hpp
index 48f1dcb5..16dc0dd4 100644
--- a/cppcache/include/geode/CqAttributesFactory.hpp
+++ b/cppcache/include/geode/CqAttributesFactory.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CqAttributes.hpp"
#include "CqListener.hpp"
diff --git a/cppcache/include/geode/CqAttributesMutator.hpp
b/cppcache/include/geode/CqAttributesMutator.hpp
index badfdd29..a12b2be3 100644
--- a/cppcache/include/geode/CqAttributesMutator.hpp
+++ b/cppcache/include/geode/CqAttributesMutator.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include <vector>
/**
* @file
diff --git a/cppcache/include/geode/CqEvent.hpp
b/cppcache/include/geode/CqEvent.hpp
index cd71e775..8758833e 100644
--- a/cppcache/include/geode/CqEvent.hpp
+++ b/cppcache/include/geode/CqEvent.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Exception.hpp"
#include "CqOperation.hpp"
#include "Cacheable.hpp"
diff --git a/cppcache/include/geode/CqListener.hpp
b/cppcache/include/geode/CqListener.hpp
index 0f466398..6ee6331c 100644
--- a/cppcache/include/geode/CqListener.hpp
+++ b/cppcache/include/geode/CqListener.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CqEvent.hpp"
/**
diff --git a/cppcache/include/geode/CqQuery.hpp
b/cppcache/include/geode/CqQuery.hpp
index 3b335d75..a6711fcb 100644
--- a/cppcache/include/geode/CqQuery.hpp
+++ b/cppcache/include/geode/CqQuery.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CqResults.hpp"
#include "CqStatistics.hpp"
diff --git a/cppcache/include/geode/CqResults.hpp
b/cppcache/include/geode/CqResults.hpp
index 6e9f48a1..861d9c18 100644
--- a/cppcache/include/geode/CqResults.hpp
+++ b/cppcache/include/geode/CqResults.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "Serializable.hpp"
#include "CacheableBuiltins.hpp"
diff --git a/cppcache/include/geode/CqServiceStatistics.hpp
b/cppcache/include/geode/CqServiceStatistics.hpp
index 9c2a1031..085dfcb3 100644
--- a/cppcache/include/geode/CqServiceStatistics.hpp
+++ b/cppcache/include/geode/CqServiceStatistics.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
/**
* @file
diff --git a/cppcache/include/geode/CqState.hpp
b/cppcache/include/geode/CqState.hpp
index 55e8e93a..43b8d046 100644
--- a/cppcache/include/geode/CqState.hpp
+++ b/cppcache/include/geode/CqState.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
/**
* @file
diff --git a/cppcache/include/geode/CqStatistics.hpp
b/cppcache/include/geode/CqStatistics.hpp
index 4c16292e..ab6659fc 100644
--- a/cppcache/include/geode/CqStatistics.hpp
+++ b/cppcache/include/geode/CqStatistics.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
/**
* @file
diff --git a/cppcache/include/geode/DataInput.hpp
b/cppcache/include/geode/DataInput.hpp
index 61c7846a..e68456b7 100644
--- a/cppcache/include/geode/DataInput.hpp
+++ b/cppcache/include/geode/DataInput.hpp
@@ -23,7 +23,6 @@
#include "ExceptionTypes.hpp"
#include <cstring>
#include <string>
-#include "geode_types.hpp"
#include "Serializable.hpp"
#include "CacheableString.hpp"
diff --git a/cppcache/include/geode/DefaultResultCollector.hpp
b/cppcache/include/geode/DefaultResultCollector.hpp
index 8a4a4a00..4de3ba92 100644
--- a/cppcache/include/geode/DefaultResultCollector.hpp
+++ b/cppcache/include/geode/DefaultResultCollector.hpp
@@ -26,7 +26,6 @@
#include <condition_variable>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
#include "ResultCollector.hpp"
diff --git a/cppcache/include/geode/DistributedSystem.hpp
b/cppcache/include/geode/DistributedSystem.hpp
index 03666295..9251c237 100644
--- a/cppcache/include/geode/DistributedSystem.hpp
+++ b/cppcache/include/geode/DistributedSystem.hpp
@@ -26,7 +26,6 @@
#include <memory>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "Properties.hpp"
diff --git a/cppcache/include/geode/EntryEvent.hpp
b/cppcache/include/geode/EntryEvent.hpp
index 6abeffd9..e6528ffd 100644
--- a/cppcache/include/geode/EntryEvent.hpp
+++ b/cppcache/include/geode/EntryEvent.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Region.hpp"
#include "CacheableKey.hpp"
diff --git a/cppcache/include/geode/Exception.hpp
b/cppcache/include/geode/Exception.hpp
index a2618e86..ae50d312 100644
--- a/cppcache/include/geode/Exception.hpp
+++ b/cppcache/include/geode/Exception.hpp
@@ -21,9 +21,9 @@
#define GEODE_EXCEPTION_H_
#include <string>
-
+#include <unordered_map>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
+#include "util/functional.hpp"
/**
* @file
@@ -125,6 +125,15 @@ class CPPCACHE_EXPORT Exception {
friend class DistributedSystem;
};
+
+class CacheableKey;
+typedef std::unordered_map<std::shared_ptr<CacheableKey>,
+ std::shared_ptr<Exception>,
+ dereference_hash<std::shared_ptr<CacheableKey>>,
+dereference_equal_to<std::shared_ptr<CacheableKey>>>
+HashMapOfException;
+
+
} // namespace client
} // namespace geode
} // namespace apache
diff --git a/cppcache/include/geode/Execution.hpp
b/cppcache/include/geode/Execution.hpp
index f82a60a6..9146f6a6 100644
--- a/cppcache/include/geode/Execution.hpp
+++ b/cppcache/include/geode/Execution.hpp
@@ -24,7 +24,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
#include "ResultCollector.hpp"
diff --git a/cppcache/include/geode/FunctionService.hpp
b/cppcache/include/geode/FunctionService.hpp
index c33286d3..16e3766b 100644
--- a/cppcache/include/geode/FunctionService.hpp
+++ b/cppcache/include/geode/FunctionService.hpp
@@ -21,7 +21,6 @@
#define GEODE_FUNCTIONSERVICE_H_
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Execution.hpp"
/**
diff --git a/cppcache/include/geode/GeodeCache.hpp
b/cppcache/include/geode/GeodeCache.hpp
index 78c91dee..57b42922 100644
--- a/cppcache/include/geode/GeodeCache.hpp
+++ b/cppcache/include/geode/GeodeCache.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "RegionService.hpp"
/**
diff --git a/cppcache/include/geode/HashFunction.hpp
b/cppcache/include/geode/HashFunction.hpp
deleted file mode 100644
index 8f41a69d..00000000
--- a/cppcache/include/geode/HashFunction.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-#ifndef GEODE_HASHFUNCTION_H_
-#define GEODE_HASHFUNCTION_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "geode_globals.hpp"
-#include <memory>
-#include "CacheableKey.hpp"
-
-/** @file
- */
-
-namespace apache {
-namespace geode {
-namespace client {
-
-/** typedef for the hash function used by the hashing schemes. */
-typedef int32_t (*Hasher)(const std::shared_ptr<SharedBase>&);
-
-/** typedef for the hashing key equality function. */
-typedef bool (*EqualTo)(const std::shared_ptr<SharedBase>&,
- const std::shared_ptr<SharedBase>&);
-
-class HashSB {
- private:
- Hasher m_hashFn;
-
- // Never defined.
- HashSB();
-
- public:
- HashSB(const Hasher hashFn) : m_hashFn(hashFn) {}
-
- int32_t operator()(const std::shared_ptr<SharedBase>& p) const {
- return m_hashFn(p);
- }
-};
-
-class EqualToSB {
- private:
- EqualTo m_equalFn;
-
- // Never defined.
- EqualToSB();
-
- public:
- EqualToSB(const EqualTo equalFn) : m_equalFn(equalFn) {}
-
- bool operator()(const std::shared_ptr<SharedBase>& x,
- const std::shared_ptr<SharedBase>& y) const {
- return m_equalFn(x, y);
- }
-};
-
-template <typename TKEY>
-inline int32_t hashFunction(const TKEY& k) {
- return k->hashcode();
-}
-
-template <typename TKEY>
-inline bool equalToFunction(const TKEY& x, const TKEY& y) {
- return (*x.get() == *y.get());
-}
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // GEODE_HASHFUNCTION_H_
diff --git a/cppcache/include/geode/HashMapT.hpp
b/cppcache/include/geode/HashMapT.hpp
deleted file mode 100644
index 685268aa..00000000
--- a/cppcache/include/geode/HashMapT.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#ifndef GEODE_HASHMAPT_H_
-#define GEODE_HASHMAPT_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unordered_map>
-#include <memory>
-
-#include "geode_globals.hpp"
-#include "Cacheable.hpp"
-#include "CacheableKey.hpp"
-#include "Exception.hpp"
-#include "util/functional.hpp"
-
-namespace apache {
-namespace geode {
-namespace client {
-
-typedef std::unordered_map<std::shared_ptr<CacheableKey>,
- std::shared_ptr<Cacheable>,
- dereference_hash<std::shared_ptr<CacheableKey>>,
- dereference_equal_to<std::shared_ptr<CacheableKey>>>
- HashMapOfCacheable;
-
-typedef std::unordered_map<std::shared_ptr<CacheableKey>,
- std::shared_ptr<Exception>,
- dereference_hash<std::shared_ptr<CacheableKey>>,
- dereference_equal_to<std::shared_ptr<CacheableKey>>>
- HashMapOfException;
-
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // GEODE_HASHMAPT_H_
diff --git a/cppcache/include/geode/HashSetT.hpp
b/cppcache/include/geode/HashSetT.hpp
deleted file mode 100644
index 3e7f24ca..00000000
--- a/cppcache/include/geode/HashSetT.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#ifndef GEODE_HASHSETT_H_
-#define GEODE_HASHSETT_H_
-
-#include <unordered_set>
-#include <memory>
-
-#include "geode_globals.hpp"
-#include "CacheableKey.hpp"
-#include "util/functional.hpp"
-
-namespace apache {
-namespace geode {
-namespace client {
-
-typedef std::unordered_set<std::shared_ptr<CacheableKey>,
- dereference_hash<std::shared_ptr<CacheableKey>>,
- dereference_equal_to<std::shared_ptr<CacheableKey>>>
- HashSetOfCacheableKey;
-
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // GEODE_HASHSETT_H_
diff --git a/cppcache/include/geode/PdxInstanceFactory.hpp
b/cppcache/include/geode/PdxInstanceFactory.hpp
index 2f1e0bf5..6982a5a8 100644
--- a/cppcache/include/geode/PdxInstanceFactory.hpp
+++ b/cppcache/include/geode/PdxInstanceFactory.hpp
@@ -22,7 +22,6 @@
#include "PdxInstance.hpp"
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
#include "CacheableDate.hpp"
#include "CacheableObjectArray.hpp"
diff --git a/cppcache/include/geode/PdxWriter.hpp
b/cppcache/include/geode/PdxWriter.hpp
index 3325c343..c187267d 100644
--- a/cppcache/include/geode/PdxWriter.hpp
+++ b/cppcache/include/geode/PdxWriter.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
#include "CacheableDate.hpp"
diff --git a/cppcache/include/geode/PersistenceManager.hpp
b/cppcache/include/geode/PersistenceManager.hpp
index 8baebb25..84e92f21 100644
--- a/cppcache/include/geode/PersistenceManager.hpp
+++ b/cppcache/include/geode/PersistenceManager.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "DistributedSystem.hpp"
#include "ExceptionTypes.hpp"
#include "CacheableKey.hpp"
diff --git a/cppcache/include/geode/Pool.hpp b/cppcache/include/geode/Pool.hpp
index 2a0352ba..f319a4e5 100644
--- a/cppcache/include/geode/Pool.hpp
+++ b/cppcache/include/geode/Pool.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "util/chrono/duration.hpp"
#include "CacheableBuiltins.hpp"
#include "Cache.hpp"
diff --git a/cppcache/include/geode/PoolFactory.hpp
b/cppcache/include/geode/PoolFactory.hpp
index 85356df8..ee05ce85 100644
--- a/cppcache/include/geode/PoolFactory.hpp
+++ b/cppcache/include/geode/PoolFactory.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "util/chrono/duration.hpp"
#include "Pool.hpp"
diff --git a/cppcache/include/geode/PoolManager.hpp
b/cppcache/include/geode/PoolManager.hpp
index a0bb05b8..57c04dea 100644
--- a/cppcache/include/geode/PoolManager.hpp
+++ b/cppcache/include/geode/PoolManager.hpp
@@ -24,7 +24,6 @@
#include <string>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Cache.hpp"
#include "Pool.hpp"
diff --git a/cppcache/include/geode/Properties.hpp
b/cppcache/include/geode/Properties.hpp
index 562143f2..12a09681 100644
--- a/cppcache/include/geode/Properties.hpp
+++ b/cppcache/include/geode/Properties.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Serializable.hpp"
#include "DataInput.hpp"
#include "DataOutput.hpp"
diff --git a/cppcache/include/geode/Query.hpp b/cppcache/include/geode/Query.hpp
index 5b3c6057..10cf5fa4 100644
--- a/cppcache/include/geode/Query.hpp
+++ b/cppcache/include/geode/Query.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "SelectResults.hpp"
diff --git a/cppcache/include/geode/QueryService.hpp
b/cppcache/include/geode/QueryService.hpp
index 30545845..13c23a94 100644
--- a/cppcache/include/geode/QueryService.hpp
+++ b/cppcache/include/geode/QueryService.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "CqQuery.hpp"
#include "CqAttributes.hpp"
diff --git a/cppcache/include/geode/Region.hpp
b/cppcache/include/geode/Region.hpp
index 4ddf362d..d5bbe340 100644
--- a/cppcache/include/geode/Region.hpp
+++ b/cppcache/include/geode/Region.hpp
@@ -23,7 +23,6 @@
//#### Warning: DO NOT directly include Region.hpp, include Cache.hpp instead.
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "CacheableString.hpp"
#include "CacheStatistics.hpp"
diff --git a/cppcache/include/geode/RegionAttributes.hpp
b/cppcache/include/geode/RegionAttributes.hpp
index b0b75007..cb6eef54 100644
--- a/cppcache/include/geode/RegionAttributes.hpp
+++ b/cppcache/include/geode/RegionAttributes.hpp
@@ -27,7 +27,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheLoader.hpp"
#include "ExpirationAttributes.hpp"
#include "CacheWriter.hpp"
diff --git a/cppcache/include/geode/RegionEntry.hpp
b/cppcache/include/geode/RegionEntry.hpp
index 85fdf6ef..6fc9b91c 100644
--- a/cppcache/include/geode/RegionEntry.hpp
+++ b/cppcache/include/geode/RegionEntry.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableKey.hpp"
#include "CacheStatistics.hpp"
diff --git a/cppcache/include/geode/RegionEvent.hpp
b/cppcache/include/geode/RegionEvent.hpp
index 61524776..bd310b06 100644
--- a/cppcache/include/geode/RegionEvent.hpp
+++ b/cppcache/include/geode/RegionEvent.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Region.hpp"
#include "CacheableKey.hpp"
diff --git a/cppcache/include/geode/RegionFactory.hpp
b/cppcache/include/geode/RegionFactory.hpp
index 9fbd6967..5c656721 100644
--- a/cppcache/include/geode/RegionFactory.hpp
+++ b/cppcache/include/geode/RegionFactory.hpp
@@ -23,7 +23,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "AttributesFactory.hpp"
#include "util/chrono/duration.hpp"
diff --git a/cppcache/include/geode/RegionService.hpp
b/cppcache/include/geode/RegionService.hpp
index 17bfbd13..21491e02 100644
--- a/cppcache/include/geode/RegionService.hpp
+++ b/cppcache/include/geode/RegionService.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include <vector>
/**
diff --git a/cppcache/include/geode/ResultCollector.hpp
b/cppcache/include/geode/ResultCollector.hpp
index cb3c35b6..13674a47 100644
--- a/cppcache/include/geode/ResultCollector.hpp
+++ b/cppcache/include/geode/ResultCollector.hpp
@@ -24,7 +24,6 @@
#include <chrono>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
diff --git a/cppcache/include/geode/ResultSet.hpp
b/cppcache/include/geode/ResultSet.hpp
index 8048b238..9a04f00f 100644
--- a/cppcache/include/geode/ResultSet.hpp
+++ b/cppcache/include/geode/ResultSet.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "SelectResults.hpp"
diff --git a/cppcache/include/geode/SelectResults.hpp
b/cppcache/include/geode/SelectResults.hpp
index ee754040..1f10071e 100644
--- a/cppcache/include/geode/SelectResults.hpp
+++ b/cppcache/include/geode/SelectResults.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "Serializable.hpp"
#include "CacheableBuiltins.hpp"
diff --git a/cppcache/include/geode/SelectResultsIterator.hpp
b/cppcache/include/geode/SelectResultsIterator.hpp
index a24a531a..c4a114d3 100644
--- a/cppcache/include/geode/SelectResultsIterator.hpp
+++ b/cppcache/include/geode/SelectResultsIterator.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "ExceptionTypes.hpp"
#include "Serializable.hpp"
diff --git a/cppcache/include/geode/Serializable.hpp
b/cppcache/include/geode/Serializable.hpp
index c156349d..6e931c9c 100644
--- a/cppcache/include/geode/Serializable.hpp
+++ b/cppcache/include/geode/Serializable.hpp
@@ -25,7 +25,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include <functional>
namespace apache {
diff --git a/cppcache/include/geode/Serializer.hpp
b/cppcache/include/geode/Serializer.hpp
index c4a9176d..40be26b5 100644
--- a/cppcache/include/geode/Serializer.hpp
+++ b/cppcache/include/geode/Serializer.hpp
@@ -29,8 +29,6 @@
#include "geode_globals.hpp"
#include "DataOutput.hpp"
#include "DataInput.hpp"
-#include "HashMapT.hpp"
-#include "HashSetT.hpp"
#include "GeodeTypeIds.hpp"
namespace apache {
diff --git a/cppcache/include/geode/Struct.hpp
b/cppcache/include/geode/Struct.hpp
index a98c3a19..8326dec5 100644
--- a/cppcache/include/geode/Struct.hpp
+++ b/cppcache/include/geode/Struct.hpp
@@ -24,7 +24,6 @@
#include <vector>
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
#include "StructSet.hpp"
#include "SelectResults.hpp"
diff --git a/cppcache/include/geode/StructSet.hpp
b/cppcache/include/geode/StructSet.hpp
index 143a8526..dd495e10 100644
--- a/cppcache/include/geode/StructSet.hpp
+++ b/cppcache/include/geode/StructSet.hpp
@@ -21,7 +21,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "CqResults.hpp"
#include "Struct.hpp"
diff --git a/cppcache/include/geode/TypeRegistry.hpp
b/cppcache/include/geode/TypeRegistry.hpp
index 7b65fe6e..577ff11c 100644
--- a/cppcache/include/geode/TypeRegistry.hpp
+++ b/cppcache/include/geode/TypeRegistry.hpp
@@ -22,7 +22,6 @@
*/
#include "geode_globals.hpp"
-#include "geode_types.hpp"
#include "Serializable.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/geode_types.hpp
b/cppcache/include/geode/geode_types.hpp
deleted file mode 100644
index 224686d5..00000000
--- a/cppcache/include/geode/geode_types.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#ifndef GEODE_TYPES_H_
-#define GEODE_TYPES_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <memory>
-
-#include "geode_globals.hpp"
-
-/**
- * @file
- */
-
-namespace apache {
-namespace geode {
-namespace client {
-
-
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // GEODE_TYPES_H_
diff --git a/cppcache/src/AdminRegion.hpp b/cppcache/src/AdminRegion.hpp
index d2cc2958..29537963 100644
--- a/cppcache/src/AdminRegion.hpp
+++ b/cppcache/src/AdminRegion.hpp
@@ -25,7 +25,6 @@
#include <geode/Serializable.hpp>
#include <geode/Cacheable.hpp>
-#include <geode/geode_types.hpp>
#include "ReadWriteLock.hpp"
#include "NonCopyable.hpp"
diff --git a/cppcache/src/CacheTransactionManagerImpl.cpp
b/cppcache/src/CacheTransactionManagerImpl.cpp
index 57f038f8..b1f3596f 100644
--- a/cppcache/src/CacheTransactionManagerImpl.cpp
+++ b/cppcache/src/CacheTransactionManagerImpl.cpp
@@ -21,7 +21,6 @@
* Author: ankurs
*/
-#include <geode/geode_types.hpp>
#include "CacheTransactionManagerImpl.hpp"
#include <geode/TransactionId.hpp>
#include <geode/ExceptionTypes.hpp>
diff --git a/cppcache/src/CacheableObjectPartList.hpp
b/cppcache/src/CacheableObjectPartList.hpp
index 64d25b81..319b6be2 100644
--- a/cppcache/src/CacheableObjectPartList.hpp
+++ b/cppcache/src/CacheableObjectPartList.hpp
@@ -21,11 +21,9 @@
#define GEODE_CACHEABLEOBJECTPARTLIST_H_
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/DataOutput.hpp>
#include <geode/DataInput.hpp>
#include <geode/Cacheable.hpp>
-#include <geode/HashMapT.hpp>
#include "MapWithLock.hpp"
#include <vector>
diff --git a/cppcache/src/ClientHealthStats.hpp
b/cppcache/src/ClientHealthStats.hpp
index 8d017823..b8015747 100644
--- a/cppcache/src/ClientHealthStats.hpp
+++ b/cppcache/src/ClientHealthStats.hpp
@@ -20,7 +20,6 @@
#ifndef GEODE_CLIENTHEALTHSTATS_H_
#define GEODE_CLIENTHEALTHSTATS_H_
-#include <geode/geode_types.hpp>
#include <geode/Serializable.hpp>
#include "util/Log.hpp"
#include <geode/CacheableDate.hpp>
diff --git a/cppcache/src/CqAttributesMutatorImpl.hpp
b/cppcache/src/CqAttributesMutatorImpl.hpp
index b0a8108a..639491ab 100644
--- a/cppcache/src/CqAttributesMutatorImpl.hpp
+++ b/cppcache/src/CqAttributesMutatorImpl.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/CqAttributesMutator.hpp>
#include <geode/CqAttributes.hpp>
diff --git a/cppcache/src/CqEventImpl.hpp b/cppcache/src/CqEventImpl.hpp
index 940fef4f..ab18fcd0 100644
--- a/cppcache/src/CqEventImpl.hpp
+++ b/cppcache/src/CqEventImpl.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/CqEvent.hpp>
#include <geode/CqOperation.hpp>
#include <geode/CqQuery.hpp>
diff --git a/cppcache/src/CqQueryImpl.hpp b/cppcache/src/CqQueryImpl.hpp
index cbf20472..2a824b81 100644
--- a/cppcache/src/CqQueryImpl.hpp
+++ b/cppcache/src/CqQueryImpl.hpp
@@ -21,7 +21,6 @@
#define GEODE_CQQUERYIMPL_H_
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/CqResults.hpp>
#include <geode/CqQuery.hpp>
diff --git a/cppcache/src/CqService.hpp b/cppcache/src/CqService.hpp
index e811172d..2c18da6e 100644
--- a/cppcache/src/CqService.hpp
+++ b/cppcache/src/CqService.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include "TcrMessage.hpp"
#include "Queue.hpp"
#include <ace/ACE.h>
diff --git a/cppcache/src/DistributedSystemImpl.hpp
b/cppcache/src/DistributedSystemImpl.hpp
index 23d973fa..9e22839e 100644
--- a/cppcache/src/DistributedSystemImpl.hpp
+++ b/cppcache/src/DistributedSystemImpl.hpp
@@ -26,7 +26,6 @@
#include <geode/geode_globals.hpp>
#include <memory>
-#include <geode/geode_types.hpp>
#include "ace/Recursive_Thread_Mutex.h"
#include "ace/Guard_T.h"
#include "ace/OS.h"
diff --git a/cppcache/src/EventId.hpp b/cppcache/src/EventId.hpp
index 34aa1ff1..a0b9738a 100644
--- a/cppcache/src/EventId.hpp
+++ b/cppcache/src/EventId.hpp
@@ -21,7 +21,6 @@
#define GEODE_EVENTID_H_
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/Cacheable.hpp>
#include "GeodeTypeIdsImpl.hpp"
#include <geode/DataOutput.hpp>
diff --git a/cppcache/src/ExecutionImpl.cpp b/cppcache/src/ExecutionImpl.cpp
index aa3b7e8d..e1b82d38 100644
--- a/cppcache/src/ExecutionImpl.cpp
+++ b/cppcache/src/ExecutionImpl.cpp
@@ -16,7 +16,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/DefaultResultCollector.hpp>
diff --git a/cppcache/src/ExecutionImpl.hpp b/cppcache/src/ExecutionImpl.hpp
index 2fb6f858..196fd836 100644
--- a/cppcache/src/ExecutionImpl.hpp
+++ b/cppcache/src/ExecutionImpl.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include <geode/geode_types.hpp>
#include <geode/Execution.hpp>
#include <geode/CacheableBuiltins.hpp>
#include <geode/ResultCollector.hpp>
diff --git a/cppcache/src/FarSideEntryOp.hpp b/cppcache/src/FarSideEntryOp.hpp
index 49e11dc4..288065c2 100644
--- a/cppcache/src/FarSideEntryOp.hpp
+++ b/cppcache/src/FarSideEntryOp.hpp
@@ -27,7 +27,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/Cacheable.hpp>
#include <geode/DataOutput.hpp>
#include <geode/DataInput.hpp>
diff --git a/cppcache/src/FunctionServiceImpl.hpp
b/cppcache/src/FunctionServiceImpl.hpp
index d7fd804c..de8d3705 100644
--- a/cppcache/src/FunctionServiceImpl.hpp
+++ b/cppcache/src/FunctionServiceImpl.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include "ProxyCache.hpp"
#include <geode/FunctionService.hpp>
/**
diff --git a/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
b/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index dbe61d4a..0dcc1a81 100644
--- a/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -21,7 +21,6 @@
* Author: sshcherbakov
*/
-#include <geode/geode_types.hpp>
#include "InternalCacheTransactionManager2PCImpl.hpp"
#include "CacheTransactionManagerImpl.hpp"
#include <geode/TransactionId.hpp>
diff --git a/cppcache/src/NoResult.hpp b/cppcache/src/NoResult.hpp
index 9116d82f..89bdb65d 100644
--- a/cppcache/src/NoResult.hpp
+++ b/cppcache/src/NoResult.hpp
@@ -21,7 +21,6 @@
#define GEODE_NORESULT_H_
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/ResultCollector.hpp>
diff --git a/cppcache/src/PoolAttributes.hpp b/cppcache/src/PoolAttributes.hpp
index 53192f9c..be91d3a6 100644
--- a/cppcache/src/PoolAttributes.hpp
+++ b/cppcache/src/PoolAttributes.hpp
@@ -27,7 +27,6 @@
#include <ace/OS.h>
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
/**
diff --git a/cppcache/src/ProxyCache.hpp b/cppcache/src/ProxyCache.hpp
index 15da095d..25cef49c 100644
--- a/cppcache/src/ProxyCache.hpp
+++ b/cppcache/src/ProxyCache.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/Region.hpp>
#include <geode/DistributedSystem.hpp>
#include <geode/QueryService.hpp>
diff --git a/cppcache/src/ProxyRegion.hpp b/cppcache/src/ProxyRegion.hpp
index fe71cb0e..805e449b 100644
--- a/cppcache/src/ProxyRegion.hpp
+++ b/cppcache/src/ProxyRegion.hpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/CacheableKey.hpp>
#include <geode/CacheableString.hpp>
#include <geode/CacheStatistics.hpp>
diff --git a/cppcache/src/RegionCommit.hpp b/cppcache/src/RegionCommit.hpp
index 36455d1b..583e13fc 100644
--- a/cppcache/src/RegionCommit.hpp
+++ b/cppcache/src/RegionCommit.hpp
@@ -26,7 +26,6 @@
* Author: ankurs
*/
-#include <geode/geode_types.hpp>
#include <geode/DataInput.hpp>
#include <geode/CacheableString.hpp>
#include <geode/Cache.hpp>
diff --git a/cppcache/src/RemoteQuery.hpp b/cppcache/src/RemoteQuery.hpp
index 2ab3ccd4..6a6fe1d1 100644
--- a/cppcache/src/RemoteQuery.hpp
+++ b/cppcache/src/RemoteQuery.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
#include <memory>
diff --git a/cppcache/src/ResultSetImpl.hpp b/cppcache/src/ResultSetImpl.hpp
index b791b867..46b33ce6 100644
--- a/cppcache/src/ResultSetImpl.hpp
+++ b/cppcache/src/ResultSetImpl.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/ResultSet.hpp>
diff --git a/cppcache/src/StructSetImpl.hpp b/cppcache/src/StructSetImpl.hpp
index ffdc44d8..1a069018 100644
--- a/cppcache/src/StructSetImpl.hpp
+++ b/cppcache/src/StructSetImpl.hpp
@@ -21,7 +21,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/StructSet.hpp>
#include <geode/Struct.hpp>
diff --git a/cppcache/src/TXCommitMessage.hpp b/cppcache/src/TXCommitMessage.hpp
index b4b49772..169f4634 100644
--- a/cppcache/src/TXCommitMessage.hpp
+++ b/cppcache/src/TXCommitMessage.hpp
@@ -21,7 +21,6 @@
#define GEODE_TXCOMMITMESSAGE_H_
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/DataInput.hpp>
#include "RegionCommit.hpp"
diff --git a/cppcache/src/TXEntryState.hpp b/cppcache/src/TXEntryState.hpp
index e3f436c0..3f976aef 100644
--- a/cppcache/src/TXEntryState.hpp
+++ b/cppcache/src/TXEntryState.hpp
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef GEODE_TXENTRYSTATE_H_
-#define GEODE_TXENTRYSTATE_H_
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,17 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * TXEntryState.hpp
- *
- * Created on: 16-Feb-2011
- * Author: ankurs
- */
-
-#include <geode/geode_types.hpp>
-using namespace apache::geode::client;
+#pragma once
+#ifndef GEODE_TXENTRYSTATE_H_
+#define GEODE_TXENTRYSTATE_H_
+#include "geode/geode_globals.hpp"
namespace apache {
namespace geode {
namespace client {
diff --git a/cppcache/src/TXId.hpp b/cppcache/src/TXId.hpp
index 4ca426ff..b0cbb34e 100644
--- a/cppcache/src/TXId.hpp
+++ b/cppcache/src/TXId.hpp
@@ -26,7 +26,6 @@
* Author: ankurs
*/
-#include <geode/geode_types.hpp>
#include <geode/TransactionId.hpp>
#include <geode/DataOutput.hpp>
#include <atomic>
diff --git a/cppcache/src/TXState.cpp b/cppcache/src/TXState.cpp
index ab8e8518..c9d60905 100644
--- a/cppcache/src/TXState.cpp
+++ b/cppcache/src/TXState.cpp
@@ -54,52 +54,52 @@ int32_t TXState::nextModSerialNum() {
m_modSerialNum += 1;
return m_modSerialNum;
}
- std::shared_ptr<Cacheable> TXState::replay(bool isRollback) {
- GfErrTypeThrowException("Replay is unsupported", GF_NOTSUP);
- int retryAttempts = 3;
+std::shared_ptr<Cacheable> TXState::replay(bool isRollback) {
+ GfErrTypeThrowException("Replay is unsupported", GF_NOTSUP);
+ int retryAttempts = 3;
- std::shared_ptr<Cacheable> result = nullptr;
+ std::shared_ptr<Cacheable> result = nullptr;
- ReplayControl replayControl(this);
- m_dirty = false;
- // if retryAttempts < 0 we retry until there are no servers available
- for (int i = 0; (retryAttempts < 0) || (i < retryAttempts); i++) {
- // try {
- if (isRollback) { // need to roll back these
- try {
- m_cache->getCacheTransactionManager()
- ->rollback(); //
this.firstProxy.rollback(proxy.getTxId().getUniqId());
- } catch (const Exception& ex) {
- LOGFINE(
- "caught exception when rolling back before retrying transaction "
- "%s",
- ex.getMessage());
- }
- }
- m_txId = std::shared_ptr<TXId>(new TXId());
- // LOGFINE("retrying transaction after loss of state in server. Attempt
#"
- // + (i+1));
- try {
- for (const auto& operation : m_operations) {
- result = operation->replay(m_cache);
- }
+ ReplayControl replayControl(this);
+ m_dirty = false;
+ // if retryAttempts < 0 we retry until there are no servers available
+ for (int i = 0; (retryAttempts < 0) || (i < retryAttempts); i++) {
+ // try {
+ if (isRollback) { // need to roll back these
+ try {
+ m_cache->getCacheTransactionManager()
+ ->rollback(); //
this.firstProxy.rollback(proxy.getTxId().getUniqId());
+ } catch (const Exception& ex) {
+ LOGFINE(
+ "caught exception when rolling back before retrying transaction "
+ "%s",
+ ex.getMessage());
+ }
+ }
+ m_txId = std::shared_ptr<TXId>(new TXId());
+ // LOGFINE("retrying transaction after loss of state in server. Attempt #"
+ // + (i+1));
+ try {
+ for (const auto& operation : m_operations) {
+ result = operation->replay(m_cache);
+ }
- return result;
- } catch (const TransactionDataNodeHasDepartedException& ex) {
- LOGDEBUG("Transaction exception:%s", ex.getMessage());
- isRollback = false;
- // try again
- } catch (const TransactionDataRebalancedException& ex) {
- LOGDEBUG("Transaction exception:%s", ex.getMessage());
- isRollback = true;
- // try again
- }
- }
+ return result;
+ } catch (const TransactionDataNodeHasDepartedException& ex) {
+ LOGDEBUG("Transaction exception:%s", ex.getMessage());
+ isRollback = false;
+ // try again
+ } catch (const TransactionDataRebalancedException& ex) {
+ LOGDEBUG("Transaction exception:%s", ex.getMessage());
+ isRollback = true;
+ // try again
+ }
+ }
- GfErrTypeThrowException(
- "Unable to reestablish transaction context on servers", GF_EUNDEF);
+ GfErrTypeThrowException(
+ "Unable to reestablish transaction context on servers", GF_EUNDEF);
- return nullptr;
+ return nullptr;
}
void TXState::releaseStickyConnection() {
@@ -123,17 +123,6 @@ void TXState::releaseStickyConnection() {
}
}
}
-
- // ThinClientStickyManager manager(dm);
- // manager.releaseThreadLocalConnection();
-}
-
-void TXState::recordTXOperation(
- ServerRegionOperation op, const char* regionName,
- std::shared_ptr<CacheableKey> key,
- std::shared_ptr<std::vector<std::shared_ptr<Cacheable>>> arguments) {
- m_operations.push_back(std::shared_ptr<TransactionalOperation>(
- new TransactionalOperation(op, regionName, key, arguments)));
}
} // namespace client
} // namespace geode
diff --git a/cppcache/src/TXState.hpp b/cppcache/src/TXState.hpp
index 84e3e896..08307c11 100644
--- a/cppcache/src/TXState.hpp
+++ b/cppcache/src/TXState.hpp
@@ -31,7 +31,6 @@
#include <string>
#include <vector>
-
namespace apache {
namespace geode {
namespace client {
@@ -47,10 +46,6 @@ class TXState {
bool isReplay() { return m_replay; }
bool isPrepared() { return m_prepared; }
void setPrepared() { m_prepared = true; }
- void recordTXOperation(
- ServerRegionOperation op, const char* regionName,
- std::shared_ptr<CacheableKey> key,
- std::shared_ptr<std::vector<std::shared_ptr<Cacheable>>> arguments);
std::shared_ptr<Cacheable> replay(bool isRollback);
void releaseStickyConnection();
diff --git a/cppcache/src/TcrChunkedContext.hpp
b/cppcache/src/TcrChunkedContext.hpp
index 0aade817..38a24b74 100644
--- a/cppcache/src/TcrChunkedContext.hpp
+++ b/cppcache/src/TcrChunkedContext.hpp
@@ -29,7 +29,6 @@
#include <ace/Semaphore.h>
#include <string>
-#include <geode/geode_types.hpp>
#include "Utils.hpp"
#include "AppDomainContext.hpp"
diff --git a/cppcache/src/ThinClientRegion.cpp
b/cppcache/src/ThinClientRegion.cpp
index 9afd4c55..31af5cfa 100644
--- a/cppcache/src/ThinClientRegion.cpp
+++ b/cppcache/src/ThinClientRegion.cpp
@@ -466,8 +466,7 @@ void ThinClientRegion::unregisterKeys(
GfErrTypeToException("Region::unregisterKeys", err);
}
-void ThinClientRegion::registerAllKeys(bool isDurable,
- bool getInitialValues,
+void ThinClientRegion::registerAllKeys(bool isDurable, bool getInitialValues,
bool receiveValues) {
auto pool = m_cacheImpl->getCache()->getPoolManager().find(
getAttributes()->getPoolName());
@@ -686,7 +685,7 @@ bool ThinClientRegion::existsValue(const char* predicate,
std::chrono::milliseconds timeout) {
util::PROTOCOL_OPERATION_TIMEOUT_BOUNDS(timeout);
- auto results = query(predicate, timeout);
+ auto results = query(predicate, timeout);
if (results == nullptr) {
return false;
@@ -720,12 +719,12 @@ GfErrType
ThinClientRegion::unregisterKeysBeforeDestroyRegion() {
m_durableInterestListRegexForUpdatesAsInvalidates);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVec;
+ std::vector<std::shared_ptr<CacheableKey>> keysVec;
copyInterestList(keysVec, m_interestList);
opErr = unregisterKeysNoThrowLocalDestroy(keysVec, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
+ std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
copyInterestList(keysVecDurable, m_durableInterestList);
opErr = unregisterKeysNoThrowLocalDestroy(keysVecDurable, false);
err = opErr != GF_NOERR ? opErr : err;
@@ -737,7 +736,8 @@ GfErrType
ThinClientRegion::unregisterKeysBeforeDestroyRegion() {
unregisterKeysNoThrowLocalDestroy(keysVecForUpdatesAsInvalidates, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>>
keysVecDurableForUpdatesAsInvalidates;
+ std::vector<std::shared_ptr<CacheableKey>>
+ keysVecDurableForUpdatesAsInvalidates;
copyInterestList(keysVecDurableForUpdatesAsInvalidates,
m_durableInterestListForUpdatesAsInvalidates);
opErr = unregisterKeysNoThrowLocalDestroy(
@@ -760,14 +760,14 @@ std::shared_ptr<Serializable>
ThinClientRegion::selectValue(
return results->operator[](0);
}
-std::vector<std::shared_ptr<CacheableKey>> ThinClientRegion::serverKeys() {
+std::vector<std::shared_ptr<CacheableKey>> ThinClientRegion::serverKeys() {
CHECK_DESTROY_PENDING(TryReadGuard, Region::serverKeys);
TcrMessageReply reply(true, m_tcrdm);
TcrMessageKeySet request(m_cacheImpl->getCache()->createDataOutput(),
m_fullPath, m_tcrdm);
reply.setMessageTypeRequest(TcrMessage::KEY_SET);
- std::vector<std::shared_ptr<CacheableKey>> serverKeys;
+ std::vector<std::shared_ptr<CacheableKey>> serverKeys;
ChunkedKeySetResponse resultCollector(request, serverKeys, reply);
reply.setChunkedResultHandler(&resultCollector);
@@ -809,22 +809,11 @@ bool ThinClientRegion::containsKeyOnServer(
bool ret = false;
TXState* txState = getTXState();
- if (txState != nullptr) {
- // if (!txState->isReplay()) {
- // auto args =
- //std::make_shared<std::vector<std::shared_ptr<Cacheable>>
- //>(); txState->recordTXOperation(GF_CONTAINS_KEY,
- // getFullPath(),
- // keyPtr,
- // args);
- // }
- }
-
/** @brief Create message and send to bridge server */
- TcrMessageContainsKey request(m_cache->createDataOutput(), this, keyPtr,
-
static_cast<std::shared_ptr<Serializable>>(nullptr), true,
- m_tcrdm);
+ TcrMessageContainsKey request(
+ m_cache->createDataOutput(), this, keyPtr,
+ static_cast<std::shared_ptr<Serializable>>(nullptr), true, m_tcrdm);
TcrMessageReply reply(true, m_tcrdm);
reply.setMessageTypeRequest(TcrMessage::CONTAINS_KEY);
err = m_tcrdm->sendSyncRequest(request, reply);
@@ -867,21 +856,11 @@ bool ThinClientRegion::containsValueForKey_remote(
bool ret = false;
TXState* txState = getTXState();
- if (txState != nullptr) {
- // if (!txState->isReplay()) {
- // auto args =
- //std::make_shared<std::vector<std::shared_ptr<Cacheable>>
- //>();
- // txState->recordTXOperation(GF_CONTAINS_VALUE_FOR_KEY,
- // getFullPath(), keyPtr, args);
- // }
- }
-
/** @brief Create message and send to bridge server */
- TcrMessageContainsKey request(m_cache->createDataOutput(), this, keyPtr,
-
static_cast<std::shared_ptr<Serializable>>(nullptr), false,
- m_tcrdm);
+ TcrMessageContainsKey request(
+ m_cache->createDataOutput(), this, keyPtr,
+ static_cast<std::shared_ptr<Serializable>>(nullptr), false, m_tcrdm);
TcrMessageReply reply(true, m_tcrdm);
reply.setMessageTypeRequest(TcrMessage::CONTAINS_KEY);
err = m_tcrdm->sendSyncRequest(request, reply);
@@ -919,7 +898,8 @@ bool ThinClientRegion::containsValueForKey_remote(
return rptr->value();
}
-void ThinClientRegion::clear(const std::shared_ptr<Serializable>&
aCallbackArgument) {
+void ThinClientRegion::clear(
+ const std::shared_ptr<Serializable>& aCallbackArgument) {
GfErrType err = GF_NOERR;
err = localClearNoThrow(aCallbackArgument, CacheEventFlags::NORMAL);
if (err != GF_NOERR) GfErrTypeToException("Region::clear", err);
@@ -962,8 +942,10 @@ void ThinClientRegion::clear(const
std::shared_ptr<Serializable>& aCallbackArgum
}
GfErrType ThinClientRegion::getNoThrow_remote(
- const std::shared_ptr<CacheableKey>& keyPtr, std::shared_ptr<Cacheable>&
valPtr,
- const std::shared_ptr<Serializable>& aCallbackArgument,
std::shared_ptr<VersionTag>& versionTag) {
+ const std::shared_ptr<CacheableKey>& keyPtr,
+ std::shared_ptr<Cacheable>& valPtr,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
+ std::shared_ptr<VersionTag>& versionTag) {
GfErrType err = GF_NOERR;
/** @brief Create message and send to bridge server */
@@ -1002,7 +984,8 @@ GfErrType ThinClientRegion::getNoThrow_remote(
}
GfErrType ThinClientRegion::invalidateNoThrow_remote(
- const std::shared_ptr<CacheableKey>& keyPtr, const
std::shared_ptr<Serializable>& aCallbackArgument,
+ const std::shared_ptr<CacheableKey>& keyPtr,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
std::shared_ptr<VersionTag>& versionTag) {
GfErrType err = GF_NOERR;
@@ -1114,7 +1097,8 @@ GfErrType ThinClientRegion::createNoThrow_remote(
}
GfErrType ThinClientRegion::destroyNoThrow_remote(
- const std::shared_ptr<CacheableKey>& keyPtr, const
std::shared_ptr<Serializable>& aCallbackArgument,
+ const std::shared_ptr<CacheableKey>& keyPtr,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
std::shared_ptr<VersionTag>& versionTag) {
GfErrType err = GF_NOERR;
@@ -1156,8 +1140,10 @@ GfErrType ThinClientRegion::destroyNoThrow_remote(
} // destroyNoThrow_remote()
GfErrType ThinClientRegion::removeNoThrow_remote(
- const std::shared_ptr<CacheableKey>& keyPtr, const
std::shared_ptr<Cacheable>& cvalue,
- const std::shared_ptr<Serializable>& aCallbackArgument,
std::shared_ptr<VersionTag>& versionTag) {
+ const std::shared_ptr<CacheableKey>& keyPtr,
+ const std::shared_ptr<Cacheable>& cvalue,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
+ std::shared_ptr<VersionTag>& versionTag) {
GfErrType err = GF_NOERR;
// do TCR remove
@@ -1198,7 +1184,8 @@ GfErrType ThinClientRegion::removeNoThrow_remote(
}
GfErrType ThinClientRegion::removeNoThrowEX_remote(
- const std::shared_ptr<CacheableKey>& keyPtr, const
std::shared_ptr<Serializable>& aCallbackArgument,
+ const std::shared_ptr<CacheableKey>& keyPtr,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
std::shared_ptr<VersionTag>& versionTag) {
GfErrType err = GF_NOERR;
@@ -1342,7 +1329,7 @@ GfErrType ThinClientRegion::singleHopPutAllNoThrow_remote(
* If locationMap is nullptr try the old, existing putAll impl that may take
* multiple n/w hops
*/
- auto userKeys = std::vector<std::shared_ptr<CacheableKey>> ();
+ auto userKeys = std::vector<std::shared_ptr<CacheableKey>>();
for (const auto& iter : map) {
userKeys.push_back(iter.first);
}
@@ -1537,7 +1524,8 @@ GfErrType ThinClientRegion::singleHopPutAllNoThrow_remote(
// then we need to gather up the keys that we know have succeeded so far and
// add them to the partial result set (See bug Id #955)
if (!failedServers.empty()) {
- auto succeedKeySet =
std::make_shared<std::vector<std::shared_ptr<CacheableKey>> >();
+ auto succeedKeySet =
+ std::make_shared<std::vector<std::shared_ptr<CacheableKey>>>();
if (result->getSucceededKeysAndVersions()->size() == 0) {
for (const auto& locationIter : *locationMap) {
if (failedServers.find(locationIter.first) != failedServers.end()) {
@@ -1570,10 +1558,12 @@ GfErrType
ThinClientRegion::singleHopPutAllNoThrow_remote(
continue;
}
- std::shared_ptr<std::vector<std::shared_ptr<CacheableKey>> > failedKeys =
nullptr;
- const auto& failedSerInLocMapIter =
locationMap->find(failedServerIter.first);
- if (failedSerInLocMapIter != locationMap->end()) {
- failedKeys = failedSerInLocMapIter->second;
+ std::shared_ptr<std::vector<std::shared_ptr<CacheableKey>>> failedKeys =
+ nullptr;
+ const auto& failedSerInLocMapIter =
+ locationMap->find(failedServerIter.first);
+ if (failedSerInLocMapIter != locationMap->end()) {
+ failedKeys = failedSerInLocMapIter->second;
}
if (failedKeys == nullptr) {
@@ -1610,10 +1600,10 @@ GfErrType
ThinClientRegion::singleHopPutAllNoThrow_remote(
} else /*if(errCode != GF_NOERR)*/ {
oneSubMapRetryFailed = true;
const auto& firstKey = newSubMap->begin()->first;
- std::shared_ptr<Exception> excptPtr = nullptr;
+ std::shared_ptr<Exception> excptPtr = nullptr;
// TODO:: formulat excptPtr from the errCode
- result->saveFailedKey(firstKey, excptPtr);
- error = errCode;
+ result->saveFailedKey(firstKey, excptPtr);
+ error = errCode;
}
}
@@ -1842,18 +1832,18 @@ GfErrType
ThinClientRegion::singleHopRemoveAllNoThrow_remote(
for (const auto& resultMapIter : resultMap) {
const auto& value = resultMapIter.second;
PutAllPartialResultServerException* papException = nullptr;
- std::shared_ptr<VersionedCacheableObjectPartList> list = nullptr;
-
- if (const auto papException =
- std::dynamic_pointer_cast<PutAllPartialResultServerException>(
- value)) {
- // PutAllPartialResultServerException CASE:: value in resultMap is of type
- // PutAllPartialResultServerException.
- // TODO:: Add failedservers.keySet= all fialed servers, i.e list out all
- // keys in map failedServers,
- // that is set view of the keys contained in failedservers map.
- // TODO:: need to read papException and populate PutAllPartialResult.
- result->consolidate(papException->getResult());
+ std::shared_ptr<VersionedCacheableObjectPartList> list = nullptr;
+
+ if (const auto papException =
+ std::dynamic_pointer_cast<PutAllPartialResultServerException>(
+ value)) {
+ // PutAllPartialResultServerException CASE:: value in resultMap is of
type
+ // PutAllPartialResultServerException.
+ // TODO:: Add failedservers.keySet= all fialed servers, i.e list out all
+ // keys in map failedServers,
+ // that is set view of the keys contained in failedservers map.
+ // TODO:: need to read papException and populate PutAllPartialResult.
+ result->consolidate(papException->getResult());
} else if (const auto list =
std::dynamic_pointer_cast<VersionedCacheableObjectPartList>(
value)) {
@@ -1891,7 +1881,8 @@ GfErrType
ThinClientRegion::singleHopRemoveAllNoThrow_remote(
// then we need to gather up the keys that we know have succeeded so far and
// add them to the partial result set (See bug Id #955)
if (!failedServers.empty()) {
- auto succeedKeySet =
std::make_shared<std::vector<std::shared_ptr<CacheableKey>> >();
+ auto succeedKeySet =
+ std::make_shared<std::vector<std::shared_ptr<CacheableKey>>>();
if (result->getSucceededKeysAndVersions()->size() == 0) {
for (const auto& locationIter : *locationMap) {
if (failedServers.find(locationIter.first) != failedServers.end()) {
@@ -1940,17 +1931,18 @@ GfErrType
ThinClientRegion::singleHopRemoveAllNoThrow_remote(
}
std::shared_ptr<VersionedCacheableObjectPartList> vcopListPtr;
- std::shared_ptr<PutAllPartialResultServerException> papResultServerExc =
nullptr;
- GfErrType errCode = multiHopRemoveAllNoThrow_remote(*failedKeys, vcopListPtr,
- aCallbackArgument);
- if (errCode == GF_NOERR) {
- result->addKeysAndVersions(vcopListPtr);
+ std::shared_ptr<PutAllPartialResultServerException> papResultServerExc =
+ nullptr;
+ GfErrType errCode = multiHopRemoveAllNoThrow_remote(
+ *failedKeys, vcopListPtr, aCallbackArgument);
+ if (errCode == GF_NOERR) {
+ result->addKeysAndVersions(vcopListPtr);
} else if (errCode == GF_PUTALL_PARTIAL_RESULT_EXCEPTION) {
oneSubMapRetryFailed = true;
error = errCode;
} else /*if(errCode != GF_NOERR)*/ {
oneSubMapRetryFailed = true;
- std::shared_ptr<Exception> excptPtr = nullptr;
+ std::shared_ptr<Exception> excptPtr = nullptr;
result->saveFailedKey(failedKeys->at(0), excptPtr);
error = errCode;
}
@@ -2061,11 +2053,10 @@ uint32_t ThinClientRegion::size_remote() {
switch (reply.getMessageType()) {
case TcrMessage::RESPONSE: {
- auto size =
- std::static_pointer_cast<CacheableInt32>(reply.getValue());
- return size->value();
- // LOGINFO("Map is written into remote server at region %s",
- // m_fullPath.c_str());
+ auto size = std::static_pointer_cast<CacheableInt32>(reply.getValue());
+ return size->value();
+ // LOGINFO("Map is written into remote server at region %s",
+ // m_fullPath.c_str());
} break;
case TcrMessage::EXCEPTION:
err =
@@ -2124,26 +2115,27 @@ GfErrType ThinClientRegion::registerKeys(TcrEndpoint*
endpoint,
endpoint, m_durableInterestListRegexForUpdatesAsInvalidates, true,
false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVec;
+ std::vector<std::shared_ptr<CacheableKey>> keysVec;
InterestResultPolicy interestPolicy =
copyInterestList(keysVec, m_interestList);
opErr = registerKeysNoThrow(keysVec, false, endpoint, false, interestPolicy);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVecForUpdatesAsInvalidates;
+ std::vector<std::shared_ptr<CacheableKey>> keysVecForUpdatesAsInvalidates;
interestPolicy = copyInterestList(keysVecForUpdatesAsInvalidates,
m_interestListForUpdatesAsInvalidates);
opErr = registerKeysNoThrow(keysVecForUpdatesAsInvalidates, false, endpoint,
false, interestPolicy, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
+ std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
interestPolicy = copyInterestList(keysVecDurable, m_durableInterestList);
opErr = registerKeysNoThrow(keysVecDurable, false, endpoint, true,
interestPolicy);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>>
keysVecDurableForUpdatesAsInvalidates;
+ std::vector<std::shared_ptr<CacheableKey>>
+ keysVecDurableForUpdatesAsInvalidates;
interestPolicy =
copyInterestList(keysVecDurableForUpdatesAsInvalidates,
m_durableInterestListForUpdatesAsInvalidates);
@@ -2154,7 +2146,8 @@ GfErrType ThinClientRegion::registerKeys(TcrEndpoint*
endpoint,
if (request != nullptr && request->getRegionName() == m_fullPath &&
(request->getMessageType() == TcrMessage::REGISTER_INTEREST ||
request->getMessageType() == TcrMessage::REGISTER_INTEREST_LIST)) {
- const std::vector<std::shared_ptr<CacheableKey>> * newKeysVec =
request->getKeys();
+ const std::vector<std::shared_ptr<CacheableKey>>* newKeysVec =
+ request->getKeys();
bool isDurable = request->isDurable();
bool receiveValues = request->receiveValues();
if (newKeysVec == nullptr || newKeysVec->empty()) {
@@ -2226,23 +2219,24 @@ GfErrType ThinClientRegion::unregisterKeys() {
unregisterStoredRegex(m_durableInterestListRegexForUpdatesAsInvalidates);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVec;
+ std::vector<std::shared_ptr<CacheableKey>> keysVec;
copyInterestList(keysVec, m_interestList);
opErr = unregisterKeysNoThrow(keysVec, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
+ std::vector<std::shared_ptr<CacheableKey>> keysVecDurable;
copyInterestList(keysVecDurable, m_durableInterestList);
opErr = unregisterKeysNoThrow(keysVecDurable, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>> keysVecForUpdatesAsInvalidates;
+ std::vector<std::shared_ptr<CacheableKey>> keysVecForUpdatesAsInvalidates;
copyInterestList(keysVecForUpdatesAsInvalidates,
m_interestListForUpdatesAsInvalidates);
opErr = unregisterKeysNoThrow(keysVecForUpdatesAsInvalidates, false);
err = opErr != GF_NOERR ? opErr : err;
- std::vector<std::shared_ptr<CacheableKey>>
keysVecDurableForUpdatesAsInvalidates;
+ std::vector<std::shared_ptr<CacheableKey>>
+ keysVecDurableForUpdatesAsInvalidates;
copyInterestList(keysVecDurableForUpdatesAsInvalidates,
m_durableInterestListForUpdatesAsInvalidates);
opErr = unregisterKeysNoThrow(keysVecDurableForUpdatesAsInvalidates, false);
@@ -2361,7 +2355,8 @@ GfErrType ThinClientRegion::registerKeysNoThrow(
}
GfErrType ThinClientRegion::unregisterKeysNoThrow(
- const std::vector<std::shared_ptr<CacheableKey>> & keys, bool
attemptFailover) {
+ const std::vector<std::shared_ptr<CacheableKey>>& keys,
+ bool attemptFailover) {
RegionGlobalLocks acquireLocksRedundancy(this, false);
RegionGlobalLocks acquireLocksFailover(this);
CHECK_DESTROY_PENDING_NOTHROW(TryReadGuard);
@@ -2397,7 +2392,8 @@ GfErrType ThinClientRegion::unregisterKeysNoThrow(
}
GfErrType ThinClientRegion::unregisterKeysNoThrowLocalDestroy(
- const std::vector<std::shared_ptr<CacheableKey>> & keys, bool
attemptFailover) {
+ const std::vector<std::shared_ptr<CacheableKey>>& keys,
+ bool attemptFailover) {
RegionGlobalLocks acquireLocksRedundancy(this, false);
RegionGlobalLocks acquireLocksFailover(this);
GfErrType err = GF_NOERR;
@@ -2502,7 +2498,9 @@ GfErrType ThinClientRegion::registerRegexNoThrow(
MapOfUpdateCounters trackers;
int32_t destroyTracker = 1;
if (resultKeys == nullptr) {
- resultKeys =
std::shared_ptr<std::vector<std::shared_ptr<CacheableKey>> >(new
std::vector<std::shared_ptr<CacheableKey>> ());
+ resultKeys =
+ std::shared_ptr<std::vector<std::shared_ptr<CacheableKey>>>(
+ new std::vector<std::shared_ptr<CacheableKey>>());
}
// need to check
getAllResultCollector = (new ChunkedGetAllResponse(
@@ -2637,7 +2635,8 @@ void ThinClientRegion::addKeys(
for (const auto& key : keys) {
interestList.insert(
- std::pair<std::shared_ptr<CacheableKey>, InterestResultPolicy>(key,
interestpolicy));
+ std::pair<std::shared_ptr<CacheableKey>, InterestResultPolicy>(
+ key, interestpolicy));
}
}
@@ -2668,14 +2667,15 @@ void ThinClientRegion::addRegex(const std::string&
regex, bool isDurable,
std::pair<std::string, InterestResultPolicy>(regex, interestpolicy));
}
-std::vector<std::shared_ptr<CacheableKey>>
ThinClientRegion::getInterestList() const {
+std::vector<std::shared_ptr<CacheableKey>> ThinClientRegion::getInterestList()
+ const {
ThinClientRegion* nthis = const_cast<ThinClientRegion*>(this);
RegionGlobalLocks acquireLocksRedundancy(nthis, false);
RegionGlobalLocks acquireLocksFailover(nthis);
CHECK_DESTROY_PENDING(TryReadGuard, getInterestList);
ACE_Guard<ACE_Recursive_Thread_Mutex> keysGuard(nthis->m_keysLock);
- std::vector<std::shared_ptr<CacheableKey>> vlist;
+ std::vector<std::shared_ptr<CacheableKey>> vlist;
std::transform(std::begin(m_durableInterestList),
std::end(m_durableInterestList), std::back_inserter(vlist),
@@ -2690,7 +2690,8 @@ std::vector<std::shared_ptr<CacheableKey>>
ThinClientRegion::getInterestList()
return vlist;
}
-std::vector<std::shared_ptr<CacheableString>>
ThinClientRegion::getInterestListRegex() const {
+std::vector<std::shared_ptr<CacheableString>>
+ThinClientRegion::getInterestListRegex() const {
ThinClientRegion* nthis = const_cast<ThinClientRegion*>(this);
RegionGlobalLocks acquireLocksRedundancy(nthis, false);
RegionGlobalLocks acquireLocksFailover(nthis);
@@ -2794,7 +2795,6 @@ GfErrType
ThinClientRegion::clientNotificationHandler(TcrMessage& msg) {
GfErrType ThinClientRegion::handleServerException(const char* func,
const char* exceptionMsg) {
-
GfErrType error = GF_NOERR;
setTSSExceptionMessage(exceptionMsg);
if (strstr(exceptionMsg,
@@ -2878,7 +2878,8 @@ void ThinClientRegion::localInvalidateRegion_internal() {
}
void ThinClientRegion::invalidateInterestList(
- std::unordered_map<std::shared_ptr<CacheableKey>, InterestResultPolicy>&
interestList) {
+ std::unordered_map<std::shared_ptr<CacheableKey>, InterestResultPolicy>&
+ interestList) {
std::shared_ptr<MapEntryImpl> me;
std::shared_ptr<Cacheable> oldValue;
@@ -3019,11 +3020,11 @@ void ThinClientRegion::executeFunction(
std::shared_ptr<ResultCollector> rc, int32_t retryAttempts,
std::chrono::milliseconds timeout) {
int32_t attempt = 0;
- auto failedNodes = CacheableHashSet::create();
- // if pools retry attempts are not set then retry once on all available
- // endpoints
- if (retryAttempts == -1) {
- retryAttempts = static_cast<int32_t>(m_tcrdm->getNumberOfEndPoints());
+ auto failedNodes = CacheableHashSet::create();
+ // if pools retry attempts are not set then retry once on all available
+ // endpoints
+ if (retryAttempts == -1) {
+ retryAttempts = static_cast<int32_t>(m_tcrdm->getNumberOfEndPoints());
}
bool reExecute = false;
@@ -3248,7 +3249,8 @@ bool ThinClientRegion::executeFunctionSH(
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(*resultCollectorLock);
rc->clearResults();
}
- std::shared_ptr<CacheableHashSet>
failedNodeIds(currentReply->getFailedNode());
+ std::shared_ptr<CacheableHashSet> failedNodeIds(
+ currentReply->getFailedNode());
if (failedNodeIds) {
LOGDEBUG(
"ThinClientRegion::executeFunctionSH with GF_FUNCTION_EXCEPTION "
@@ -3328,9 +3330,9 @@ GfErrType ThinClientRegion::getFuncAttributes(const char*
func,
return err;
}
-GfErrType ThinClientRegion::getNoThrow_FullObject(std::shared_ptr<EventId>
eventId,
- std::shared_ptr<Cacheable>&
fullObject,
- std::shared_ptr<VersionTag>&
versionTag) {
+GfErrType ThinClientRegion::getNoThrow_FullObject(
+ std::shared_ptr<EventId> eventId, std::shared_ptr<Cacheable>& fullObject,
+ std::shared_ptr<VersionTag>& versionTag) {
TcrMessageRequestEventValue fullObjectMsg(m_cache->createDataOutput(),
eventId);
TcrMessageReply reply(true, nullptr);
@@ -3344,17 +3346,19 @@ GfErrType
ThinClientRegion::getNoThrow_FullObject(std::shared_ptr<EventId> event
return err;
}
-void ThinClientRegion::txDestroy(const std::shared_ptr<CacheableKey>& key,
- const std::shared_ptr<Serializable>&
aCallbackArgument,
- std::shared_ptr<VersionTag> versionTag) {
+void ThinClientRegion::txDestroy(
+ const std::shared_ptr<CacheableKey>& key,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
+ std::shared_ptr<VersionTag> versionTag) {
GfErrType err = destroyNoThrowTX(key, aCallbackArgument, -1,
CacheEventFlags::NORMAL, versionTag);
GfErrTypeToException("Region::destroyTX", err);
}
-void ThinClientRegion::txInvalidate(const std::shared_ptr<CacheableKey>& key,
- const std::shared_ptr<Serializable>&
aCallbackArgument,
- std::shared_ptr<VersionTag> versionTag) {
+void ThinClientRegion::txInvalidate(
+ const std::shared_ptr<CacheableKey>& key,
+ const std::shared_ptr<Serializable>& aCallbackArgument,
+ std::shared_ptr<VersionTag> versionTag) {
GfErrType err = invalidateNoThrowTX(key, aCallbackArgument, -1,
CacheEventFlags::NORMAL, versionTag);
GfErrTypeToException("Region::invalidateTX", err);
@@ -3401,7 +3405,8 @@ void ChunkedInterestResponse::handleChunk(const uint8_t*
chunk,
}
if (m_resultKeys == nullptr) {
- m_resultKeys = std::make_shared<std::vector<std::shared_ptr<CacheableKey>>
>();
+ m_resultKeys =
+ std::make_shared<std::vector<std::shared_ptr<CacheableKey>>>();
}
serializer::readObject(*input, *m_resultKeys);
m_replyMsg.readSecureObjectPart(*input, false, true,
isLastChunkWithSecurity);
@@ -3452,7 +3457,7 @@ void ChunkedQueryResponse::readObjectPartList(DataInput&
input,
for (int32_t index = 0; index < len; ++index) {
if (input.read() == 2 /* for exception*/) {
input.advanceCursor(input.readArrayLen()); // skipLen
- auto exMsgPtr = input.readNativeString();
+ auto exMsgPtr = input.readNativeString();
throw IllegalStateException(exMsgPtr->asChar());
} else {
if (isResultSet) {
@@ -3508,7 +3513,7 @@ void ChunkedQueryResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
// special case for scalar result
partLen = input->readInt32();
input->read();
- auto intVal = input->readObject<CacheableInt32>(true);
+ auto intVal = input->readObject<CacheableInt32>(true);
m_queryResults->push_back(intVal);
// TODO:
@@ -3546,7 +3551,7 @@ void ChunkedQueryResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
skip = true;
}
for (int i = 0; i < numOfFldNames; i++) {
- auto sptr = input->readNativeString();
+ auto sptr = input->readNativeString();
if (!skip) {
m_structFieldNames.push_back(sptr);
}
@@ -3705,8 +3710,9 @@ void ChunkedFunctionExecutionResponse::handleChunk(
// then isObject byte
input->read(); // ignore iSobject
- startLen = input->getBytesRead(); // reset from here need to look value
- // part + memberid AND -1 for array
type
+ startLen =
+ input->getBytesRead(); // reset from here need to look value
+ // part + memberid AND -1 for array type
// Since it is contained as a part of other results, read arrayType which
// is arrayList = 65.
@@ -3741,7 +3747,7 @@ void ChunkedFunctionExecutionResponse::handleChunk(
value = CacheableString::create("Function exception result.");
}
if (m_rc != nullptr) {
- std::shared_ptr<Cacheable> result = nullptr;
+ std::shared_ptr<Cacheable> result = nullptr;
if (isExceptionPart) {
result =
std::make_shared<UserFunctionExecutionException>(value->toString());
@@ -3859,7 +3865,7 @@ void ChunkedPutAllResponse::handleChunk(const uint8_t*
chunk, int32_t chunkLen,
const auto byte1 = input->read();
m_msg.readSecureObjectPart(*input, false, true, isLastChunkWithSecurity);
- auto pool = cache->getPoolManager().find(m_msg.getPoolName());
+ auto pool = cache->getPoolManager().find(m_msg.getPoolName());
if (pool != nullptr && !pool->isDestroyed() &&
pool->getPRSingleHopEnabled()) {
ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(pool.get());
@@ -3922,7 +3928,7 @@ void ChunkedRemoveAllResponse::handleChunk(const uint8_t*
chunk,
const auto byte1 = input->read();
m_msg.readSecureObjectPart(*input, false, true, isLastChunkWithSecurity);
- auto pool = cache->getPoolManager().find(m_msg.getPoolName());
+ auto pool = cache->getPoolManager().find(m_msg.getPoolName());
if (pool != nullptr && !pool->isDestroyed() &&
pool->getPRSingleHopEnabled()) {
ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(pool.get());
diff --git a/cppcache/src/TransactionalOperation.hpp
b/cppcache/src/TransactionalOperation.hpp
index 29248f74..c27c65ad 100644
--- a/cppcache/src/TransactionalOperation.hpp
+++ b/cppcache/src/TransactionalOperation.hpp
@@ -27,7 +27,6 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/geode_types.hpp>
#include <geode/Cacheable.hpp>
#include <vector>
namespace apache {
diff --git a/templates/security/UserPasswordAuthInit.hpp
b/templates/security/UserPasswordAuthInit.hpp
index 8e8aaa01..abcb0fb2 100644
--- a/templates/security/UserPasswordAuthInit.hpp
+++ b/templates/security/UserPasswordAuthInit.hpp
@@ -17,6 +17,8 @@
#ifndef __USERPASSWORDAUTHINIT__
#define __USERPASSWORDAUTHINIT__
+#include <memory>
+
#include "geode/AuthInitialize.hpp"
/**
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Protobuf protocol module will throw exceptions on some input
> ------------------------------------------------------------
>
> Key: GEODE-3149
> URL: https://issues.apache.org/jira/browse/GEODE-3149
> Project: Geode
> Issue Type: Bug
> Components: client/server
> Reporter: Brian Rowe
> Fix For: 1.3.0
>
>
> The protobuf protocol handler needs to be able to handle any input on the
> incoming socket without crashing.
> Right now closing the socket will cause a crash as we try to process a
> message from the empty stream (the bug here might be that the server
> connection shouldn't be trying to process a message here, but the protocol
> deserialization still needs to have much better error handling).
> {code:java}
> severe 2017/06/28 13:50:55.565 PDT <ServerConnection on port 22514 Thread 0>
> tid=0x31] Uncaught exception in thread Thread[ServerConnection on port 22514
> Thread 0,5,ServerConnection on port 22514]
> java.lang.NullPointerException
> at
> org.apache.geode.protocol.protobuf.ProtobufStreamProcessor.processOneMessage(ProtobufStreamProcessor.java:67)
> at
> org.apache.geode.protocol.protobuf.ProtobufStreamProcessor.receiveMessage(ProtobufStreamProcessor.java:79)
> at
> org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection.doOneMessage(GenericProtocolServerConnection.java:68)
> at
> org.apache.geode.internal.cache.tier.sockets.ServerConnection.run(ServerConnection.java:1155)
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
> at
> org.apache.geode.internal.cache.tier.sockets.AcceptorImpl$1$1.run(AcceptorImpl.java:552)
> at java.lang.Thread.run(Thread.java:748)
> {code}
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
