[8/8] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 # Conflicts: # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af98efd5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af98efd5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af98efd5 Branch: refs/heads/ignite-2.0 Commit: af98efd5487dc2f6177b245d3d4c369f8ec4fe81 Parents: aa46bc7 0726d32 Author: devozerov Authored: Mon Feb 6 17:55:58 2017 +0300 Committer: devozerov Committed: Mon Feb 6 17:55:58 2017 +0300 -- assembly/LICENSE_FABRIC | 35 +++-- assembly/LICENSE_HADOOP | 17 ++- examples/schema-import/bin/h2-server.bat| 2 +- examples/schema-import/bin/h2-server.sh | 4 +- .../schema-import/bin/schema-import.properties | 2 +- .../src/main/resources/META-INF/licenses.txt.vm | 7 +- .../apache/ignite/IgniteSystemProperties.java | 8 ++ .../ignite/lang/IgniteProductVersion.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 8 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteSqlEntryCacheModeAgnosticTest.java| 140 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../Cache/CacheAbstractTransactionalTest.cs | 105 +++--- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 +- .../views/templates/agent-download.jade | 2 +- modules/web-console/web-agent/README.txt| 2 +- .../cache/IgnitePutRemoveBenchmark.java | 42 ++ .../cache/IgnitePutRemoveTxBenchmark.java | 30 18 files changed, 323 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/af98efd5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/af98efd5/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java -- diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 49fb269,d85e111..ed3d1e8 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@@ -95,7 -95,7 +95,8 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.query.IgniteCacheQueryCacheDestroySelfTest; import org.apache.ignite.internal.processors.cache.query.IndexingSpiQuerySelfTest; import org.apache.ignite.internal.processors.cache.query.IndexingSpiQueryTxSelfTest; +import org.apache.ignite.internal.processors.query.IgniteSqlQueryDedicatedPoolTest; + import org.apache.ignite.internal.processors.query.IgniteSqlEntryCacheModeAgnosticTest; import org.apache.ignite.internal.processors.query.IgniteSqlSchemaIndexingTest; import org.apache.ignite.internal.processors.query.IgniteSqlSplitterSelfTest; import org.apache.ignite.internal.processors.query.h2.GridH2IndexRebuildTest; @@@ -241,7 -241,7 +242,8 @@@ public class IgniteCacheQuerySelfTestSu suite.addTestSuite(CacheOffheapBatchIndexingSingleTypeTest.class); suite.addTestSuite(CacheSqlQueryValueCopySelfTest.class); suite.addTestSuite(IgniteCacheQueryCacheDestroySelfTest.class); +suite.addTestSuite(IgniteSqlQueryDedicatedPoolTest.class); + suite.addTestSuite(IgniteSqlEntryCacheModeAgnosticTest.class); return suite; }
[8/8] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e08b6ff4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e08b6ff4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e08b6ff4 Branch: refs/heads/ignite-2.0 Commit: e08b6ff48916edfab2dbd5d62092be5a1f819a2f Parents: f136542 664dc88 Author: Pavel Tupitsyn Authored: Thu Jan 19 13:34:59 2017 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 19 13:34:59 2017 +0300 -- .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 37 ++- .../TcpDiscoveryS3IpFinderAbstractSelfTest.java | 84 ++ ...3IpFinderAwsCredentialsProviderSelfTest.java | 46 +++ ...scoveryS3IpFinderAwsCredentialsSelfTest.java | 45 +++ .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 79 - .../ignite/testsuites/IgniteS3TestSuite.java| 26 +- .../cache/query/GridCacheQueryAdapter.java | 8 + .../internal/processors/odbc/IgniteTypes.java | 69 + .../internal/processors/odbc/OdbcTypes.java | 131 .../internal/processors/odbc/OdbcUtils.java | 85 ++ .../processors/odbc/escape/OdbcEscapeUtils.java | 52 +++- .../utils/PlatformConfigurationUtils.java | 128 +++- .../IgniteCacheQueryCacheDestroySelfTest.java | 142 + .../odbc/OdbcEscapeSequenceSelfTest.java| 131 .../hadoop/impl/v2/HadoopV2TaskContext.java | 7 - .../IgniteCacheQuerySelfTestSuite.java | 2 + .../cpp/binary/src/impl/binary/binary_utils.cpp | 6 +- .../cpp/common/include/ignite/common/utils.h| 8 + .../cpp/common/os/linux/src/common/utils.cpp| 22 +- .../cpp/common/os/win/src/common/utils.cpp | 14 +- modules/platforms/cpp/odbc-test/Makefile.am | 1 + .../odbc-test/include/sql_test_suite_fixture.h | 13 + .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 + .../project/vs/odbc-test.vcxproj.filters| 3 + .../cpp/odbc-test/src/api_robustness_test.cpp | 2 +- .../src/sql_aggregate_functions_test.cpp| 4 +- .../src/sql_esc_convert_function_test.cpp | 160 ++ .../odbc-test/src/sql_test_suite_fixture.cpp| 52 +++- .../cpp/odbc-test/src/sql_types_test.cpp| 131 +++- .../odbc/src/app/application_data_buffer.cpp| 58 +++- .../platforms/cpp/odbc/src/app/parameter.cpp| 4 +- .../cpp/odbc/src/config/connection_info.cpp | 260 ++-- .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 159 ++ .../BinaryBuilderSelfTestArrayIdentity.cs | 34 +++ .../Binary/BinaryEqualityComparerTest.cs| 279 + .../Binary/IO/BinaryStreamsTest.cs | 19 ++ .../Cache/CacheConfigurationTest.cs | 5 +- .../Cache/Query/CacheDmlQueriesTest.cs | 296 +++ .../IgniteConfigurationSerializerTest.cs| 46 ++- .../IgniteConfigurationTest.cs | 28 ++ .../Apache.Ignite.Core.csproj | 5 + .../Binary/BinaryArrayEqualityComparer.cs | 149 ++ .../Binary/BinaryConfiguration.cs | 24 ++ .../Binary/BinaryTypeConfiguration.cs | 14 + .../Cache/Configuration/QueryEntity.cs | 33 ++- .../Cache/Configuration/QueryField.cs | 6 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 85 -- .../IgniteConfigurationSection.xsd | 19 ++ .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 28 +- .../Binary/BinaryEqualityComparerSerializer.cs | 99 +++ .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 + .../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +- .../Impl/Binary/BinaryObject.cs | 31 +- .../Impl/Binary/BinaryObjectBuilder.cs | 62 +++- .../Impl/Binary/BinaryObjectHeader.cs | 21 +- .../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 ++ .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 6 +- .../Impl/Binary/BinaryWriter.cs | 11 +- .../Impl/Binary/DateTimeHolder.cs | 35 ++- .../Impl/Binary/IBinaryEqualityComparer.cs | 53 .../Impl/Binary/IBinaryTypeDescriptor.cs| 5 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Io/BinaryStreamBase.cs | 13 + .../Impl/Binary/Io/IBinaryStream.cs | 11 +- .../Impl/Binary/Io/IBinaryStreamProcessor.cs| 36 +++ .../Impl/Binary/Marshaller.cs | 22 +- .../Impl/Binary/SerializableObjectHolder.cs | 16 + .../Common/IgniteConfigurationXmlSerializer.cs | 5 +- .../Impl/Memory/PlatformMemoryStream.cs | 16 + 71 files changed, 3390 insertions(+), 291 deletions(-) -- http://g
[8/8] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e73d022 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e73d022 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e73d022 Branch: refs/heads/ignite-2.0 Commit: 7e73d0223a3f09cbe0b7094a2c04bdf9d63ca9be Parents: c5882a8 06ef846 Author: devozerov Authored: Wed Dec 28 12:54:47 2016 +0300 Committer: devozerov Committed: Wed Dec 28 12:54:47 2016 +0300 -- modules/platforms/cpp/binary/Makefile.am| 2 +- .../ignite/impl/binary/binary_type_manager.h| 2 +- .../src/impl/binary/binary_type_manager.cpp | 6 +- .../binary/src/impl/interop/interop_memory.cpp | 2 +- modules/platforms/cpp/common/Makefile.am| 2 +- .../include/ignite/common/dynamic_size_array.h | 2 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel | 2 +- modules/platforms/cpp/core-test/Makefile.am | 2 +- .../cpp/core-test/src/cache_query_test.cpp | 8 +- .../cpp/core-test/src/reference_test.cpp| 14 +- modules/platforms/cpp/core/Makefile.am | 2 +- .../cache/query/continuous/continuous_query.h | 8 +- .../include/ignite/cache/query/query_cursor.h | 4 +- .../query/continuous/continuous_query_impl.h| 8 +- .../core/include/ignite/impl/handle_registry.h | 2 +- .../cpp/core/include/ignite/impl/operations.h | 4 +- .../cpp/core/src/impl/cache/cache_impl.cpp | 5 +- .../cpp/core/src/impl/handle_registry.cpp | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- .../cpp/examples/odbc-example/Makefile.am | 2 +- .../cpp/examples/putget-example/Makefile.am | 2 +- .../cpp/examples/query-example/Makefile.am | 2 +- modules/platforms/cpp/ignite/Makefile.am| 2 +- modules/platforms/cpp/jni/Makefile.am | 2 +- modules/platforms/cpp/jni/src/java.cpp | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 2 +- .../cpp/odbc-test/config/queries-default.xml| 1 + .../odbc-test/include/sql_test_suite_fixture.h | 3 + .../platforms/cpp/odbc-test/include/test_type.h | 20 +- .../platforms/cpp/odbc-test/src/column_test.cpp | 189 +++ .../odbc-test/src/sql_test_suite_fixture.cpp| 17 ++ .../cpp/odbc-test/src/sql_types_test.cpp| 131 + modules/platforms/cpp/odbc/Makefile.am | 2 +- .../cpp/odbc/include/ignite/odbc/utility.h | 9 +- .../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- .../cpp/odbc/install/ignite-odbc-x86.wxs| 2 +- modules/platforms/cpp/odbc/src/column.cpp | 28 ++- .../cpp/odbc/src/config/connection_info.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 2 + modules/platforms/cpp/odbc/src/odbc.cpp | 5 +- modules/platforms/cpp/odbc/src/utility.cpp | 15 ++ .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Examples/Example.cs | 5 +- .../Examples/ExamplesTest.cs| 107 --- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 26 ++- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../examples/Apache.Ignite.Examples/App.config | 2 + .../DataStructures/AtomicSequenceExample.cs | 26 +-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 62 files changed, 612 insertions(+), 141 deletions(-) --
