Merge remote-tracking branch 'remotes/origin/master' into ignite-3484
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41a1c571 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41a1c571 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41a1c571 Branch: refs/heads/ignite-3484 Commit: 41a1c571e6ba1765941e2f1679dc4ac1582275c4 Parents: e40b4d9 bacff9e Author: sboikov <[email protected]> Authored: Fri Sep 8 10:55:24 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 8 10:55:24 2017 +0300 ---------------------------------------------------------------------- examples/pom-standalone-lgpl.xml | 19 + examples/pom-standalone.xml | 19 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/benchmarks/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/cassandra/pom.xml | 2 +- modules/cassandra/serializers/pom.xml | 4 +- modules/cassandra/store/pom.xml | 4 +- modules/clients/pom.xml | 8 +- .../internal/jdbc2/JdbcMetadataSelfTest.java | 2 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 7 +- .../jdbc/thin/JdbcThinAbstractSelfTest.java | 71 +- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 1393 +++++++++++++++++- .../thin/JdbcThinPreparedStatementSelfTest.java | 261 +++- .../jdbc/thin/JdbcThinResultSetSelfTest.java | 1193 ++++++++++++++- .../jdbc/thin/JdbcThinStatementSelfTest.java | 719 ++++++++- modules/clients/src/test/keystore/ca/oneca.cnf | 16 + modules/clients/src/test/keystore/ca/twoca.cnf | 16 + modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../org/apache/ignite/internal/IgniteEx.java | 14 + .../apache/ignite/internal/IgniteKernal.java | 12 + .../ignite/internal/binary/BinaryContext.java | 14 + .../internal/jdbc/thin/JdbcThinConnection.java | 96 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 5 +- .../jdbc/thin/JdbcThinPreparedStatement.java | 25 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 576 +++++--- .../internal/jdbc/thin/JdbcThinStatement.java | 74 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 5 +- .../processors/cache/GridCacheProcessor.java | 8 + .../cache/GridCacheSharedContext.java | 20 + .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../dht/preloader/GridDhtPartitionDemander.java | 9 + .../cache/transactions/IgniteTxHandler.java | 12 +- .../odbc/SqlListenerConnectionContext.java | 5 +- .../processors/odbc/SqlListenerNioListener.java | 2 +- .../odbc/jdbc/JdbcConnectionContext.java | 61 +- .../odbc/odbc/OdbcConnectionContext.java | 61 +- .../processors/odbc/odbc/OdbcMessageParser.java | 4 +- .../odbc/odbc/OdbcQueryExecuteResult.java | 24 +- .../odbc/odbc/OdbcRequestHandler.java | 18 +- .../services/PlatformAbstractService.java | 8 + .../platform/services/PlatformServices.java | 64 +- .../platform/utils/PlatformUtils.java | 2 +- .../processors/query/GridQueryIndexing.java | 15 + .../processors/query/GridQueryProcessor.java | 132 +- .../internal/processors/query/QueryField.java | 64 + .../internal/processors/query/QuerySchema.java | 37 +- .../query/QueryTypeDescriptorImpl.java | 17 +- .../query/schema/SchemaOperationWorker.java | 2 +- .../SchemaAbstractAlterTableOperation.java | 39 + .../SchemaAlterTableAddColumnOperation.java | 96 ++ .../processors/task/GridTaskWorker.java | 22 +- .../internal/visor/query/VisorQueryTask.java | 1 + .../internal/visor/query/VisorQueryTaskArg.java | 41 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 21 + .../core/src/main/resources/ignite.properties | 2 +- .../cache/store/GridStoreLoadCacheTest.java | 120 ++ .../IgniteClientReconnectBinaryContexTest.java | 115 ++ .../cache/CacheRebalancingSelfTest.java | 88 +- ...IgniteClientCacheInitializationFailTest.java | 8 + .../processors/igfs/IgfsIgniteMock.java | 10 + .../junits/multijvm/IgniteProcessProxy.java | 10 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../IgniteClientReconnectTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/platform/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flink/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate-4.2/pom.xml | 2 +- modules/hibernate-5.1/pom.xml | 2 +- modules/hibernate-core/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/H2RowDescriptor.java | 105 +- .../processors/query/h2/H2TableEngine.java | 13 +- .../processors/query/h2/IgniteH2Indexing.java | 25 +- .../query/h2/ddl/DdlStatementsProcessor.java | 50 +- .../processors/query/h2/opt/GridH2Table.java | 55 +- .../h2/sql/GridSqlAlterTableAddColumn.java | 113 ++ .../query/h2/sql/GridSqlQueryParser.java | 160 +- ...ynamicColumnsAbstractConcurrentSelfTest.java | 1056 +++++++++++++ .../cache/index/DynamicColumnsAbstractTest.java | 311 ++++ ...umnsConcurrentAtomicPartitionedSelfTest.java | 33 + ...lumnsConcurrentAtomicReplicatedSelfTest.java | 33 + ...currentTransactionalPartitionedSelfTest.java | 33 + ...ncurrentTransactionalReplicatedSelfTest.java | 33 + .../H2DynamicColumnsAbstractBasicSelfTest.java | 348 +++++ .../H2DynamicColumnsClientBasicSelfTest.java | 28 + .../H2DynamicColumnsServerBasicSelfTest.java | 28 + ...icColumnsServerCoordinatorBasicSelfTest.java | 28 + .../query/h2/IgniteSqlBigIntegerKeyTest.java | 163 ++ .../query/h2/sql/GridQueryParsingTest.java | 92 +- .../IgniteCacheQuerySelfTestSuite.java | 8 + .../IgniteCacheQuerySelfTestSuite2.java | 9 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/kubernetes/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/ml/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- .../platforms/cpp/common/include/Makefile.am | 1 + .../cpp/common/include/ignite/common/lazy.h | 172 +++ .../cpp/common/include/ignite/common/utils.h | 51 + .../cpp/common/project/vs/common.vcxproj | 1 + .../common/project/vs/common.vcxproj.filters | 3 + .../platforms/cpp/core-test/config/invalid.xml | 39 + .../cpp/core-test/config/isolated-32.xml | 51 + .../cpp/core-test/config/isolated-default.xml | 59 + .../platforms/cpp/core-test/config/isolated.xml | 32 + .../core-test/config/persistence-store-32.xml | 51 + .../config/persistence-store-default.xml | 36 + .../cpp/core-test/config/persistence-store.xml | 32 + .../cpp/core-test/project/vs/core-test.vcxproj | 10 + .../project/vs/core-test.vcxproj.filters | 19 + .../cpp/core-test/src/cluster_test.cpp | 33 + .../cpp/core-test/src/ignition_test.cpp | 37 +- .../cpp/core-test/src/interop_test.cpp | 11 - .../cpp/core/include/ignite/impl/ignite_impl.h | 25 +- modules/platforms/cpp/core/src/ignition.cpp | 2 +- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 45 +- modules/platforms/cpp/ignite/src/ignite.cpp | 23 +- .../cpp/odbc-test/src/queries_test.cpp | 58 + .../cpp/odbc/include/ignite/odbc/message.h | 12 + .../odbc/include/ignite/odbc/query/data_query.h | 3 + modules/platforms/cpp/odbc/src/message.cpp | 7 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 21 +- .../Services/ServicesAsyncWrapper.cs | 9 +- .../Services/ServicesTest.cs | 81 +- .../Apache.Ignite.Core.csproj | 4 +- .../Impl/Cache/Query/AbstractQueryCursor.cs | 264 ---- .../Impl/Cache/Query/FieldsQueryCursor.cs | 2 +- .../Impl/Cache/Query/PlatformQueryQursorBase.cs | 84 ++ .../Impl/Cache/Query/QueryCursor.cs | 2 +- .../Impl/Cache/Query/QueryCursorBase.cs | 288 ++++ .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 6 +- .../Impl/Services/ServiceProxySerializer.cs | 36 + .../Impl/Services/Services.cs | 30 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 37 +- .../Resource/InstanceResourceAttribute.cs | 3 +- .../Services/ServiceDeploymentException.cs | 111 ++ modules/platforms/dotnet/docfx/.gitignore | 9 + .../dotnet/docfx/Apache.Ignite.docfx.json | 88 ++ modules/platforms/dotnet/docfx/README.txt | 2 + modules/platforms/dotnet/docfx/api/index.md | 5 + modules/platforms/dotnet/docfx/filterConfig.yml | 19 + .../platforms/dotnet/docfx/generate-docs.cmd | 1 + .../platforms/dotnet/docfx/images/favicon.ico | Bin 0 -> 1150 bytes .../dotnet/docfx/images/logo_ignite_32_32.png | Bin 0 -> 1676 bytes modules/platforms/dotnet/docfx/index.md | 10 + modules/platforms/dotnet/docfx/toc.yml | 19 + modules/rest-http/pom.xml | 2 +- modules/rocketmq/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring-data/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/storm/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web-console/backend/app/mongo.js | 5 +- .../app/modules/agent/AgentManager.service.js | 18 +- .../modules/configuration/Version.service.js | 2 +- .../frontend/app/modules/sql/sql.controller.js | 21 +- .../web-console/frontend/views/sql/sql.tpl.pug | 7 + modules/web-console/pom.xml | 2 +- modules/web-console/web-agent/pom.xml | 2 +- .../console/agent/handlers/ClusterListener.java | 21 +- modules/web/ignite-appserver-test/pom.xml | 2 +- modules/web/ignite-websphere-test/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zeromq/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- parent/pom.xml | 7 + pom.xml | 155 +- 201 files changed, 9613 insertions(+), 1118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41a1c571/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41a1c571/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41a1c571/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ----------------------------------------------------------------------
