http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 6710087..09c0c4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.cache.CacheDhtLocalPartitionAfterRe import org.apache.ignite.internal.processors.cache.CacheEnumOperationsSingleNodeTest; import org.apache.ignite.internal.processors.cache.CacheEnumOperationsTest; import org.apache.ignite.internal.processors.cache.CacheExchangeMessageDuplicatedStateTest; +import org.apache.ignite.internal.processors.cache.CacheMemoryPolicyConfigurationTest; import org.apache.ignite.internal.processors.cache.CrossCacheTxRandomOperationsTest; import org.apache.ignite.internal.processors.cache.GridCacheAtomicMessageCountSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheFinishPartitionsSelfTest; @@ -36,6 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCachePartitionedGetSelfTe import org.apache.ignite.internal.processors.cache.GridCachePartitionedProjectionAffinitySelfTest; import org.apache.ignite.internal.processors.cache.GridCacheVariableTopologySelfTest; import org.apache.ignite.internal.processors.cache.IgniteAtomicCacheEntryProcessorNodeJoinTest; +import org.apache.ignite.internal.processors.cache.MemoryPolicyConfigValidationTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorNodeJoinTest; import org.apache.ignite.internal.processors.cache.IgniteCacheIncrementTxTest; import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdateTest; @@ -258,6 +260,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(CacheLockReleaseNodeLeaveTest.class)); suite.addTest(new TestSuite(NearCacheSyncUpdateTest.class)); suite.addTest(new TestSuite(CacheConfigurationLeakTest.class)); + suite.addTest(new TestSuite(MemoryPolicyConfigValidationTest.class)); + suite.addTest(new TestSuite(CacheMemoryPolicyConfigurationTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsSingleNodeTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsTest.class)); suite.addTest(new TestSuite(IgniteCacheIncrementTxTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java index 74ff9c7..51a997b 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java @@ -107,10 +107,9 @@ public class H2TreeIndex extends GridH2IndexBase { RootPage page = getMetaPage(name, i); segments[i] = new H2Tree( - name, - cctx.offheap().reuseListForIndex(name), + name,cctx.offheap().reuseListForIndex(name), cctx.cacheId(), - dbMgr.pageMemory(), + cctx.memoryPolicy().pageMemory(), cctx.shared().wal(), cctx.offheap().globalRemoveId(), tbl.rowFactory(), http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java index 70c46e8..791de5f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java @@ -18,21 +18,30 @@ package org.apache.ignite.internal.processors.query.h2; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.cache.QueryEntity; +import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.cache.QueryIndexType; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.internal.binary.BinaryObjectImpl; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.query.GridQueryFieldsResult; import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor; import org.apache.ignite.internal.processors.query.GridQueryProperty; @@ -58,75 +67,101 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract private static final TextIndex textIdx = new TextIndex(F.asList("txt")); /** */ - private static final Map<String, Class<?>> fieldsAA = new HashMap<>(); + private static final LinkedHashMap<String, String> fieldsAA = new LinkedHashMap<>(); /** */ - private static final Map<String, Class<?>> fieldsAB = new HashMap<>(); + private static final LinkedHashMap<String, String> fieldsAB = new LinkedHashMap<>(); /** */ - private static final Map<String, Class<?>> fieldsBA = new HashMap<>(); + private static final LinkedHashMap<String, String> fieldsBA = new LinkedHashMap<>(); + + /** */ + private IgniteEx ignite0; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setMarshaller(new BinaryMarshaller()); + + return cfg; + } /** * Fields initialization. */ static { - fieldsAA.put("id", Long.class); - fieldsAA.put("name", String.class); - fieldsAA.put("age", Integer.class); + fieldsAA.put("id", Long.class.getName()); + fieldsAA.put("name", String.class.getName()); + fieldsAA.put("age", Integer.class.getName()); fieldsAB.putAll(fieldsAA); - fieldsAB.put("txt", String.class); + fieldsAB.put("txt", String.class.getName()); fieldsBA.putAll(fieldsAA); - fieldsBA.put("sex", Boolean.class); + fieldsBA.put("sex", Boolean.class.getName()); } /** */ - private static TypeDesc typeAA = new TypeDesc("A", "A", fieldsAA, null); - - /** */ - private static TypeDesc typeAB = new TypeDesc("A", "B", fieldsAB, textIdx); + private static TypeDesc typeAA = new TypeDesc("A", "A", Collections.<String, Class<?>>emptyMap(), null); /** */ - private static TypeDesc typeBA = new TypeDesc("B", "A", fieldsBA, null); + private static TypeDesc typeAB = new TypeDesc("A", "B", Collections.<String, Class<?>>emptyMap(), textIdx); /** */ - private IgniteH2Indexing idx = new IgniteH2Indexing(); + private static TypeDesc typeBA = new TypeDesc("B", "A", Collections.<String, Class<?>>emptyMap(), null); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - getTestResources().inject(idx); - - startIndexing(idx); + ignite0 = startGrid(0); } - /** {@inheritDoc} */ - protected void startIndexing(IgniteH2Indexing spi) throws Exception { - spi.start(null, null); + /** + */ + private CacheConfiguration cacheACfg() { + CacheConfiguration<?,?> cfg = new CacheConfiguration<>(); + + cfg.setName("A"); + + QueryEntity eA = new QueryEntity(Integer.class.getName(), "A"); + eA.setFields(fieldsAA); + + QueryEntity eB = new QueryEntity(Integer.class.getName(), "B"); + eB.setFields(fieldsAB); + + List<QueryEntity> list = new ArrayList<>(2); - CacheConfiguration ccfgA = cacheCfg("A"); - CacheConfiguration ccfgB = cacheCfg("B"); + list.add(eA); + list.add(eB); - spi.registerCache(ccfgA.getName(), null, ccfgA); - spi.registerCache(ccfgB.getName(), null, ccfgB); + QueryIndex idx = new QueryIndex("txt"); + idx.setIndexType(QueryIndexType.FULLTEXT); + eB.setIndexes(Collections.singleton(idx)); + + cfg.setQueryEntities(list); + + return cfg; } /** - * @param name Name. + * */ - private CacheConfiguration cacheCfg(String name) { - CacheConfiguration<?,?> cfg = new CacheConfiguration<>(); + private CacheConfiguration cacheBCfg() { + CacheConfiguration cfg = new CacheConfiguration(); + + cfg.setName("B"); - cfg.setName(name); + QueryEntity eA = new QueryEntity(Integer.class.getName(), "A"); + eA.setFields(fieldsBA); + + cfg.setQueryEntities(Collections.singleton(eA)); return cfg; } /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - idx.stop(); - - idx = null; + stopAllGrids(); } /** @@ -135,14 +170,13 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract * @param age Age. * @return AA. */ - private CacheObject aa(long id, String name, int age) { - Map<String, Object> map = new HashMap<>(); + private BinaryObjectBuilder aa(String typeName, long id, String name, int age) { + BinaryObjectBuilder aBuilder = ignite0.binary().builder(typeName) + .setField("id", id) + .setField("name", name) + .setField("age", age); - map.put("id", id); - map.put("name", name); - map.put("age", age); - - return new TestCacheObject(map); + return aBuilder; } /** @@ -152,12 +186,12 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract * @param txt Text. * @return AB. */ - private CacheObject ab(long id, String name, int age, String txt) { - Map<String, Object> map = aa(id, name, age).value(null, false); + private BinaryObjectBuilder ab(long id, String name, int age, String txt) { + BinaryObjectBuilder aBuilder = aa("B", id, name, age); - map.put("txt", txt); + aBuilder.setField("txt", txt); - return new TestCacheObject(map); + return aBuilder; } /** @@ -167,12 +201,12 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract * @param sex Sex. * @return BA. */ - private CacheObject ba(long id, String name, int age, boolean sex) { - Map<String, Object> map = aa(id, name, age).value(null, false); + private BinaryObjectBuilder ba(long id, String name, int age, boolean sex) { + BinaryObjectBuilder builder = aa("A", id, name, age); - map.put("sex", sex); + builder.setField("sex", sex); - return new TestCacheObject(map); + return builder; } /** @@ -180,7 +214,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract * @return Value. * @throws IgniteSpiException If failed. */ - private Map<String, Object> value(IgniteBiTuple<Integer, Map<String, Object>> row) throws IgniteSpiException { + private BinaryObjectImpl value(IgniteBiTuple<Integer, BinaryObjectImpl> row) throws IgniteSpiException { return row.get2(); } @@ -188,7 +222,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract * @return Indexing. */ private IgniteH2Indexing getIndexing() { - return idx; + return U.field(ignite0.context().query(), "idx"); } /** @@ -216,19 +250,13 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract assertEquals(-1, spi.size(typeAB.space(), typeAB)); assertEquals(-1, spi.size(typeBA.space(), typeBA)); - spi.registerType(typeAA.space(), typeAA); - - assertEquals(0, spi.size(typeAA.space(), typeAA)); - assertEquals(-1, spi.size(typeAB.space(), typeAB)); - assertEquals(-1, spi.size(typeBA.space(), typeBA)); - - spi.registerType(typeAB.space(), typeAB); + IgniteCache<Integer, BinaryObject> cacheA = ignite0.createCache(cacheACfg()); assertEquals(0, spi.size(typeAA.space(), typeAA)); assertEquals(0, spi.size(typeAB.space(), typeAB)); assertEquals(-1, spi.size(typeBA.space(), typeBA)); - spi.registerType(typeBA.space(), typeBA); + IgniteCache<Integer, BinaryObject> cacheB = ignite0.createCache(cacheBCfg()); // Initially all is empty. assertEquals(0, spi.size(typeAA.space(), typeAA)); @@ -258,105 +286,100 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract assertFalse(spi.queryLocalSql(typeBA.space(), "select ba.* from B.A as ba", null, Collections.emptySet(), typeBA.name(), null, null).hasNext()); - // Nothing to remove. - spi.remove("A", typeAA, key(1), 0, aa(1, "", 10), null); - spi.remove("B", typeBA, key(1), 0, ba(1, "", 10, true), null); - - spi.store(typeAA.space(), typeAA, key(1), 0, aa(1, "Vasya", 10), new GridCacheVersion(), 0, 0); + cacheA.put(1, aa("A", 1, "Vasya", 10).build()); assertEquals(1, spi.size(typeAA.space(), typeAA)); assertEquals(0, spi.size(typeAB.space(), typeAB)); assertEquals(0, spi.size(typeBA.space(), typeBA)); - spi.store(typeAB.space(), typeAB, key(1), 0, ab(1, "Vasya", 20, "Some text about Vasya goes here."), - new GridCacheVersion(), 0, 0); + cacheA.put(1, ab(1, "Vasya", 20, "Some text about Vasya goes here.").build()); // In one space all keys must be unique. assertEquals(0, spi.size(typeAA.space(), typeAA)); assertEquals(1, spi.size(typeAB.space(), typeAB)); assertEquals(0, spi.size(typeBA.space(), typeBA)); - spi.store(typeBA.space(), typeBA, key(1), 0, ba(2, "Petya", 25, true), new GridCacheVersion(), 0, 0); + cacheB.put(1, ba(2, "Petya", 25, true).build()); // No replacement because of different space. assertEquals(0, spi.size(typeAA.space(), typeAA)); assertEquals(1, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); - spi.store(typeBA.space(), typeBA, key(1), 0, ba(2, "Kolya", 25, true), new GridCacheVersion(), 0, 0); + cacheB.put(1, ba(2, "Kolya", 25, true).build()); // Replacement in the same table. assertEquals(0, spi.size(typeAA.space(), typeAA)); assertEquals(1, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); - spi.store(typeAA.space(), typeAA, key(2), 0, aa(2, "Valera", 19), new GridCacheVersion(), 0, 0); + cacheA.put(2, aa("A", 2, "Valera", 19).build()); assertEquals(1, spi.size(typeAA.space(), typeAA)); assertEquals(1, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); - spi.store(typeAA.space(), typeAA, key(3), 0, aa(3, "Borya", 18), new GridCacheVersion(), 0, 0); + cacheA.put(3, aa("A", 3, "Borya", 18).build()); assertEquals(2, spi.size(typeAA.space(), typeAA)); assertEquals(1, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); - spi.store(typeAB.space(), typeAB, key(4), 0, ab(4, "Vitalya", 20, "Very Good guy"), new GridCacheVersion(), 0, 0); + cacheA.put(4, ab(4, "Vitalya", 20, "Very Good guy").build()); assertEquals(2, spi.size(typeAA.space(), typeAA)); assertEquals(2, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); // Query data. - Iterator<IgniteBiTuple<Integer, Map<String, Object>>> res = + Iterator<IgniteBiTuple<Integer, BinaryObjectImpl>> res = spi.queryLocalSql(typeAA.space(), "from a order by age", null, Collections.emptySet(), typeAA.name(), null, null); assertTrue(res.hasNext()); - assertEquals(aa(3, "Borya", 18).value(null, false), value(res.next())); + assertEquals(aa("A", 3, "Borya", 18).build(), value(res.next())); assertTrue(res.hasNext()); - assertEquals(aa(2, "Valera", 19).value(null, false), value(res.next())); + assertEquals(aa("A", 2, "Valera", 19).build(), value(res.next())); assertFalse(res.hasNext()); res = spi.queryLocalSql(typeAA.space(), "select aa.* from a aa order by aa.age", null, Collections.emptySet(), typeAA.name(), null, null); assertTrue(res.hasNext()); - assertEquals(aa(3, "Borya", 18).value(null, false), value(res.next())); + assertEquals(aa("A", 3, "Borya", 18).build(), value(res.next())); assertTrue(res.hasNext()); - assertEquals(aa(2, "Valera", 19).value(null, false), value(res.next())); + assertEquals(aa("A", 2, "Valera", 19).build(), value(res.next())); assertFalse(res.hasNext()); res = spi.queryLocalSql(typeAB.space(), "from b order by name", null, Collections.emptySet(), typeAB.name(), null, null); assertTrue(res.hasNext()); - assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes here.").value(null, false), value(res.next())); + assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes here.").build(), value(res.next())); assertTrue(res.hasNext()); - assertEquals(ab(4, "Vitalya", 20, "Very Good guy").value(null, false), value(res.next())); + assertEquals(ab(4, "Vitalya", 20, "Very Good guy").build(), value(res.next())); assertFalse(res.hasNext()); res = spi.queryLocalSql(typeAB.space(), "select bb.* from b as bb order by bb.name", null, Collections.emptySet(), typeAB.name(), null, null); assertTrue(res.hasNext()); - assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes here.").value(null, false), value(res.next())); + assertEquals(ab(1, "Vasya", 20, "Some text about Vasya goes here.").build(), value(res.next())); assertTrue(res.hasNext()); - assertEquals(ab(4, "Vitalya", 20, "Very Good guy").value(null, false), value(res.next())); + assertEquals(ab(4, "Vitalya", 20, "Very Good guy").build(), value(res.next())); assertFalse(res.hasNext()); res = spi.queryLocalSql(typeBA.space(), "from a", null, Collections.emptySet(), typeBA.name(), null, null); assertTrue(res.hasNext()); - assertEquals(ba(2, "Kolya", 25, true).value(null, false), value(res.next())); + assertEquals(ba(2, "Kolya", 25, true).build(), value(res.next())); assertFalse(res.hasNext()); // Text queries - Iterator<IgniteBiTuple<Integer, Map<String, Object>>> txtRes = spi.queryLocalText(typeAB.space(), "good", + Iterator<IgniteBiTuple<Integer, BinaryObjectImpl>> txtRes = spi.queryLocalText(typeAB.space(), "good", typeAB, null); assertTrue(txtRes.hasNext()); - assertEquals(ab(4, "Vitalya", 20, "Very Good guy").value(null, false), value(txtRes.next())); + assertEquals(ab(4, "Vitalya", 20, "Very Good guy").build(), value(txtRes.next())); assertFalse(txtRes.hasNext()); // Fields query @@ -385,13 +408,13 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract assertFalse(it.hasNext()); // Remove - spi.remove(typeAA.space(), typeAA, key(2), 0, aa(2, "Valera", 19), null); + cacheA.remove(2); assertEquals(1, spi.size(typeAA.space(), typeAA)); assertEquals(2, spi.size(typeAB.space(), typeAB)); assertEquals(1, spi.size(typeBA.space(), typeBA)); - spi.remove(typeBA.space(), typeBA, key(1), 0, ba(2, "Kolya", 25, true), null); + cacheB.remove(1); assertEquals(1, spi.size(typeAA.space(), typeAA)); assertEquals(2, spi.size(typeAB.space(), typeAB)); @@ -412,9 +435,6 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract spi.unregisterType(typeBA.space(), typeBA); - // Should not store but should not fail as well. - spi.store(typeAA.space(), typeAA, key(10), 0, aa(1, "Fail", 100500), new GridCacheVersion(), 0, 0); - assertEquals(-1, spi.size(typeAA.space(), typeAA)); } @@ -426,6 +446,8 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract public void testLongQueries() throws Exception { IgniteH2Indexing spi = getIndexing(); + ignite0.createCache(cacheACfg()); + long longQryExecTime = CacheConfiguration.DFLT_LONG_QRY_WARN_TIMEOUT; GridStringLogger log = new GridStringLogger(false, this.log); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-query-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-32.xml b/modules/platforms/cpp/core-test/config/cache-query-32.xml new file mode 100644 index 0000000..6927705 --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-query-32.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<!-- + Ignite Spring configuration file to startup grid cache. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <import resource="cache-query-default.xml"/> + + <bean parent="grid.cfg"> + <property name="memoryConfiguration"> + <bean class="org.apache.ignite.configuration.MemoryConfiguration"> + <property name="systemCacheMemorySize" value="41943040"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> + + <property name="memoryPolicies"> + <list> + <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration"> + <property name="name" value="dfltPlc"/> + <property name="size" value="103833600"/> + </bean> + </list> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml new file mode 100644 index 0000000..b5f9854 --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> + +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <import resource="cache-query-continuous-default.xml"/> + + <bean parent="grid.cfg"> + <property name="memoryConfiguration"> + <bean class="org.apache.ignite.configuration.MemoryConfiguration"> + <property name="systemCacheMemorySize" value="41943040"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> + + <property name="memoryPolicies"> + <list> + <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration"> + <property name="name" value="dfltPlc"/> + <property name="size" value="103833600"/> + </bean> + </list> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-query-continuous-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-continuous-default.xml b/modules/platforms/cpp/core-test/config/cache-query-continuous-default.xml new file mode 100644 index 0000000..2e43c5a --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-query-continuous-default.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> + +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="connectorConfiguration"><null/></property> + + <property name="cacheConfiguration"> + <list> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="transactional_no_backup"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + <property name="backups" value="0"/> + <property name="startSize" value="10"/> + <property name="queryEntities"> + <list> + <bean class="org.apache.ignite.cache.QueryEntity"> + <property name="keyType" value="java.lang.Integer"/> + <property name="valueType" value="TestEntry"/> + + <property name="fields"> + <map> + <entry key="value" value="java.lang.Integer"/> + </map> + </property> + + <property name="indexes"> + <list> + <bean class="org.apache.ignite.cache.QueryIndex"> + <property name="fields"> + <map> + <entry key="value" value="true"/> + </map> + </property> + <property name="indexType" value="FULLTEXT"/> + </bean> + </list> + </property> + </bean> + </list> + </property> + </bean> + </list> + </property> + + <property name="discoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> + <property name="ipFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <property name="addresses"> + <list> + <!-- In distributed environment, replace with actual host IP address. --> + <value>127.0.0.1:47500</value> + </list> + </property> + </bean> + </property> + <property name="socketTimeout" value="300" /> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-query-continuous.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-continuous.xml b/modules/platforms/cpp/core-test/config/cache-query-continuous.xml index 1b940fd..1c4e275 100644 --- a/modules/platforms/cpp/core-test/config/cache-query-continuous.xml +++ b/modules/platforms/cpp/core-test/config/cache-query-continuous.xml @@ -24,64 +24,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="connectorConfiguration"><null/></property> + <import resource="cache-query-continuous-default.xml"/> - <property name="cacheConfiguration"> - <list> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="transactional_no_backup"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="backups" value="0"/> - <property name="startSize" value="10"/> - <property name="queryEntities"> - <list> - <bean class="org.apache.ignite.cache.QueryEntity"> - <property name="keyType" value="java.lang.Integer"/> - <property name="valueType" value="TestEntry"/> - - <property name="fields"> - <map> - <entry key="value" value="java.lang.Integer"/> - </map> - </property> - - <property name="indexes"> - <list> - <bean class="org.apache.ignite.cache.QueryIndex"> - <property name="fields"> - <map> - <entry key="value" value="true"/> - </map> - </property> - <property name="indexType" value="FULLTEXT"/> - </bean> - </list> - </property> - </bean> - </list> - </property> - </bean> - </list> - </property> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> - <property name="addresses"> - <list> - <!-- In distributed environment, replace with actual host IP address. --> - <value>127.0.0.1:47500</value> - </list> - </property> - </bean> - </property> - <property name="socketTimeout" value="300" /> - </bean> - </property> - </bean> + <bean parent="grid.cfg"/> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-query-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-query-default.xml b/modules/platforms/cpp/core-test/config/cache-query-default.xml new file mode 100644 index 0000000..28c57d6 --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-query-default.xml @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<!-- + Ignite Spring configuration file to startup grid cache. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="connectorConfiguration"><null/></property> + + <property name="cacheConfiguration"> + <list> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="QueryPerson"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + + <property name="affinity"> + <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> + <property name="partitions" value="256"/> + </bean> + </property> + + <property name="typeMetadata"> + <list> + <bean class="org.apache.ignite.cache.CacheTypeMetadata"> + <property name="valueType" value="QueryPerson"/> + <property name="ascendingFields"> + <map> + <entry key="age" value="java.lang.Integer"/> + </map> + </property> + <property name="queryFields"> + <map> + <entry key="name" value="java.lang.String"/> + <entry key="age" value="java.lang.Integer"/> + <entry key="birthday" value="java.util.Date"/> + <entry key="recordCreated" value="java.sql.Timestamp"/> + </map> + </property> + <property name="textFields"> + <list> + <value>name</value> + </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"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + + <property name="affinity"> + <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> + <property name="partitions" value="256"/> + </bean> + </property> + + <property name="typeMetadata"> + <list> + <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> + </list> + </property> + + <property name="discoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> + <property name="ipFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <property name="addresses"> + <list> + <!-- In distributed environment, replace with actual host IP address. --> + <value>127.0.0.1:47500</value> + </list> + </property> + </bean> + </property> + <property name="socketTimeout" value="300" /> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/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 036c464..be7f939 100644 --- a/modules/platforms/cpp/core-test/config/cache-query.xml +++ b/modules/platforms/cpp/core-test/config/cache-query.xml @@ -28,117 +28,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="connectorConfiguration"><null/></property> + <import resource="cache-query-default.xml"/> - <property name="cacheConfiguration"> - <list> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="QueryPerson"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> - <property name="partitions" value="256"/> - </bean> - </property> - - <property name="typeMetadata"> - <list> - <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="QueryPerson"/> - <property name="ascendingFields"> - <map> - <entry key="age" value="java.lang.Integer"/> - </map> - </property> - <property name="queryFields"> - <map> - <entry key="name" value="java.lang.String"/> - <entry key="age" value="java.lang.Integer"/> - <entry key="birthday" value="java.util.Date"/> - <entry key="recordCreated" value="java.sql.Timestamp"/> - </map> - </property> - <property name="textFields"> - <list> - <value>name</value> - </list> - </property> - </bean> - </list> - </property> - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="QueryRelation"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> - <property name="partitions" value="256"/> - </bean> - </property> - - <property name="typeMetadata"> - <list> - <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="TimeCache"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> - <property name="partitions" value="256"/> - </bean> - </property> - - <!-- Configure type metadata to enable queries. --> - <property name="queryEntities"> - <list> - <bean class="org.apache.ignite.cache.QueryEntity"> - <property name="keyType" value="java.lang.Integer"/> - <property name="valueType" value="java.sql.Time"/> - </bean> - </list> - </property> - </bean> - </list> - </property> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> - <property name="addresses"> - <list> - <!-- In distributed environment, replace with actual host IP address. --> - <value>127.0.0.1:47500</value> - </list> - </property> - </bean> - </property> - <property name="socketTimeout" value="300" /> - </bean> - </property> - </bean> + <bean parent="grid.cfg"/> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-test-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-test-32.xml b/modules/platforms/cpp/core-test/config/cache-test-32.xml new file mode 100644 index 0000000..3535ae4 --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-test-32.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<!-- + Ignite Spring configuration file to startup grid cache. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <import resource="cache-test-default.xml"/> + + <bean parent="grid.cfg"> + <property name="memoryConfiguration"> + <bean class="org.apache.ignite.configuration.MemoryConfiguration"> + <property name="systemCacheMemorySize" value="41943040"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> + + <property name="memoryPolicies"> + <list> + <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration"> + <property name="name" value="dfltPlc"/> + <property name="size" value="103833600"/> + </bean> + </list> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-test-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-test-default.xml b/modules/platforms/cpp/core-test/config/cache-test-default.xml new file mode 100644 index 0000000..9a2bbd7 --- /dev/null +++ b/modules/platforms/cpp/core-test/config/cache-test-default.xml @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<!-- + Ignite Spring configuration file to startup grid cache. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="connectorConfiguration"><null/></property> + + <property name="includeEventTypes"> + <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/> + </property> + + <property name="cacheConfiguration"> + <list> + <bean parent="cache-template"> + <property name="name" value="local"/> + <property name="cacheMode" value="LOCAL"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="local_atomic"/> + <property name="cacheMode" value="LOCAL"/> + <property name="atomicityMode" value="ATOMIC"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="partitioned"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="partitioned2"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="partitioned_atomic"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="ATOMIC"/> + <property name="atomicWriteOrderMode" value="PRIMARY"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="partitioned_near"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + <property name="nearConfiguration"> + <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> + </property> + </bean> + + <bean parent="cache-template"> + <property name="name" value="partitioned_atomic_near"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="ATOMIC"/> + <property name="atomicWriteOrderMode" value="PRIMARY"/> + <property name="nearConfiguration"> + <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> + </property> + </bean> + + <bean parent="cache-template"> + <property name="name" value="replicated"/> + <property name="cacheMode" value="REPLICATED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + </bean> + + <bean parent="cache-template"> + <property name="name" value="replicated_atomic"/> + <property name="cacheMode" value="REPLICATED"/> + <property name="atomicityMode" value="ATOMIC"/> + <property name="atomicWriteOrderMode" value="PRIMARY"/> + </bean> + </list> + </property> + + <property name="discoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> + <property name="ipFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <property name="addresses"> + <list> + <!-- In distributed environment, replace with actual host IP address. --> + <value>127.0.0.1:47500..47501</value> + </list> + </property> + </bean> + </property> + <property name="socketTimeout" value="300" /> + </bean> + </property> + + <property name="transactionConfiguration"> + <bean class="org.apache.ignite.configuration.TransactionConfiguration"> + <property name="txSerializableEnabled" value="true"/> + </bean> + </property> + </bean> + + <bean id="cache-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="rebalanceMode" value="SYNC"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + <property name="backups" value="1"/> + <property name="eagerTtl" value="true"/> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/config/cache-test.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/config/cache-test.xml b/modules/platforms/cpp/core-test/config/cache-test.xml index fc11722..43ed8d2 100644 --- a/modules/platforms/cpp/core-test/config/cache-test.xml +++ b/modules/platforms/cpp/core-test/config/cache-test.xml @@ -28,108 +28,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="connectorConfiguration"><null/></property> + <import resource="cache-test-default.xml"/> - <property name="includeEventTypes"> - <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/> - </property> - - <property name="cacheConfiguration"> - <list> - <bean parent="cache-template"> - <property name="name" value="local"/> - <property name="cacheMode" value="LOCAL"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="local_atomic"/> - <property name="cacheMode" value="LOCAL"/> - <property name="atomicityMode" value="ATOMIC"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned2"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_atomic"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_near"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="nearConfiguration"> - <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> - </property> - </bean> - - <bean parent="cache-template"> - <property name="name" value="partitioned_atomic_near"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - <property name="nearConfiguration"> - <bean class="org.apache.ignite.configuration.NearCacheConfiguration" /> - </property> - </bean> - - <bean parent="cache-template"> - <property name="name" value="replicated"/> - <property name="cacheMode" value="REPLICATED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - </bean> - - <bean parent="cache-template"> - <property name="name" value="replicated_atomic"/> - <property name="cacheMode" value="REPLICATED"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="atomicWriteOrderMode" value="PRIMARY"/> - </bean> - </list> - </property> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> - <property name="addresses"> - <list> - <!-- In distributed environment, replace with actual host IP address. --> - <value>127.0.0.1:47500..47501</value> - </list> - </property> - </bean> - </property> - <property name="socketTimeout" value="300" /> - </bean> - </property> - - <property name="transactionConfiguration"> - <bean class="org.apache.ignite.configuration.TransactionConfiguration"> - <property name="txSerializableEnabled" value="true"/> - </bean> - </property> - </bean> - - <bean id="cache-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="rebalanceMode" value="SYNC"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="backups" value="1"/> - <property name="eagerTtl" value="true"/> - </bean> + <bean parent="grid.cfg"/> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj index f22e885..d97f917 100644 --- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj +++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj @@ -35,11 +35,18 @@ <ItemGroup> <None Include="..\..\config\cache-identity.xml" /> <None Include="..\..\config\cache-query-continuous.xml" /> + <None Include="..\..\config\cache-query-32.xml" /> <None Include="..\..\config\cache-query.xml" /> + <None Include="..\..\config\cache-query-default.xml" /> + <None Include="..\..\config\cache-test-32.xml" /> <None Include="..\..\config\cache-store.xml"> <SubType>Designer</SubType> </None> <None Include="..\..\config\cache-test.xml" /> + <None Include="..\..\config\cache-test-default.xml" /> + <None Include="..\..\config\cache-query-continuous-32.xml" /> + <None Include="..\..\config\cache-query-continuous.xml" /> + <None Include="..\..\config\cache-query-continuous-default.xml" /> <None Include="..\..\config\invalid.xml" /> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters index fb0be1b..aa19e63 100644 --- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters +++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters @@ -124,12 +124,33 @@ </Filter> </ItemGroup> <ItemGroup> + <None Include="..\..\config\cache-test-32.xml"> + <Filter>Configs</Filter> + </None> <None Include="..\..\config\cache-test.xml"> <Filter>Configs</Filter> </None> + <None Include="..\..\config\cache-test-default.xml"> + <Filter>Configs</Filter> + </None> + <None Include="..\..\config\cache-query-32.xml"> + <Filter>Configs</Filter> + </None> <None Include="..\..\config\cache-query.xml"> <Filter>Configs</Filter> </None> + <None Include="..\..\config\cache-query-default.xml"> + <Filter>Configs</Filter> + </None> + <None Include="..\..\config\cache-query-continuous-32.xml"> + <Filter>Configs</Filter> + </None> + <None Include="..\..\config\cache-query-continuous.xml"> + <Filter>Configs</Filter> + </None> + <None Include="..\..\config\cache-query-continuous-default.xml"> + <Filter>Configs</Filter> + </None> <None Include="..\..\config\invalid.xml"> <Filter>Configs</Filter> </None> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/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 abb374a..3a91c0e 100644 --- a/modules/platforms/cpp/core-test/src/cache_query_test.cpp +++ b/modules/platforms/cpp/core-test/src/cache_query_test.cpp @@ -591,7 +591,11 @@ struct CacheQueryTestSuiteFixture { Ignite StartNode(const char* name) { +#ifdef IGNITE_TESTS_32 + return ignite_test::StartNode("cache-query-32.xml", name); +#else return ignite_test::StartNode("cache-query.xml", name); +#endif } void CheckFieldsQueryPages(int32_t pageSize, int32_t pagesNum, int32_t additionalNum) http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/src/cache_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/cache_test.cpp b/modules/platforms/cpp/core-test/src/cache_test.cpp index 437ed234..aa3ac8e 100644 --- a/modules/platforms/cpp/core-test/src/cache_test.cpp +++ b/modules/platforms/cpp/core-test/src/cache_test.cpp @@ -94,8 +94,13 @@ struct CacheTestSuiteFixture { */ CacheTestSuiteFixture() { +#ifdef IGNITE_TESTS_32 + grid0 = ignite_test::StartNode("cache-test-32.xml", "grid-0"); + grid1 = ignite_test::StartNode("cache-test-32.xml", "grid-1"); +#else grid0 = ignite_test::StartNode("cache-test.xml", "grid-0"); grid1 = ignite_test::StartNode("cache-test.xml", "grid-1"); +#endif } /* http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/src/continuous_query_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp index 1be21c1..d730ae9 100644 --- a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp +++ b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp @@ -245,7 +245,11 @@ struct ContinuousQueryTestSuiteFixture * Constructor. */ ContinuousQueryTestSuiteFixture() : +#ifdef IGNITE_TESTS_32 + grid(ignite_test::StartNode("cache-query-continuous-32.xml", "node-01")), +#else grid(ignite_test::StartNode("cache-query-continuous.xml", "node-01")), +#endif cache(grid.GetCache<int, TestEntry>("transactional_no_backup")) { // No-op. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/src/ignition_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/ignition_test.cpp b/modules/platforms/cpp/core-test/src/ignition_test.cpp index 52a51d0..b1ffa0a 100644 --- a/modules/platforms/cpp/core-test/src/ignition_test.cpp +++ b/modules/platforms/cpp/core-test/src/ignition_test.cpp @@ -34,7 +34,11 @@ BOOST_AUTO_TEST_CASE(TestIgnition) { IgniteConfiguration cfg; +#ifdef IGNITE_TESTS_32 + ignite_test::InitConfig(cfg, "cache-test-32.xml"); +#else ignite_test::InitConfig(cfg, "cache-test.xml"); +#endif IgniteError err; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/src/interop_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/interop_test.cpp b/modules/platforms/cpp/core-test/src/interop_test.cpp index b76d030..ac1f428 100644 --- a/modules/platforms/cpp/core-test/src/interop_test.cpp +++ b/modules/platforms/cpp/core-test/src/interop_test.cpp @@ -89,7 +89,11 @@ BOOST_AUTO_TEST_CASE(StringUtfInvalidCodePoint) BOOST_AUTO_TEST_CASE(StringUtfValid4ByteCodePoint) { +#ifdef IGNITE_TESTS_32 + Ignite ignite = ignite_test::StartNode("cache-test-32.xml"); +#else Ignite ignite = ignite_test::StartNode("cache-test.xml"); +#endif Cache<std::string, std::string> cache = ignite.CreateCache<std::string, std::string>("Test"); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/core-test/src/transactions_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/core-test/src/transactions_test.cpp b/modules/platforms/cpp/core-test/src/transactions_test.cpp index 3bf1ac6..0032412 100644 --- a/modules/platforms/cpp/core-test/src/transactions_test.cpp +++ b/modules/platforms/cpp/core-test/src/transactions_test.cpp @@ -40,7 +40,11 @@ struct TransactionsTestSuiteFixture { */ TransactionsTestSuiteFixture() { +#ifdef IGNITE_TESTS_32 + grid = ignite_test::StartNode("cache-test-32.xml", "txTest"); +#else grid = ignite_test::StartNode("cache-test.xml", "txTest"); +#endif } /* http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/config/queries-test-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml new file mode 100644 index 0000000..dd7cfb6 --- /dev/null +++ b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd";> + + <!-- Imports no-ODBC Ignite configuration --> + <import resource="queries-test-default.xml"/> + + <bean parent="queries.cfg"> + <property name="memoryConfiguration"> + <bean class="org.apache.ignite.configuration.MemoryConfiguration"> + <property name="systemCacheMemorySize" value="41943040"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> + + <property name="memoryPolicies"> + <list> + <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration"> + <property name="name" value="dfltPlc"/> + <property name="size" value="103833600"/> + </bean> + </list> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/config/queries-test-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-default.xml b/modules/platforms/cpp/odbc-test/config/queries-test-default.xml new file mode 100644 index 0000000..c157695 --- /dev/null +++ b/modules/platforms/cpp/odbc-test/config/queries-test-default.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd";> + + <!-- Imports no-ODBC Ignite configuration --> + <import resource="queries-default.xml"/> + + <bean abstract="true" id="queries.cfg" parent="ignite.cfg"> + <!-- Enabling ODBC. --> + <property name="odbcConfiguration"> + <bean class="org.apache.ignite.configuration.OdbcConfiguration"> + <property name="endpointAddress" value="127.0.0.1:11110"/> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml new file mode 100644 index 0000000..8060107 --- /dev/null +++ b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd";> + + <!-- Imports no-ODBC Ignite configuration --> + <import resource="queries-default.xml"/> + + <bean parent="ignite.cfg"> + <property name="memoryConfiguration"> + <bean class="org.apache.ignite.configuration.MemoryConfiguration"> + <property name="systemCacheMemorySize" value="41943040"/> + <property name="defaultMemoryPolicyName" value="dfltPlc"/> + + <property name="memoryPolicies"> + <list> + <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration"> + <property name="name" value="dfltPlc"/> + <property name="size" value="103833600"/> + </bean> + </list> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/config/queries-test.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test.xml b/modules/platforms/cpp/odbc-test/config/queries-test.xml index d08d4f1..882eb1e 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test.xml @@ -25,14 +25,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <!-- Imports no-ODBC Ignite configuration --> - <import resource="queries-default.xml"/> + <import resource="queries-test-default.xml"/> - <bean parent="ignite.cfg"> - <!-- Enabling ODBC. --> - <property name="odbcConfiguration"> - <bean class="org.apache.ignite.configuration.OdbcConfiguration"> - <property name="endpointAddress" value="127.0.0.1:11110"/> - </bean> - </property> - </bean> + <bean parent="queries.cfg"/> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj index 0f467f7..7e9c738 100644 --- a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj +++ b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj @@ -209,7 +209,10 @@ </ItemGroup> <ItemGroup> <None Include="..\..\config\queries-default.xml" /> + <None Include="..\..\config\queries-test-noodbc-32.xml" /> <None Include="..\..\config\queries-test-noodbc.xml" /> + <None Include="..\..\config\queries-test-default.xml" /> + <None Include="..\..\config\queries-test-32.xml" /> <None Include="..\..\config\queries-test.xml" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters index a4d3292..6efc4b4 100644 --- a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters +++ b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters @@ -137,9 +137,15 @@ </ClInclude> </ItemGroup> <ItemGroup> + <None Include="..\..\config\queries-test-32.xml"> + <Filter>Configs</Filter> + </None> <None Include="..\..\config\queries-test.xml"> <Filter>Configs</Filter> </None> + <None Include="..\..\config\queries-test-noodbc-32.xml"> + <Filter>Configs</Filter> + </None> <None Include="..\..\config\queries-test-noodbc.xml"> <Filter>Configs</Filter> </None> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp index c0c68bf..3681ea1 100644 --- a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp +++ b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp @@ -114,7 +114,15 @@ struct ApiRobustnessTestSuiteFixture static Ignite StartAdditionalNode(const char* name) { - return StartNode("queries-test-noodbc.xml", name); + const char* config = NULL; + +#ifdef IGNITE_TESTS_32 + config = "queries-test-noodbc-32.xml"; +#else + config = "queries-test-noodbc.xml"; +#endif + + return StartNode(config, name); } /** @@ -126,7 +134,15 @@ struct ApiRobustnessTestSuiteFixture dbc(NULL), stmt(NULL) { - grid = StartNode("queries-test.xml", "NodeMain"); + const char* config = NULL; + +#ifdef IGNITE_TESTS_32 + config = "queries-test-32.xml"; +#else + config = "queries-test.xml"; +#endif + + grid = StartNode(config, "NodeMain"); testCache = grid.GetCache<int64_t, TestType>("cache"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/src/queries_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/src/queries_test.cpp b/modules/platforms/cpp/odbc-test/src/queries_test.cpp index 99f2994..eb0904f 100644 --- a/modules/platforms/cpp/odbc-test/src/queries_test.cpp +++ b/modules/platforms/cpp/odbc-test/src/queries_test.cpp @@ -116,7 +116,11 @@ struct QueriesTestSuiteFixture static Ignite StartAdditionalNode(const char* name) { +#ifdef IGNITE_TESTS_32 + return StartNode("queries-test-noodbc-32.xml", name); +#else return StartNode("queries-test-noodbc.xml", name); +#endif } /** @@ -129,7 +133,11 @@ struct QueriesTestSuiteFixture dbc(NULL), stmt(NULL) { +#ifdef IGNITE_TESTS_32 + grid = StartNode("queries-test-32.xml", "NodeMain"); +#else grid = StartNode("queries-test.xml", "NodeMain"); +#endif cache1 = grid.GetCache<int64_t, TestType>("cache"); cache2 = grid.GetCache<int64_t, ComplexType>("cache2"); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ac0fd0c/modules/platforms/cpp/odbc-test/src/sql_test_suite_fixture.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/src/sql_test_suite_fixture.cpp b/modules/platforms/cpp/odbc-test/src/sql_test_suite_fixture.cpp index 03e4396..0f82fd0 100644 --- a/modules/platforms/cpp/odbc-test/src/sql_test_suite_fixture.cpp +++ b/modules/platforms/cpp/odbc-test/src/sql_test_suite_fixture.cpp @@ -29,7 +29,11 @@ namespace ignite dbc(NULL), stmt(NULL) { +#ifdef IGNITE_TESTS_32 + grid = StartNode("queries-test-32.xml"); +#else grid = StartNode("queries-test.xml"); +#endif testCache = grid.GetCache<int64_t, TestType>("cache"); @@ -306,7 +310,7 @@ namespace ignite Date actual = common::MakeDateGmt(res.year, res.month, res.day); BOOST_REQUIRE_EQUAL(actual.GetSeconds(), expected.GetSeconds()); } - + template<> void SqlTestSuiteFixture::CheckSingleResult<Timestamp>(const char* request, const Timestamp& expected) {
