You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/11 12:15:56 UTC
[1/4] ignite git commit: Configs for Win32 platform tests,
tests code changes to employ new configs
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 2a6afe528 -> 7eb1234cb
Configs for Win32 platform tests, tests code changes to employ new configs
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8daada7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8daada7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8daada7b
Branch: refs/heads/ignite-3477-master
Commit: 8daada7b4cbaebfffa538047f9710436ec1f390d
Parents: 6e67866
Author: Sergey Chugunov <se...@gmail.com>
Authored: Mon Apr 10 18:01:57 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Tue Apr 11 13:06:25 2017 +0300
----------------------------------------------------------------------
.../cpp/core-test/config/cache-identity-32.xml | 50 ++++++
.../core-test/config/cache-identity-default.xml | 154 +++++++++++++++++++
.../cpp/core-test/config/cache-identity.xml | 124 +--------------
.../cpp/core-test/config/cache-store-32.xml | 50 ++++++
.../core-test/config/cache-store-default.xml | 71 +++++++++
.../cpp/core-test/config/cache-store.xml | 41 +----
.../cpp/core-test/project/vs/core-test.vcxproj | 8 +
.../project/vs/core-test.vcxproj.filters | 12 ++
.../src/binary_identity_resolver_test.cpp | 8 +
.../cpp/core-test/src/binary_object_test.cpp | 8 +
.../cpp/core-test/src/cache_invoke_test.cpp | 4 +
.../cpp/core-test/src/cache_store_test.cpp | 11 +-
.../cpp/core-test/src/cluster_test.cpp | 4 +
.../cpp/core-test/src/continuous_query_test.cpp | 5 +
14 files changed, 388 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity-32.xml b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
new file mode 100644
index 0000000..4a8a68f
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-identity-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-identity-default.xml"/>
+
+ <bean parent="grid.cfg">
+ <property name="memoryConfiguration">
+ <bean class="org.apache.ignite.configuration.MemoryConfiguration">
+ <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/>
+ <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="#{100 * 1024 * 1024}"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity-default.xml b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
new file mode 100644
index 0000000..a73d0bb
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
@@ -0,0 +1,154 @@
+<?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="cache1"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <!-- Configure type metadata to enable queries. -->
+ <property name="queryEntities">
+ <list>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="CompositeKey"/>
+ <property name="valueType" value="java.lang.Integer"/>
+
+ <property name="fields">
+ <map>
+ <entry key="str" value="java.lang.String"/>
+ <entry key="ts" value="java.sql.Timestamp"/>
+ <entry key="guid" value="java.util.UUID"/>
+ </map>
+ </property>
+
+ <property name="keyFields">
+ <list>
+ <value>str</value>
+ <value>ts</value>
+ <value>guid</value>
+ </list>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="cache2"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <!-- Configure type metadata to enable queries. -->
+ <property name="queryEntities">
+ <list>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="CompositeKeySimple"/>
+ <property name="valueType" value="java.lang.Integer"/>
+
+ <property name="fields">
+ <map>
+ <entry key="str" value="java.lang.String"/>
+ <entry key="ts" value="java.sql.Timestamp"/>
+ <entry key="i64" value="java.lang.Long"/>
+ </map>
+ </property>
+
+ <property name="keyFields">
+ <list>
+ <value>str</value>
+ <value>ts</value>
+ <value>i64</value>
+ </list>
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="cache3"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <!-- Configure type metadata to enable queries. -->
+ <property name="queryEntities">
+ <list>
+ <bean class="org.apache.ignite.cache.QueryEntity">
+ <property name="keyType" value="ComplexType2"/>
+ <property name="valueType" value="java.lang.Integer"/>
+
+ <property name="fields">
+ <map>
+ <entry key="i32Field" value="java.lang.Integer"/>
+ <entry key="objField" value="InnerObject"/>
+ <entry key="strField" value="java.lang.String"/>
+ </map>
+ </property>
+
+ <property name="keyFields">
+ <list>
+ <value>i32Field</value>
+ <value>objField</value>
+ <value>strField</value>
+ </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/8daada7b/modules/platforms/cpp/core-test/config/cache-identity.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity.xml b/modules/platforms/cpp/core-test/config/cache-identity.xml
index c4e0b1b..67bb9e9 100644
--- a/modules/platforms/cpp/core-test/config/cache-identity.xml
+++ b/modules/platforms/cpp/core-test/config/cache-identity.xml
@@ -28,127 +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-identity-default.xml"/>
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="cache1"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <!-- Configure type metadata to enable queries. -->
- <property name="queryEntities">
- <list>
- <bean class="org.apache.ignite.cache.QueryEntity">
- <property name="keyType" value="CompositeKey"/>
- <property name="valueType" value="java.lang.Integer"/>
-
- <property name="fields">
- <map>
- <entry key="str" value="java.lang.String"/>
- <entry key="ts" value="java.sql.Timestamp"/>
- <entry key="guid" value="java.util.UUID"/>
- </map>
- </property>
-
- <property name="keyFields">
- <list>
- <value>str</value>
- <value>ts</value>
- <value>guid</value>
- </list>
- </property>
- </bean>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="cache2"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <!-- Configure type metadata to enable queries. -->
- <property name="queryEntities">
- <list>
- <bean class="org.apache.ignite.cache.QueryEntity">
- <property name="keyType" value="CompositeKeySimple"/>
- <property name="valueType" value="java.lang.Integer"/>
-
- <property name="fields">
- <map>
- <entry key="str" value="java.lang.String"/>
- <entry key="ts" value="java.sql.Timestamp"/>
- <entry key="i64" value="java.lang.Long"/>
- </map>
- </property>
-
- <property name="keyFields">
- <list>
- <value>str</value>
- <value>ts</value>
- <value>i64</value>
- </list>
- </property>
- </bean>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="cache3"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <!-- Configure type metadata to enable queries. -->
- <property name="queryEntities">
- <list>
- <bean class="org.apache.ignite.cache.QueryEntity">
- <property name="keyType" value="ComplexType2"/>
- <property name="valueType" value="java.lang.Integer"/>
-
- <property name="fields">
- <map>
- <entry key="i32Field" value="java.lang.Integer"/>
- <entry key="objField" value="InnerObject"/>
- <entry key="strField" value="java.lang.String"/>
- </map>
- </property>
-
- <property name="keyFields">
- <list>
- <value>i32Field</value>
- <value>objField</value>
- <value>strField</value>
- </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/8daada7b/modules/platforms/cpp/core-test/config/cache-store-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store-32.xml b/modules/platforms/cpp/core-test/config/cache-store-32.xml
new file mode 100644
index 0000000..f2b6682
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-store-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-store-default.xml"/>
+
+ <bean parent="grid.cfg">
+ <property name="memoryConfiguration">
+ <bean class="org.apache.ignite.configuration.MemoryConfiguration">
+ <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/>
+ <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="#{100 * 1024 * 1024}"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-store-default.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store-default.xml b/modules/platforms/cpp/core-test/config/cache-store-default.xml
new file mode 100644
index 0000000..06baa7e
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-store-default.xml
@@ -0,0 +1,71 @@
+<?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="cache1"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="cacheStoreFactory">
+ <bean class="org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy.MapStoreFactory"/>
+ </property>
+
+ <property name="writeBehindEnabled" value="false"/>
+
+ <property name="readThrough" value="false"/>
+ <property name="writeThrough" value="true"/>
+ </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/8daada7b/modules/platforms/cpp/core-test/config/cache-store.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store.xml b/modules/platforms/cpp/core-test/config/cache-store.xml
index 94c7ddd..8669631 100644
--- a/modules/platforms/cpp/core-test/config/cache-store.xml
+++ b/modules/platforms/cpp/core-test/config/cache-store.xml
@@ -28,44 +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-store-default.xml"/>
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="cache1"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="cacheStoreFactory">
- <bean class="org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy.MapStoreFactory"/>
- </property>
-
- <property name="writeBehindEnabled" value="false"/>
-
- <property name="readThrough" value="false"/>
- <property name="writeThrough" value="true"/>
- </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/8daada7b/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 d97f917..5d97d20 100644
--- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
+++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
@@ -34,14 +34,22 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\config\cache-identity.xml" />
+ <None Include="..\..\config\cache-identity-32.xml" />
+ <None Include="..\..\config\cache-identity-default.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-default.xml">
+ <SubType>Designer</SubType>
+ </None>
<None Include="..\..\config\cache-store.xml">
<SubType>Designer</SubType>
</None>
+ <None Include="..\..\config\cache-store-32.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" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/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 933118f..08652d9 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
@@ -157,12 +157,24 @@
<None Include="..\..\config\cache-identity.xml">
<Filter>Configs</Filter>
</None>
+ <None Include="..\..\config\cache-identity-32.xml">
+ <Filter>Configs</Filter>
+ </None>
+ <None Include="..\..\config\cache-identity-default.xml">
+ <Filter>Configs</Filter>
+ </None>
<None Include="..\..\config\cache-query-continuous.xml">
<Filter>Configs</Filter>
</None>
+ <None Include="..\..\config\cache-store-default.xml">
+ <Filter>Configs</Filter>
+ </None>
<None Include="..\..\config\cache-store.xml">
<Filter>Configs</Filter>
</None>
+ <None Include="..\..\config\cache-store-32.xml">
+ <Filter>Configs</Filter>
+ </None>
<None Include="..\..\config\cache-query-continuous.xml">
<Filter>Configs</Filter>
</None>
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
index b6831c3..62f37f9 100644
--- a/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
@@ -298,7 +298,11 @@ BOOST_AUTO_TEST_CASE(GetDataHashCode)
BOOST_AUTO_TEST_CASE(IdentityEquilityWithGuid)
{
+#ifdef IGNITE_TESTS_32
+ Ignite grid = ignite_test::StartNode("cache-identity-32.xml");
+#else
Ignite grid = ignite_test::StartNode("cache-identity.xml");
+#endif
CompositeKey key("Key String", Timestamp(123851, 562304134), Guid(0x4A950C6206FE4502, 0xAC06145097E56F02));
int32_t value = 12321;
@@ -321,7 +325,11 @@ BOOST_AUTO_TEST_CASE(IdentityEquilityWithGuid)
BOOST_AUTO_TEST_CASE(IdentityEquilityWithoutGuid)
{
+#ifdef IGNITE_TESTS_32
+ Ignite grid = ignite_test::StartNode("cache-identity-32.xml");
+#else
Ignite grid = ignite_test::StartNode("cache-identity.xml");
+#endif
CompositeKeySimple key("Lorem ipsum", Timestamp(112460, 163002155), 1337);
int32_t value = 42;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_object_test.cpp b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
index bc30428..fa8878d 100644
--- a/modules/platforms/cpp/core-test/src/binary_object_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
@@ -328,7 +328,11 @@ BOOST_AUTO_TEST_CASE(RemoteSchemaRetrieval)
try
{
BOOST_CHECKPOINT("Node1 startup");
+#ifdef IGNITE_TESTS_32
+ Ignite node1 = ignite_test::StartNode("cache-test-32.xml", "node1");
+#else
Ignite node1 = ignite_test::StartNode("cache-test.xml", "node1");
+#endif
BOOST_CHECKPOINT("Creating cache");
cache::Cache<int32_t, BinaryFields> cache = node1.GetOrCreateCache<int32_t, BinaryFields>("cache");
@@ -339,7 +343,11 @@ BOOST_AUTO_TEST_CASE(RemoteSchemaRetrieval)
cache.Put(42, some);
BOOST_CHECKPOINT("Node2 startup");
+#ifdef IGNITE_TESTS_32
+ Ignite node2 = ignite_test::StartNode("cache-test-32.xml", "node2");
+#else
Ignite node2 = ignite_test::StartNode("cache-test.xml", "node2");
+#endif
impl::IgniteImpl* nodeImpl = impl::IgniteImpl::GetFromProxy(node2);
impl::IgniteEnvironment* env = nodeImpl->GetEnvironment();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
index f094d1c..73b419e 100644
--- a/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
@@ -396,7 +396,11 @@ struct CacheInvokeTestSuiteFixture
* Constructor.
*/
CacheInvokeTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+ node(ignite_test::StartNode("cache-query-32.xml", "InvokeTest"))
+#else
node(ignite_test::StartNode("cache-query.xml", "InvokeTest"))
+#endif
{
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cache_store_test.cpp b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
index f1b4630..396cad0 100644
--- a/modules/platforms/cpp/core-test/src/cache_store_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
@@ -41,8 +41,13 @@ struct CacheStoreTestSuiteFixture
/*
* Constructor.
*/
- CacheStoreTestSuiteFixture() :
+ CacheStoreTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+ node1(ignite_test::StartNode("cache-store-32.xml", "node1"))
+#else
node1(ignite_test::StartNode("cache-store.xml", "node1"))
+#endif
+
{
// No-op.
}
@@ -102,7 +107,11 @@ BOOST_AUTO_TEST_CASE(LoadCacheSingleNodeNoPredicate)
BOOST_AUTO_TEST_CASE(LoadCacheSeveralNodesNoPredicate)
{
BOOST_CHECKPOINT("Starting additional node");
+#ifdef IGNITE_TESTS_32
+ Ignite node2 = ignite_test::StartNode("cache-store-32.xml", "node2");
+#else
Ignite node2 = ignite_test::StartNode("cache-store.xml", "node2");
+#endif
const int64_t entriesNum = 100;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cluster_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cluster_test.cpp b/modules/platforms/cpp/core-test/src/cluster_test.cpp
index c681ca2..754fe7e 100644
--- a/modules/platforms/cpp/core-test/src/cluster_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cluster_test.cpp
@@ -40,7 +40,11 @@ struct ClusterTestSuiteFixture
* Constructor.
*/
ClusterTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+ node(ignite_test::StartNode("cache-test-32.xml", "ClusterTest"))
+#else
node(ignite_test::StartNode("cache-test.xml", "ClusterTest"))
+#endif
{
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/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 46ffc2f..e09b403 100644
--- a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
+++ b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
@@ -718,8 +718,13 @@ BOOST_AUTO_TEST_CASE(TestFilterSingleNode)
BOOST_AUTO_TEST_CASE(TestFilterMultipleNodes)
{
+#ifdef IGNITE_TESTS_32
+ Ignite node2 = ignite_test::StartNode("cache-query-continuous-32.xml", "node-02");
+ Ignite node3 = ignite_test::StartNode("cache-query-continuous-32.xml", "node-03");
+#else
Ignite node2 = ignite_test::StartNode("cache-query-continuous.xml", "node-02");
Ignite node3 = ignite_test::StartNode("cache-query-continuous.xml", "node-03");
+#endif
node.GetBinding().RegisterCacheEntryEventFilter< RangeFilter<int, TestEntry> >();
[4/4] ignite git commit: Merge branch 'ignite-3477-master' of
https://github.com/gridgain/apache-ignite into ignite-3477-master
Posted by ag...@apache.org.
Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7eb1234c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7eb1234c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7eb1234c
Branch: refs/heads/ignite-3477-master
Commit: 7eb1234cb4853baf21d06cb1b7643de98403f261
Parents: 2a6afe5 3e86c51
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 11 15:15:48 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 11 15:15:48 2017 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 15 +-
.../processors/query/h2/opt/GridH2Table.java | 15 +-
.../cpp/core-test/config/cache-identity-32.xml | 50 ++++++
.../core-test/config/cache-identity-default.xml | 154 +++++++++++++++++++
.../cpp/core-test/config/cache-identity.xml | 124 +--------------
.../cpp/core-test/config/cache-store-32.xml | 50 ++++++
.../core-test/config/cache-store-default.xml | 71 +++++++++
.../cpp/core-test/config/cache-store.xml | 41 +----
.../cpp/core-test/project/vs/core-test.vcxproj | 8 +
.../project/vs/core-test.vcxproj.filters | 12 ++
.../src/binary_identity_resolver_test.cpp | 8 +
.../cpp/core-test/src/binary_object_test.cpp | 8 +
.../cpp/core-test/src/cache_invoke_test.cpp | 4 +
.../cpp/core-test/src/cache_store_test.cpp | 11 +-
.../cpp/core-test/src/cluster_test.cpp | 4 +
.../cpp/core-test/src/continuous_query_test.cpp | 5 +
16 files changed, 409 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
[2/4] ignite git commit: Merge remote-tracking branch
'origin/ignite-3477-master' into ignite-3477-master
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/085c612c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/085c612c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/085c612c
Branch: refs/heads/ignite-3477-master
Commit: 085c612c66c2b568f9a658a06baa9907dddb9489
Parents: 8daada7 8122099
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Tue Apr 11 13:11:43 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Tue Apr 11 13:11:43 2017 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 3 -
assembly/dependencies-fabric-lgpl.xml | 3 -
assembly/dependencies-fabric.xml | 3 -
assembly/dependencies-schema-import.xml | 57 -
assembly/release-base.xml | 2 -
assembly/release-fabric-base.xml | 9 -
assembly/release-schema-import.xml | 50 -
bin/ignite-schema-import.bat | 110 -
bin/ignite-schema-import.sh | 87 -
examples/README-LGPL.txt | 4 +-
examples/README.txt | 2 -
examples/pom-standalone-lgpl.xml | 1 -
examples/pom-standalone.xml | 1 -
examples/pom.xml | 1 -
examples/schema-import/README.txt | 38 -
examples/schema-import/bin/db-init.sql | 28 -
examples/schema-import/bin/h2-server.bat | 80 -
examples/schema-import/bin/h2-server.sh | 66 -
.../schema-import/bin/schema-import.properties | 28 -
examples/schema-import/pom-standalone.xml | 90 -
examples/schema-import/pom.xml | 101 -
.../org/apache/ignite/schema/CacheConfig.java | 36 -
.../java/org/apache/ignite/schema/Demo.java | 134 --
.../java/org/apache/ignite/schema/DemoNode.java | 38 -
.../ignite/schema/H2DataSourceFactory.java | 35 -
.../java/org/apache/ignite/schema/Person.java | 44 -
.../org/apache/ignite/schema/PersonKey.java | 37 -
.../JettyRestProcessorAbstractSelfTest.java | 3 +-
.../org/apache/ignite/IgniteFileSystem.java | 26 +-
.../affinity/fair/FairAffinityFunction.java | 1159 ----------
.../cache/affinity/fair/package-info.java | 21 -
.../configuration/DataPageEvictionMode.java | 32 +
.../configuration/FileSystemConfiguration.java | 6 +-
.../configuration/IgniteConfiguration.java | 4 +-
.../MemoryPolicyConfiguration.java | 70 +
.../configuration/NearCacheConfiguration.java | 56 +-
.../ignite/internal/IgniteEventsImpl.java | 8 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 36 +-
.../eventstorage/GridEventStorageManager.java | 12 +-
.../ignite/internal/pagemem/PageSupport.java | 10 +
.../pagemem/impl/PageMemoryNoStoreImpl.java | 8 +
.../cache/CacheOffheapEvictionManager.java | 6 +-
.../processors/cache/GridCacheAdapter.java | 2 +
.../processors/cache/GridCacheAtomicFuture.java | 2 +-
.../cache/GridCacheConcurrentMapImpl.java | 32 +-
.../processors/cache/GridCacheEntryEx.java | 5 +-
.../cache/GridCacheEvictionManager.java | 61 +-
.../processors/cache/GridCacheMapEntry.java | 32 +-
.../processors/cache/GridCacheMvccManager.java | 84 +-
.../cache/GridDeferredAckMessageSender.java | 11 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 34 +-
.../processors/cache/database/CacheDataRow.java | 5 +
.../cache/database/CacheDataRowAdapter.java | 116 +-
.../IgniteCacheDatabaseSharedManager.java | 126 +-
.../processors/cache/database/MemoryPolicy.java | 19 +-
.../evict/FairFifoPageEvictionTracker.java | 74 +
.../database/evict/NoOpPageEvictionTracker.java | 50 +
.../evict/PageAbstractEvictionTracker.java | 243 ++
.../database/evict/PageEvictionTracker.java | 52 +
.../evict/Random2LruPageEvictionTracker.java | 180 ++
.../evict/RandomLruPageEvictionTracker.java | 157 ++
.../cache/database/freelist/FreeListImpl.java | 62 +-
.../cache/database/tree/io/DataPageIO.java | 110 +-
.../distributed/dht/GridDhtLocalPartition.java | 49 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 2 +
.../GridNearAtomicAbstractUpdateFuture.java | 2 +-
.../GridNearAtomicSingleUpdateFuture.java | 21 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 23 +-
.../cache/distributed/near/GridNearTxLocal.java | 2 +
.../distributed/near/GridNearTxRemote.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 6 +-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 7 -
.../IgniteCacheObjectProcessorImpl.java | 16 -
.../internal/processors/igfs/IgfsAsyncImpl.java | 8 +-
.../internal/processors/igfs/IgfsImpl.java | 20 +-
.../utils/PlatformConfigurationUtils.java | 68 +-
.../org/apache/ignite/internal/util/F0.java | 196 +-
.../ignite/internal/util/lang/GridFunc.java | 620 +----
.../visor/igfs/VisorIgfsFormatTask.java | 2 +-
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../deployment/local/LocalDeploymentSpi.java | 5 +-
.../spi/eventstorage/NoopEventStorageSpi.java | 53 +
.../test/config/store/jdbc/ignite-jdbc-type.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 20 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 12 +-
.../affinity/AffinityClientNodeSelfTest.java | 15 +-
.../affinity/AffinityHistoryCleanupTest.java | 3 +-
.../fair/FairAffinityDynamicCacheSelfTest.java | 86 -
...airAffinityFunctionBackupFilterSelfTest.java | 44 -
...ffinityFunctionExcludeNeighborsSelfTest.java | 31 -
.../fair/FairAffinityFunctionNodesSelfTest.java | 247 --
.../fair/FairAffinityFunctionSelfTest.java | 31 -
.../affinity/fair/FairAffinityNodesRestart.java | 130 --
.../local/LocalAffinityFunctionTest.java | 4 +-
.../cache/store/jdbc/model/Organization.java | 2 -
.../cache/store/jdbc/model/OrganizationKey.java | 2 -
.../ignite/cache/store/jdbc/model/Person.java | 2 -
.../store/jdbc/model/PersonComplexKey.java | 4 +-
.../cache/store/jdbc/model/PersonKey.java | 2 -
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 2 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +-
.../GridEventStorageDefaultExceptionTest.java | 94 +
...CacheExchangeMessageDuplicatedStateTest.java | 33 -
.../cache/CrossCacheTxRandomOperationsTest.java | 36 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../GridCacheVersionTopologyChangeTest.java | 5 -
.../IgniteClientAffinityAssignmentSelfTest.java | 20 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 3 -
...ObjectsAtomicNearDisabledOnheapSelfTest.java | 17 +
...dCacheBinaryObjectsAtomicOnheapSelfTest.java | 17 +
...tsPartitionedNearDisabledOnheapSelfTest.java | 17 +
...eBinaryObjectsPartitionedOnheapSelfTest.java | 17 +
...eLateAffinityAssignmentFairAffinityTest.java | 32 -
...teCacheClientNodePartitionsExchangeTest.java | 18 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 -
...arDisabledFairAffinityPutGetRestartTest.java | 35 -
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 10 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 -
.../AtomicPutAllChangingTopologyTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 -
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 -
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 -
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 -
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 -
...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 10 +
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 -
...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 -
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 -
.../paged/PageEvictionAbstractTest.java | 124 +
.../paged/PageEvictionMultinodeTest.java | 110 +
.../paged/PageEvictionReadThroughTest.java | 140 ++
.../paged/PageEvictionTouchOrderTest.java | 109 +
.../paged/PageEvictionWithRebalanceTest.java | 81 +
.../Random2LruPageEvictionMultinodeTest.java | 30 +
...Random2LruPageEvictionWithRebalanceTest.java | 30 +
.../RandomLruPageEvictionMultinodeTest.java | 30 +
.../RandomLruPageEvictionWithRebalanceTest.java | 30 +
.../cache/eviction/paged/TestObject.java | 78 +
...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 -
...omicFairAffinityMultiJvmFullApiSelfTest.java | 31 -
...bledFairAffinityMultiJvmFullApiSelfTest.java | 36 -
...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 -
...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 -
...onedFairAffinityMultiJvmFullApiSelfTest.java | 31 -
...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 -
.../database/FreeListImplSelfTest.java | 13 +-
...faultIgfsSecondaryFileSystemTestAdapter.java | 2 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 2 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 4 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 2 +-
.../igfs/IgfsMetaManagerSelfTest.java | 2 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 2 +-
.../internal/processors/igfs/IgfsMock.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 8 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 2 +-
.../processors/igfs/IgfsTaskSelfTest.java | 2 +-
.../IgfsAbstractRecordResolverSelfTest.java | 2 +-
.../configvariations/ConfigVariations.java | 2 -
.../testframework/junits/GridAbstractTest.java | 56 +-
.../IgniteCacheEvictionSelfTestSuite.java | 13 +
.../IgniteCacheFailoverTestSuite.java | 4 -
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 15 -
.../IgniteCacheFullApiSelfTestSuite.java | 24 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 9 +-
.../testsuites/IgniteCacheTestSuite2.java | 4 -
.../testsuites/IgniteCacheTestSuite5.java | 10 -
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../impl/HadoopTaskExecutionSelfTest.java | 2 +-
...opClientProtocolMultipleServersSelfTest.java | 2 +-
.../client/HadoopClientProtocolSelfTest.java | 2 +-
.../hadoop/impl/igfs/IgfsEventsTestSuite.java | 2 +-
.../cache/hibernate/HibernateCacheProxy.java | 2 +-
.../cache/hibernate/HibernateCacheProxy.java | 2 +-
.../processors/query/h2/opt/GridH2Row.java | 5 +
...QueryNodeRestartDistributedJoinSelfTest.java | 50 +-
modules/log4j2/pom.xml | 4 +-
.../ignite/logger/log4j2/Log4J2Logger.java | 23 +-
.../include/ignite/impl/binary/binary_utils.h | 1 -
.../ignite/impl/binary/binary_writer_impl.h | 5 +-
.../Apache.Ignite.Core.Tests/EventsTest.cs | 63 +-
.../IgniteConfigurationSerializerTest.cs | 13 +-
.../IgniteConfigurationTest.cs | 15 +-
.../Apache.Ignite.Core.csproj | 3 +
.../Events/IEventStorageSpi.cs | 33 +
.../Events/MemoryEventStorageSpi.cs | 100 +
.../Events/NoopEventStorageSpi.cs | 27 +
.../Apache.Ignite.Core/IgniteConfiguration.cs | 48 +-
.../IgniteConfigurationSection.xsd | 22 +
.../Plugin/IPluginConfiguration.cs | 4 +-
.../Datagrid/MultiTieredCacheExample.cs | 2 -
modules/schema-import-db/README.txt | 4 -
modules/schema-import-db/pom.xml | 55 -
.../apache/ignite/schema/parser/DbColumn.java | 88 -
.../ignite/schema/parser/DbMetadataReader.java | 147 --
.../apache/ignite/schema/parser/DbTable.java | 82 -
.../parser/dialect/DB2MetadataDialect.java | 33 -
.../parser/dialect/DatabaseMetadataDialect.java | 102 -
.../parser/dialect/JdbcMetadataDialect.java | 199 --
.../parser/dialect/MySQLMetadataDialect.java | 82 -
.../parser/dialect/OracleMetadataDialect.java | 360 ---
modules/schema-import/README.txt | 216 --
modules/schema-import/pom.xml | 119 -
.../main/java/media/data_connection_48x48.png | Bin 4443 -> 0 bytes
.../src/main/java/media/error_48x48.png | Bin 4349 -> 0 bytes
.../src/main/java/media/ignite_128x128.png | Bin 4917 -> 0 bytes
.../src/main/java/media/ignite_16x16.png | Bin 608 -> 0 bytes
.../src/main/java/media/ignite_24x24.png | Bin 930 -> 0 bytes
.../src/main/java/media/ignite_32x32.png | Bin 1203 -> 0 bytes
.../src/main/java/media/ignite_48x48.png | Bin 1868 -> 0 bytes
.../src/main/java/media/ignite_64x64.png | Bin 2453 -> 0 bytes
.../src/main/java/media/information_48x48.png | Bin 4102 -> 0 bytes
.../src/main/java/media/question_48x48.png | Bin 3857 -> 0 bytes
.../src/main/java/media/sign_warning_48x48.png | Bin 2988 -> 0 bytes
.../schema-import/src/main/java/media/style.css | 134 --
.../src/main/java/media/text_tree_48x48.png | Bin 2567 -> 0 bytes
.../ignite/schema/generator/CodeGenerator.java | 831 -------
.../ignite/schema/generator/GeneratorUtils.java | 70 -
.../ignite/schema/generator/XmlGenerator.java | 446 ----
.../ignite/schema/model/PojoDescriptor.java | 497 ----
.../apache/ignite/schema/model/PojoField.java | 461 ----
.../ignite/schema/model/SchemaDescriptor.java | 62 -
.../schema/parser/DatabaseMetadataParser.java | 115 -
.../ignite/schema/ui/ConfirmCallable.java | 83 -
.../org/apache/ignite/schema/ui/Controls.java | 697 ------
.../org/apache/ignite/schema/ui/GridPaneEx.java | 180 --
.../org/apache/ignite/schema/ui/MessageBox.java | 274 ---
.../apache/ignite/schema/ui/ModalDialog.java | 50 -
.../ignite/schema/ui/SchemaImportApp.java | 2115 ------------------
.../ignite/schema/ui/TextColumnValidator.java | 32 -
.../schema/test/AbstractSchemaImportTest.java | 181 --
.../test/generator/CodeGeneratorTest.java | 81 -
.../schema/test/generator/XmlGeneratorTest.java | 42 -
.../ignite/schema/test/model/CacheConfig.txt | 409 ----
.../apache/ignite/schema/test/model/Objects.txt | 531 -----
.../ignite/schema/test/model/ObjectsKey.txt | 96 -
.../ignite/schema/test/model/Primitives.txt | 535 -----
.../ignite/schema/test/model/PrimitivesKey.txt | 96 -
.../org/apache/ignite/schema/test/model/Tst.txt | 535 -----
.../apache/ignite/schema/test/model/TstKey.txt | 96 -
.../schema/test/model/ignite-type-metadata.xml | 666 ------
.../test/parser/DbMetadataParserTest.java | 134 --
.../testsuites/IgniteSchemaImportTestSuite.java | 42 -
.../ignite/internal/GridFactorySelfTest.java | 3 +
modules/web-console/web-agent/pom.xml | 12 -
.../ignite/console/agent/db/DbColumn.java | 88 +
.../console/agent/db/DbMetadataReader.java | 142 ++
.../apache/ignite/console/agent/db/DbTable.java | 82 +
.../agent/db/dialect/DB2MetadataDialect.java | 33 +
.../db/dialect/DatabaseMetadataDialect.java | 102 +
.../agent/db/dialect/JdbcMetadataDialect.java | 199 ++
.../agent/db/dialect/MySQLMetadataDialect.java | 82 +
.../agent/db/dialect/OracleMetadataDialect.java | 359 +++
.../agent/handlers/DatabaseListener.java | 20 +-
.../dml/IgniteSqlDeleteFilteredBenchmark.java | 5 +-
.../dml/IgniteSqlUpdateFilteredBenchmark.java | 5 +-
pom.xml | 121 -
263 files changed, 4234 insertions(+), 16090 deletions(-)
----------------------------------------------------------------------
[3/4] ignite git commit: HashIDX on client is allowed in case if
client is affinity node
Posted by ag...@apache.org.
HashIDX on client is allowed in case if client is affinity node
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e86c511
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e86c511
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e86c511
Branch: refs/heads/ignite-3477-master
Commit: 3e86c511b0aef0d4edc75e411be98c8b56b6b0a4
Parents: 085c612
Author: Sergey Chugunov <se...@gmail.com>
Authored: Thu Apr 6 19:21:07 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Tue Apr 11 14:38:26 2017 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 15 +++++++++------
.../processors/query/h2/opt/GridH2Table.java | 15 ++++++++++++---
2 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3e86c511/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 725e742..5f2d8c0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2868,11 +2868,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
int cacheId = CU.cacheId(schema.ccfg.getName());
- idxs.add(createHashIndex(
- cacheId,
- "_key_PK_hash",
- tbl,
- treeIndexColumns(new ArrayList<IndexColumn>(2), keyCol, affCol)));
+ Index hashIdx = createHashIndex(
+ cacheId,
+ "_key_PK_hash",
+ tbl,
+ treeIndexColumns(new ArrayList<IndexColumn>(2), keyCol, affCol));
+
+ if (hashIdx != null)
+ idxs.add(hashIdx);
// Add primary key index.
idxs.add(createSortedIndex(
@@ -3002,7 +3005,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
return pkHashIdx;
}
- return new GridH2TreeIndex(name, tbl, true, cols);
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3e86c511/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index 89a010d..94c8843 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -149,10 +149,13 @@ public class GridH2Table extends TableBase {
idxs = idxsFactory.createIndexes(this);
assert idxs != null;
- assert idxs.size() >= 2;
// Add scan index at 0 which is required by H2.
- idxs.add(0, new ScanIndex(index(1), index(0)));
+ if (idxs.size() >= 2
+ && index(0).getIndexType().isHash())
+ idxs.add(0, new ScanIndex(index(1), index(0)));
+ else
+ idxs.add(0, new ScanIndex(index(0), null));
snapshotEnabled = desc == null || desc.snapshotableIndex();
@@ -927,7 +930,13 @@ public class GridH2Table extends TableBase {
*
*/
@Override protected GridH2IndexBase delegate() {
- return rebuildFromHashInProgress ? hashIdx : super.delegate();
+ if (hashIdx != null)
+ return rebuildFromHashInProgress ? hashIdx : super.delegate();
+ else {
+ assert !rebuildFromHashInProgress;
+
+ return super.delegate();
+ }
}
/** {@inheritDoc} */