You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2019/12/25 17:53:59 UTC
[ignite] branch ignite-12458 updated: Rename in C++
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-12458
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12458 by this push:
new d230922 Rename in C++
d230922 is described below
commit d230922d3eeeca725b233a7ca5dd7d17284f2fe6
Author: Pavel <pt...@apache.org>
AuthorDate: Wed Dec 25 20:53:42 2019 +0300
Rename in C++
---
.../cpp/thin-client-test/src/cache_client_test.cpp | 2 +-
.../ignite/thin/ignite_client_configuration.h | 20 ++++++++++----------
.../cpp/thin-client/project/vs/thin-client.vcxproj | 2 +-
.../project/vs/thin-client.vcxproj.filters | 6 +++---
.../src/impl/affinity/affinity_manager.cpp | 4 ++--
.../thin-client/src/impl/affinity/affinity_manager.h | 4 ++--
...awareness_group.h => partition_awareness_group.h} | 12 ++++++------
.../cpp/thin-client/src/impl/data_router.cpp | 2 +-
.../platforms/cpp/thin-client/src/impl/data_router.h | 4 ++--
.../platforms/cpp/thin-client/src/impl/message.cpp | 2 +-
modules/platforms/cpp/thin-client/src/impl/message.h | 8 ++++----
11 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp b/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
index ffa03f1..8334a2b 100644
--- a/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
+++ b/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
@@ -89,7 +89,7 @@ public:
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
diff --git a/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h b/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
index f888b8d..33c2df6 100644
--- a/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
+++ b/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
@@ -46,7 +46,7 @@ namespace ignite
*/
IgniteClientConfiguration() :
sslMode(SslMode::DISABLE),
- affinityAwareness(false)
+ partitionAwareness(false)
{
// No-op.
}
@@ -203,7 +203,7 @@ namespace ignite
}
/**
- * Set Affinity Awareness.
+ * Set Partition Awareness.
*
* Enable or disable feature that enables thin client to consider data affinity when making requests
* to the cluster. It means, thin client is going to connect to all available cluster servers listed by
@@ -213,21 +213,21 @@ namespace ignite
*
* @param enable Enable affinity awareness.
*/
- void SetAffinityAwareness(bool enable)
+ void SetPartitionAwareness(bool enable)
{
- affinityAwareness = enable;
+ partitionAwareness = enable;
}
/**
- * Get Affinity Awareness flag.
+ * Get Partition Awareness flag.
*
- * @see SetAffinityAwareness() for details.
+ * @see SetPartitionAwareness() for details.
*
- * @return @c true if affinity awareness is enabled and @c false otherwise.
+ * @return @c true if partition awareness is enabled and @c false otherwise.
*/
- bool IsAffinityAwareness() const
+ bool IsPartitionAwareness() const
{
- return affinityAwareness;
+ return partitionAwareness;
}
private:
@@ -253,7 +253,7 @@ namespace ignite
std::string sslCaFile;
/** Affinity Awareness. */
- bool affinityAwareness;
+ bool partitionAwareness;
};
}
}
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
index 99b53ac..629de37 100644
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
+++ b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
@@ -179,7 +179,7 @@
<ClInclude Include="..\..\include\ignite\thin\ignite_client_configuration.h" />
<ClInclude Include="..\..\include\ignite\thin\ssl_mode.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h" />
- <ClInclude Include="..\..\src\impl\affinity\affinity_awareness_group.h" />
+ <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_manager.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h" />
<ClInclude Include="..\..\src\impl\affinity\cache_affinity_configs.h" />
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
index 6721d94..a8cfbca 100644
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
+++ b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\impl\affinity\affinity_awareness_group.h">
- <Filter>Code\impl\affinity</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
@@ -138,5 +135,8 @@
<ClInclude Include="..\..\src\impl\affinity\affinity_manager.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h">
+ <Filter>Code\impl\affinity</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
index 69f8e2e..6aa6baa 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
@@ -40,7 +40,7 @@ namespace ignite
ResetAffinity(ver);
}
- void AffinityManager::UpdateAffinity(const std::vector<AffinityAwarenessGroup>& groups,
+ void AffinityManager::UpdateAffinity(const std::vector<PartitionAwarenessGroup>& groups,
const AffinityTopologyVersion& ver)
{
if (topologyVersion > ver)
@@ -57,7 +57,7 @@ namespace ignite
CacheAffinityMap& newAffinity = *newAffinityPtr.Get();
- std::vector<AffinityAwarenessGroup>::const_iterator group;
+ std::vector<PartitionAwarenessGroup>::const_iterator group;
for (group = groups.begin(); group != groups.end(); ++group)
{
SP_AffinityAssignment newMapping(new AffinityAssignment(group->GetNodePartitions()));
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
index 7429da3..dab1ef8 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
@@ -24,7 +24,7 @@
#include "impl/affinity/affinity_assignment.h"
#include "impl/affinity/affinity_topology_version.h"
-#include "impl/affinity/affinity_awareness_group.h"
+#include "impl/affinity/partition_awareness_group.h"
namespace ignite
{
@@ -58,7 +58,7 @@ namespace ignite
* @param groups Affinity awareness groups.
* @param ver Affinity topology version.
*/
- void UpdateAffinity(const std::vector<AffinityAwarenessGroup>& groups, const AffinityTopologyVersion& ver);
+ void UpdateAffinity(const std::vector<PartitionAwarenessGroup>& groups, const AffinityTopologyVersion& ver);
/**
* Get affinity mapping for the cache.
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h b/modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
similarity index 92%
rename from modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h
rename to modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
index 7ffe19f..43be387 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
-#define _IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
+#ifndef _IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
+#define _IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
#include <stdint.h>
#include <vector>
@@ -33,15 +33,15 @@ namespace ignite
namespace thin
{
/**
- * Affinity awareness group.
+ * Partition awareness group.
*/
- class AffinityAwarenessGroup
+ class PartitionAwarenessGroup
{
public:
/**
* Default constructor.
*/
- AffinityAwarenessGroup() :
+ PartitionAwarenessGroup() :
applicable(true)
{
// No-op.
@@ -121,4 +121,4 @@ namespace ignite
}
}
-#endif //_IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
\ No newline at end of file
+#endif //_IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/src/impl/data_router.cpp b/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
index 3a26519..ea672ad 100644
--- a/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
@@ -149,7 +149,7 @@ namespace ignite
void DataRouter::RefreshAffinityMapping(const std::vector<int32_t>& cacheIds)
{
- std::vector<AffinityAwarenessGroup> groups;
+ std::vector<PartitionAwarenessGroup> groups;
CachePartitionsRequest req(cacheIds);
CachePartitionsResponse rsp(groups);
diff --git a/modules/platforms/cpp/thin-client/src/impl/data_router.h b/modules/platforms/cpp/thin-client/src/impl/data_router.h
index 4ab2834..409bd16 100644
--- a/modules/platforms/cpp/thin-client/src/impl/data_router.h
+++ b/modules/platforms/cpp/thin-client/src/impl/data_router.h
@@ -99,7 +99,7 @@ namespace ignite
{
const AffinityTopologyVersion* ver = rsp.GetAffinityTopologyVersion();
- if (ver != 0 && config.IsAffinityAwareness())
+ if (ver != 0 && config.IsPartitionAwareness())
affinityManager.UpdateAffinity(*ver);
}
@@ -188,7 +188,7 @@ namespace ignite
*/
bool IsAffinityAwarenessEnabled() const
{
- return config.IsAffinityAwareness();
+ return config.IsPartitionAwareness();
}
/**
diff --git a/modules/platforms/cpp/thin-client/src/impl/message.cpp b/modules/platforms/cpp/thin-client/src/impl/message.cpp
index 34bc608..39723bf 100644
--- a/modules/platforms/cpp/thin-client/src/impl/message.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/message.cpp
@@ -155,7 +155,7 @@ namespace ignite
nodeParts[i].Read(reader);
}
- CachePartitionsResponse::CachePartitionsResponse(std::vector<AffinityAwarenessGroup>& groups) :
+ CachePartitionsResponse::CachePartitionsResponse(std::vector<PartitionAwarenessGroup>& groups) :
groups(groups)
{
// No-op.
diff --git a/modules/platforms/cpp/thin-client/src/impl/message.h b/modules/platforms/cpp/thin-client/src/impl/message.h
index 104709c..262534b 100644
--- a/modules/platforms/cpp/thin-client/src/impl/message.h
+++ b/modules/platforms/cpp/thin-client/src/impl/message.h
@@ -30,7 +30,7 @@
#include "impl/protocol_version.h"
#include "impl/affinity/affinity_topology_version.h"
-#include "impl/affinity/affinity_awareness_group.h"
+#include "impl/affinity/partition_awareness_group.h"
namespace ignite
{
@@ -775,7 +775,7 @@ namespace ignite
*
* @param groups Affinity Awareness Groups.
*/
- CachePartitionsResponse(std::vector<AffinityAwarenessGroup>& groups);
+ CachePartitionsResponse(std::vector<PartitionAwarenessGroup>& groups);
/**
* Destructor.
@@ -804,7 +804,7 @@ namespace ignite
*
* @return Affinity awareness groups.
*/
- const std::vector<AffinityAwarenessGroup>& GetGroups() const
+ const std::vector<PartitionAwarenessGroup>& GetGroups() const
{
return groups;
}
@@ -814,7 +814,7 @@ namespace ignite
AffinityTopologyVersion topologyVersion;
/** Affinity awareness groups. */
- std::vector<AffinityAwarenessGroup>& groups;
+ std::vector<PartitionAwarenessGroup>& groups;
};
/**