Merge-related fix for C++.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f664751d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f664751d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f664751d Branch: refs/heads/master Commit: f664751d2f5fda214ffa9df4f1375da4acd2f200 Parents: 04ac900 Author: isapego <[email protected]> Authored: Mon Oct 24 14:50:50 2016 +0300 Committer: isapego <[email protected]> Committed: Mon Oct 24 14:50:50 2016 +0300 ---------------------------------------------------------------------- modules/platforms/cpp/core-test/config/cache-query.xml | 12 +----------- .../platforms/cpp/core-test/src/cache_query_test.cpp | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f664751d/modules/platforms/cpp/core-test/config/cache-query.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query.xml b/modules/platforms/cpp/core-test/config/cache-query.xml index c3b5389..bb18f7c 100644 --- a/modules/platforms/cpp/core-test/config/cache-query.xml +++ b/modules/platforms/cpp/core-test/config/cache-query.xml @@ -69,20 +69,10 @@ </list> </property> </bean> - - <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="QueryRelation"/> - <property name="queryFields"> - <map> - <entry key="personId" value="java.lang.Integer"/> - <entry key="someVal" value="java.lang.Integer"/> - </map> - </property> - </bean> </list> </property> </bean> - + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="QueryRelation"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/f664751d/modules/platforms/cpp/core-test/src/cache_query_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/cache_query_test.cpp b/modules/platforms/cpp/core-test/src/cache_query_test.cpp index 9a5371b..c1c26ac 100644 --- a/modules/platforms/cpp/core-test/src/cache_query_test.cpp +++ b/modules/platforms/cpp/core-test/src/cache_query_test.cpp @@ -772,7 +772,7 @@ struct CacheQueryTestSuiteFixture /** Person cache accessor. */ Cache<int, QueryPerson> GetPersonCache() { - return grid.GetCache<int, QueryPerson>("cache"); + return grid.GetCache<int, QueryPerson>("QueryPerson"); } /** Relation cache accessor. */
