Merge remote-tracking branch 'upstream/ignite-2.1.4' into ignite-2.1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1a74a4b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1a74a4b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1a74a4b Branch: refs/heads/ignite-5947 Commit: d1a74a4be8744528e6ed23706174041ddb0f2618 Parents: 0f22223 772d462 Author: devozerov <[email protected]> Authored: Fri Aug 4 12:04:38 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Aug 4 12:04:38 2017 +0300 ---------------------------------------------------------------------- .../ignite/tests/utils/TestTransaction.java | 10 + .../apache/ignite/IgniteSystemProperties.java | 6 + .../IgniteDiagnosticPrepareContext.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 3 +- .../mem/file/MappedFileMemoryProvider.java | 3 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 16 +- .../cache/GridCacheSharedContext.java | 24 + .../processors/cache/GridCacheUtils.java | 7 +- .../cache/IgniteCacheOffheapManagerImpl.java | 26 +- .../processors/cache/IgniteCacheProxyImpl.java | 24 +- .../GridDhtPartitionsExchangeFuture.java | 20 +- .../cache/distributed/near/GridNearTxLocal.java | 51 ++ .../GridCacheDatabaseSharedManager.java | 7 +- .../persistence/freelist/FreeListImpl.java | 18 +- .../wal/FileWriteAheadLogManager.java | 37 +- .../reader/StandaloneWalRecordsIterator.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 10 + .../cache/transactions/IgniteTxAdapter.java | 20 +- .../cache/transactions/IgniteTxManager.java | 74 ++ .../cache/transactions/IgniteTxMap.java | 2 +- .../transactions/TransactionProxyImpl.java | 46 +- .../cluster/GridClusterStateProcessor.java | 3 +- .../datastructures/GridCacheLockImpl.java | 13 +- .../processors/odbc/SqlListenerProcessor.java | 3 +- .../ignite/internal/util/nio/GridNioServer.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 10 +- .../internal/visor/query/VisorQueryTask.java | 2 +- .../visor/query/VisorScanQueryTask.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 38 +- .../apache/ignite/transactions/Transaction.java | 14 + .../ignite/transactions/TransactionState.java | 7 +- .../cache/store/jdbc/model/BinaryTest.java | 1 - .../processors/cache/IgniteCacheGroupsTest.java | 22 +- ...ptimisticTxSuspendResumeMultiServerTest.java | 30 + .../IgniteOptimisticTxSuspendResumeTest.java | 751 +++++++++++++++++++ .../IgnitePessimisticTxSuspendResumeTest.java | 91 +++ .../IgnitePdsCacheRebalancingAbstractTest.java | 2 + .../TxOptimisticDeadlockDetectionTest.java | 2 + .../ignite/testframework/GridTestUtils.java | 26 + .../cache/GridAbstractCacheStoreSelfTest.java | 10 + .../testsuites/IgniteCacheTestSuite6.java | 42 ++ .../ignite/tests/p2p/JobStealingTask.java | 12 +- .../org/apache/ignite/tests/p2p/NodeFilter.java | 30 + .../hadoop/jobtracker/HadoopJobTracker.java | 24 +- .../hadoop/shuffle/HadoopShuffleJob.java | 5 +- .../processors/query/h2/IgniteH2Indexing.java | 21 +- .../cache/index/H2DynamicTableSelfTest.java | 32 + .../processors/cache/jta/CacheJtaManager.java | 5 +- .../processors/cache/jta/CacheJtaResource.java | 28 +- .../GridJtaTransactionManagerSelfTest.java | 208 +++++ .../ignite/testsuites/IgniteJtaTestSuite.java | 5 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 6 +- .../include/ignite/binary/binary_writer.h | 4 +- .../ignite/impl/binary/binary_reader_impl.h | 50 +- .../ignite/impl/binary/binary_type_impl.h | 67 ++ .../ignite/impl/binary/binary_writer_impl.h | 43 +- .../src/impl/binary/binary_reader_impl.cpp | 63 +- .../src/impl/binary/binary_writer_impl.cpp | 41 +- .../core-test/config/cache-query-default.xml | 29 + .../src/binary_reader_writer_raw_test.cpp | 36 + .../core-test/src/binary_reader_writer_test.cpp | 135 +++- .../cpp/core-test/src/cache_query_test.cpp | 215 +++++- .../cpp/core-test/src/cluster_test.cpp | 13 + .../ignite/cache/query/query_fields_row.h | 28 + .../ignite/cache/query/query_sql_fields.h | 13 +- .../platforms/cpp/core/include/ignite/ignite.h | 15 + .../ignite/impl/cache/query/query_argument.h | 63 ++ .../impl/cache/query/query_fields_row_impl.h | 29 + .../ignite/impl/cluster/cluster_group_impl.h | 15 + .../cpp/core/include/ignite/impl/ignite_impl.h | 24 +- modules/platforms/cpp/core/src/ignite.cpp | 10 + .../src/impl/cluster/cluster_group_impl.cpp | 26 +- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 4 + .../spi/deployment/uri/UriDeploymentSpi.java | 3 +- modules/web-console/backend/app/mongo.js | 2 +- modules/web-console/backend/app/settings.js | 3 +- modules/web-console/backend/index.js | 16 +- modules/web-console/backend/middlewares/api.js | 39 +- .../web-console/backend/services/activities.js | 12 +- modules/web-console/frontend/app/app.js | 10 +- .../components/grid-item-selected/component.js | 28 + .../components/grid-item-selected/controller.js | 38 + .../app/components/grid-item-selected/index.js | 24 + .../components/grid-item-selected/template.pug | 17 + .../list-of-registered-users.tpl.pug | 4 +- .../app/components/ui-grid-hovering/cell.js | 48 ++ .../app/components/ui-grid-hovering/hovering.js | 31 + .../app/components/ui-grid-hovering/index.js | 30 + .../app/components/ui-grid-hovering/style.scss | 22 + .../app/components/ui-grid-hovering/viewport.js | 42 ++ .../frontend/app/controllers/auth.controller.js | 9 +- .../app/modules/agent/AgentManager.service.js | 24 +- .../app/modules/agent/AgentModal.service.js | 8 +- .../configuration/generator/Maven.service.js | 13 +- .../frontend/app/modules/demo/Demo.module.js | 22 +- .../frontend/app/modules/sql/sql.controller.js | 11 +- .../states/configuration/clusters/hadoop.pug | 2 +- .../configuration/summary/summary.worker.js | 4 +- .../frontend/app/modules/states/errors.state.js | 2 +- .../app/modules/states/password.state.js | 2 + .../app/modules/states/profile.state.js | 2 +- .../frontend/app/modules/states/signin.state.js | 6 +- .../app/modules/user/AclRoute.provider.js | 50 -- .../frontend/app/modules/user/user.module.js | 35 +- .../frontend/app/services/Messages.service.js | 7 + .../web-console/frontend/views/signin.tpl.pug | 2 +- .../views/templates/agent-download.tpl.pug | 2 - 108 files changed, 2918 insertions(+), 440 deletions(-) ----------------------------------------------------------------------
