Merge remote-tracking branch 'remotes/origin/master' into ignite-5293
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa2e7f7e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa2e7f7e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa2e7f7e Branch: refs/heads/ignite-5293 Commit: fa2e7f7e25216d84bfe97b5abe9e41ed2757a7e3 Parents: dd1310f e273f2e Author: sboikov <sboi...@gridgain.com> Authored: Mon Jun 5 10:32:59 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jun 5 10:32:59 2017 +0300 ---------------------------------------------------------------------- assembly/libs/README.txt | 1 + .../jdbc2/JdbcDynamicIndexAbstractSelfTest.java | 2 + .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 40 +- .../jdbc/thin/JdbcConnectionSelfTest.java | 195 -- .../JdbcThinAbstractDmlStatementSelfTest.java | 251 +++ .../jdbc/thin/JdbcThinAbstractSelfTest.java | 41 + ...JdbcThinAbstractUpdateStatementSelfTest.java | 40 + .../jdbc/thin/JdbcThinComplexQuerySelfTest.java | 330 ++++ .../jdbc/thin/JdbcThinConnectionSelfTest.java | 237 +++ .../thin/JdbcThinDeleteStatementSelfTest.java | 49 + .../JdbcThinDynamicIndexAbstractSelfTest.java | 328 ++++ ...namicIndexAtomicPartitionedNearSelfTest.java | 26 + ...inDynamicIndexAtomicPartitionedSelfTest.java | 39 + ...hinDynamicIndexAtomicReplicatedSelfTest.java | 39 + ...dexTransactionalPartitionedNearSelfTest.java | 26 + ...icIndexTransactionalPartitionedSelfTest.java | 39 + ...micIndexTransactionalReplicatedSelfTest.java | 39 + .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 146 ++ .../thin/JdbcThinInsertStatementSelfTest.java | 185 ++ .../thin/JdbcThinMergeStatementSelfTest.java | 130 ++ .../jdbc/thin/JdbcThinMetadataSelfTest.java | 357 ++++ .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 160 ++ .../thin/JdbcThinPreparedStatementSelfTest.java | 771 ++++++++ .../jdbc/thin/JdbcThinResultSetSelfTest.java | 762 ++++++++ .../jdbc/thin/JdbcThinStatementSelfTest.java | 343 ++++ .../thin/JdbcThinUpdateStatementSelfTest.java | 50 + .../org/apache/ignite/IgniteJdbcDriver.java | 3 + .../org/apache/ignite/IgniteJdbcThinDriver.java | 138 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 5 +- .../ignite/internal/binary/BinaryFieldImpl.java | 10 +- .../internal/binary/BinaryObjectImpl.java | 10 +- .../binary/BinaryObjectOffheapImpl.java | 10 +- .../ignite/internal/binary/BinaryTypeProxy.java | 3 + .../stream/v2/DirectByteBufferStreamImplV2.java | 1 + .../internal/jdbc/thin/JdbcConnection.java | 529 ------ .../ignite/internal/jdbc/thin/JdbcTcpIo.java | 207 --- .../internal/jdbc/thin/JdbcThinConnection.java | 657 +++++++ .../jdbc/thin/JdbcThinPreparedStatement.java | 485 +++++ .../internal/jdbc/thin/JdbcThinResultSet.java | 1704 ++++++++++++++++++ .../jdbc/thin/JdbcThinResultSetMetadata.java | 161 ++ .../internal/jdbc/thin/JdbcThinStatement.java | 495 +++++ .../internal/jdbc/thin/JdbcThinTcpIo.java | 365 ++++ .../internal/jdbc/thin/JdbcThinUtils.java | 208 +++ .../checkpoint/GridCheckpointManager.java | 45 +- .../checkpoint/GridCheckpointRequest.java | 2 + .../processors/cache/GridCacheAdapter.java | 51 +- .../cache/GridCacheDeploymentManager.java | 12 +- .../processors/cache/IgniteCacheFutureImpl.java | 8 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 9 +- ...arOptimisticSerializableTxPrepareFuture.java | 6 +- .../query/GridCacheQueryFutureAdapter.java | 18 +- .../cache/query/GridCacheSqlQuery.java | 23 + .../store/GridCacheStoreManagerAdapter.java | 4 +- .../cache/store/GridCacheWriteBehindStore.java | 13 +- .../cache/transactions/TxDeadlock.java | 11 +- .../odbc/OdbcQueryGetColumnsMetaRequest.java | 74 - .../odbc/OdbcQueryGetColumnsMetaResult.java | 42 - .../odbc/OdbcQueryGetParamsMetaRequest.java | 60 - .../odbc/OdbcQueryGetParamsMetaResult.java | 40 - .../odbc/OdbcQueryGetTablesMetaRequest.java | 85 - .../odbc/OdbcQueryGetTablesMetaResult.java | 42 - .../internal/processors/odbc/OdbcTableMeta.java | 88 - .../odbc/SqlListenerAbstractMessageParser.java | 265 --- .../odbc/SqlListenerAbstractObjectReader.java | 137 -- .../odbc/SqlListenerAbstractObjectWriter.java | 111 -- .../processors/odbc/SqlListenerColumnMeta.java | 110 -- .../processors/odbc/SqlListenerNioListener.java | 27 +- .../processors/odbc/SqlListenerProcessor.java | 1 + .../odbc/SqlListenerQueryCloseRequest.java | 49 - .../odbc/SqlListenerQueryCloseResult.java | 40 - .../odbc/SqlListenerQueryExecuteRequest.java | 78 - .../odbc/SqlListenerQueryExecuteResult.java | 54 - .../odbc/SqlListenerQueryFetchRequest.java | 61 - .../odbc/SqlListenerQueryFetchResult.java | 66 - .../processors/odbc/SqlListenerRequest.java | 37 +- .../odbc/SqlListenerRequestHandler.java | 8 + .../odbc/SqlListenerRequestHandlerImpl.java | 494 ----- .../processors/odbc/SqlListenerResponse.java | 42 +- .../processors/odbc/SqlListenerUtils.java | 250 +++ .../processors/odbc/jdbc/JdbcColumnMeta.java | 129 ++ .../processors/odbc/jdbc/JdbcMessageParser.java | 53 +- .../processors/odbc/jdbc/JdbcObjectReader.java | 33 - .../processors/odbc/jdbc/JdbcObjectWriter.java | 33 - .../odbc/jdbc/JdbcQueryCloseRequest.java | 72 + .../processors/odbc/jdbc/JdbcQueryCursor.java | 132 ++ .../odbc/jdbc/JdbcQueryExecuteRequest.java | 147 ++ .../odbc/jdbc/JdbcQueryExecuteResult.java | 150 ++ .../odbc/jdbc/JdbcQueryFetchRequest.java | 87 + .../odbc/jdbc/JdbcQueryFetchResult.java | 84 + .../odbc/jdbc/JdbcQueryMetadataRequest.java | 73 + .../odbc/jdbc/JdbcQueryMetadataResult.java | 93 + .../odbc/jdbc/JdbcRawBinarylizable.java | 44 + .../processors/odbc/jdbc/JdbcRequest.java | 108 ++ .../odbc/jdbc/JdbcRequestHandler.java | 285 +++ .../processors/odbc/jdbc/JdbcResponse.java | 104 ++ .../processors/odbc/jdbc/JdbcResult.java | 91 + .../processors/odbc/jdbc/JdbcUtils.java | 73 + .../processors/odbc/odbc/OdbcColumnMeta.java | 111 ++ .../processors/odbc/odbc/OdbcMessageParser.java | 213 ++- .../processors/odbc/odbc/OdbcObjectReader.java | 33 - .../processors/odbc/odbc/OdbcObjectWriter.java | 32 - .../odbc/odbc/OdbcQueryCloseRequest.java | 49 + .../odbc/odbc/OdbcQueryCloseResult.java | 40 + .../odbc/odbc/OdbcQueryExecuteRequest.java | 78 + .../odbc/odbc/OdbcQueryExecuteResult.java | 54 + .../odbc/odbc/OdbcQueryFetchRequest.java | 61 + .../odbc/odbc/OdbcQueryFetchResult.java | 66 + .../odbc/OdbcQueryGetColumnsMetaRequest.java | 74 + .../odbc/OdbcQueryGetColumnsMetaResult.java | 42 + .../odbc/OdbcQueryGetParamsMetaRequest.java | 60 + .../odbc/odbc/OdbcQueryGetParamsMetaResult.java | 40 + .../odbc/OdbcQueryGetTablesMetaRequest.java | 85 + .../odbc/odbc/OdbcQueryGetTablesMetaResult.java | 42 + .../processors/odbc/odbc/OdbcRequest.java | 63 + .../odbc/odbc/OdbcRequestHandler.java | 505 ++++++ .../processors/odbc/odbc/OdbcResponse.java | 69 + .../processors/odbc/odbc/OdbcTableMeta.java | 89 + .../processors/query/GridQueryProcessor.java | 57 +- .../internal/processors/query/QueryUtils.java | 6 + .../resource/GridResourceProcessor.java | 9 +- .../handlers/query/QueryCommandHandler.java | 7 +- .../processors/task/GridTaskWorker.java | 4 +- .../util/future/AsyncFutureListener.java | 57 + .../internal/util/future/IgniteFutureImpl.java | 33 +- .../util/tostring/GridToStringBuilder.java | 419 +++++ .../util/tostring/GridToStringThreadLocal.java | 6 +- .../org/apache/ignite/lang/IgniteFuture.java | 24 +- .../internal/SensitiveInfoTestLoggerProxy.java | 493 +++++ .../SensitiveInfoTestLoggerProxy_Exclude.txt | 20 + .../SensitiveInfoTestLoggerProxy_Include.txt | 18 + .../binary/BinaryFieldExtractionSelfTest.java | 52 + .../binary/BinaryMarshallerSelfTest.java | 36 +- .../query/GridQueryCommandHandlerTest.java | 3 +- .../util/future/IgniteCacheFutureImplTest.java | 46 + .../util/future/IgniteFutureImplTest.java | 466 ++++- .../tostring/IncludeSensitiveAtomicTest.java | 29 + .../util/tostring/IncludeSensitiveTest.java | 149 ++ .../IncludeSensitiveTransactionalTest.java | 43 + .../junits/IgniteTestResources.java | 11 +- .../testsuites/IgniteLangSelfTestSuite.java | 3 + modules/flink/pom.xml | 2 +- .../query/h2/H2IndexingAbstractGeoSelfTest.java | 27 +- .../cache/query/CacheQueryPartitionInfo.java | 110 ++ .../cache/query/GridCacheTwoStepQuery.java | 18 + .../processors/query/h2/IgniteH2Indexing.java | 69 +- .../query/h2/ddl/DdlStatementsProcessor.java | 43 +- .../query/h2/sql/GridSqlCreateTable.java | 48 +- .../query/h2/sql/GridSqlQueryParser.java | 105 +- .../query/h2/sql/GridSqlQuerySplitter.java | 228 ++- .../query/h2/twostep/GridMapQueryExecutor.java | 75 +- .../h2/twostep/GridReduceQueryExecutor.java | 28 +- .../h2/twostep/msg/GridH2QueryRequest.java | 37 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 4 + .../DynamicIndexAbstractBasicSelfTest.java | 22 +- .../cache/index/H2DynamicTableSelfTest.java | 222 ++- .../processors/query/IgniteSqlRoutingTest.java | 552 ++++++ .../query/IgniteSqlSchemaIndexingTest.java | 3 +- .../processors/query/SqlSchemaSelfTest.java | 238 +++ .../query/h2/sql/GridQueryParsingTest.java | 23 +- .../IgniteCacheQuerySelfTestSuite.java | 6 +- .../impls/storage/matrix/MapWrapperStorage.java | 17 + .../ml/math/impls/vector/MapWrapperVector.java | 17 + .../ml/clustering/ClusteringTesetSuite.java | 17 + .../Apache.Ignite.Core.Tests.NuGet/NuGet.config | 2 +- .../StartupTest.cs | 1 - .../install-package.ps1 | 31 +- .../Apache.Ignite.Core.Tests.TestDll.csproj | 1 + .../TestExtensions.cs | 35 + .../Apache.Ignite.Core.Tests.csproj | 2 + .../Binary/BinarySelfTest.cs | 2 +- .../Binary/EnumsTest.cs | 299 ++- .../Binary/EnumsTestOnline.cs | 45 + .../Deployment/PeerAssemblyLoadingTest.cs | 13 + .../Deployment/RuntimeDependencyFunc.cs | 34 + .../Impl/Binary/BinaryReader.cs | 9 +- .../Impl/Binary/BinaryReflectiveActions.cs | 11 +- .../Impl/Binary/BinaryUtils.cs | 2 + .../Impl/Binary/BinaryWriter.cs | 4 +- .../Impl/Compute/ComputeJobHolder.cs | 6 +- .../Impl/Deployment/GetAssemblyFunc.cs | 28 + .../Impl/Deployment/PeerAssemblyResolver.cs | 26 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 1 + modules/platforms/dotnet/build.ps1 | 5 +- .../processors/schedule/ScheduleFutureImpl.java | 51 +- .../schedule/GridScheduleSelfTest.java | 84 +- modules/web-console/backend/app/mongo.js | 79 +- modules/web-console/backend/services/caches.js | 2 + modules/web-console/backend/services/igfss.js | 5 + modules/web-console/frontend/app/app.config.js | 3 +- modules/web-console/frontend/app/app.js | 12 +- .../cluster-select/cluster-select.pug | 2 +- .../list-of-registered-users.column-defs.js | 2 +- .../app/components/version-picker/component.js | 52 + .../app/components/version-picker/index.js | 25 + .../app/components/version-picker/style.scss | 41 + .../app/components/version-picker/template.pug | 33 + .../frontend/app/data/event-groups.json | 14 + .../ui-ace-docker/ui-ace-docker.controller.js | 8 +- .../ui-ace-java/ui-ace-java.controller.js | 29 +- .../ui-ace-java/ui-ace-java.directive.js | 12 +- .../ui-ace-pom/ui-ace-pom.controller.js | 8 +- .../ui-ace-spring/ui-ace-spring.controller.js | 29 +- .../ui-ace-spring/ui-ace-spring.directive.js | 12 +- .../frontend/app/helpers/jade/mixins.pug | 4 +- .../app/modules/agent/AgentManager.service.js | 15 +- .../frontend/app/modules/cluster/Cache.js | 4 + .../app/modules/cluster/CacheMetrics.js | 4 + .../modules/configuration/Version.service.js | 180 +- .../generator/AbstractTransformer.js | 110 +- .../generator/ConfigurationGenerator.js | 570 ++++-- .../configuration/generator/Docker.service.js | 12 +- .../generator/JavaTransformer.service.js | 32 +- .../configuration/generator/Maven.service.js | 38 +- .../generator/PlatformGenerator.js | 19 +- .../generator/SpringTransformer.service.js | 23 +- .../defaults/Cache.platform.service.js | 9 + .../generator/defaults/Cache.service.js | 23 +- .../generator/defaults/Cluster.service.js | 46 +- .../generator/defaults/IGFS.service.js | 9 +- .../frontend/app/modules/sql/sql.controller.js | 6 +- .../app/modules/states/configuration.state.js | 21 +- .../states/configuration/caches/affinity.pug | 23 +- .../states/configuration/caches/concurrency.pug | 14 + .../states/configuration/caches/general.pug | 71 +- .../states/configuration/caches/memory.pug | 99 +- .../states/configuration/caches/node-filter.pug | 27 +- .../states/configuration/caches/query.pug | 25 +- .../states/configuration/caches/store.pug | 5 + .../configuration/clusters/deployment.pug | 8 +- .../states/configuration/clusters/discovery.pug | 14 +- .../states/configuration/clusters/events.pug | 26 +- .../states/configuration/clusters/failover.pug | 9 + .../states/configuration/clusters/general.pug | 2 +- .../states/configuration/clusters/hadoop.pug | 119 ++ .../configuration/clusters/marshaller.pug | 37 +- .../states/configuration/clusters/memory.pug | 114 ++ .../states/configuration/clusters/metrics.pug | 2 +- .../states/configuration/clusters/misc.pug | 60 + .../states/configuration/clusters/service.pug | 88 + .../states/configuration/clusters/swap.pug | 72 + .../states/configuration/clusters/thread.pug | 54 +- .../states/configuration/clusters/time.pug | 13 +- .../states/configuration/domains/query.pug | 2 +- .../modules/states/configuration/igfs/dual.pug | 42 + .../modules/states/configuration/igfs/misc.pug | 25 +- .../summary/summary-zipper.service.js | 4 +- .../configuration/summary/summary.controller.js | 2 +- .../configuration/summary/summary.worker.js | 13 +- .../frontend/app/primitives/btn-group/index.pug | 12 +- .../frontend/app/primitives/btn/index.scss | 6 + .../frontend/app/primitives/dropdown/index.pug | 3 +- .../frontend/app/primitives/dropdown/index.scss | 19 +- .../frontend/controllers/caches-controller.js | 71 +- .../frontend/controllers/clusters-controller.js | 190 +- .../frontend/controllers/domains-controller.js | 7 +- .../frontend/controllers/igfs-controller.js | 9 +- .../frontend/public/stylesheets/style.scss | 19 +- .../frontend/test/unit/Version.test.js | 95 +- .../frontend/views/configuration/caches.tpl.pug | 2 +- .../views/configuration/clusters.tpl.pug | 13 +- .../views/configuration/domains.tpl.pug | 2 +- .../frontend/views/configuration/igfs.tpl.pug | 6 +- .../views/configuration/sidebar.tpl.pug | 4 +- .../frontend/views/includes/header-left.pug | 3 - .../frontend/views/includes/header-right.pug | 1 - .../frontend/views/settings/admin.tpl.pug | 2 +- .../frontend/views/settings/profile.tpl.pug | 2 +- .../web-console/frontend/views/signin.tpl.pug | 6 +- .../web-console/frontend/views/sql/sql.tpl.pug | 8 +- .../frontend/webpack/webpack.common.js | 8 +- .../frontend/webpack/webpack.dev.babel.js | 5 +- .../console/agent/handlers/ClusterListener.java | 12 +- 273 files changed, 19133 insertions(+), 4112 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa2e7f7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ----------------------------------------------------------------------
