You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/12/19 12:18:05 UTC
[08/31] ignite git commit: Merge branch 'master' into ignite-4490
Merge branch 'master' into ignite-4490
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4ee47d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4ee47d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4ee47d2
Branch: refs/heads/ignite-6022-proto
Commit: c4ee47d2cf98382611e6723cf46680f581e4b7e6
Parents: e66b664 6983e87
Author: devozerov <vo...@gridgain.com>
Authored: Fri Sep 8 13:51:09 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Sep 8 13:51:09 2017 +0300
----------------------------------------------------------------------
.../example-persistent-store.xml | 23 -
examples/pom-standalone-lgpl.xml | 19 +
examples/pom-standalone.xml | 19 +
examples/pom.xml | 21 +-
.../datastructures/IgniteSemaphoreExample.java | 21 +-
.../persistentstore/PersistentStoreExample.java | 29 +-
.../ml/math/matrix/CacheMatrixExample.java | 4 +-
.../ml/math/vector/CacheVectorExample.java | 4 +-
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 +-
modules/clients/src/test/config/jdbc-config.xml | 1 +
.../jdbc2/JdbcConnectionReopenTest.java | 51 +
.../internal/jdbc2/JdbcConnectionSelfTest.java | 36 +
.../jdbc2/JdbcDeleteStatementSelfTest.java | 22 +
.../jdbc2/JdbcInsertStatementSelfTest.java | 159 ++
.../jdbc2/JdbcMergeStatementSelfTest.java | 41 +
.../internal/jdbc2/JdbcMetadataSelfTest.java | 154 +-
.../jdbc2/JdbcStatementBatchingSelfTest.java | 133 ++
.../jdbc2/JdbcUpdateStatementSelfTest.java | 24 +
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 16 +-
.../jdbc/thin/JdbcThinAbstractSelfTest.java | 71 +-
.../thin/JdbcThinComplexDmlDdlSelfTest.java | 486 ++++
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 1431 +++++++++++-
.../jdbc/thin/JdbcThinMetadataSelfTest.java | 337 ++-
.../JdbcThinMissingLongArrayResultsTest.java | 341 +++
.../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 82 +-
.../thin/JdbcThinPreparedStatementSelfTest.java | 261 ++-
.../jdbc/thin/JdbcThinResultSetSelfTest.java | 1193 +++++++++-
.../jdbc/thin/JdbcThinStatementSelfTest.java | 781 ++++++-
modules/clients/src/test/keystore/ca/node01.jks | Bin 0 -> 3719 bytes
modules/clients/src/test/keystore/ca/node02.jks | Bin 0 -> 4598 bytes
modules/clients/src/test/keystore/ca/node03.jks | Bin 0 -> 3754 bytes
modules/clients/src/test/keystore/ca/oneca.cnf | 31 +
modules/clients/src/test/keystore/ca/oneca.key | 28 +
.../clients/src/test/keystore/ca/oneindex.txt | 1 +
.../src/test/keystore/ca/oneindex.txt.attr | 1 +
modules/clients/src/test/keystore/ca/oneserial | 1 +
.../clients/src/test/keystore/ca/trust-both.jks | Bin 0 -> 1718 bytes
.../clients/src/test/keystore/ca/trust-one.jks | Bin 0 -> 877 bytes
.../clients/src/test/keystore/ca/trust-two.jks | Bin 0 -> 891 bytes
modules/clients/src/test/keystore/ca/twoca.cnf | 31 +
modules/clients/src/test/keystore/ca/twoca.key | 28 +
.../clients/src/test/keystore/ca/twoindex.txt | 2 +
.../src/test/keystore/ca/twoindex.txt.attr | 1 +
modules/clients/src/test/keystore/ca/twoserial | 1 +
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 31 +
.../org/apache/ignite/IgniteJdbcThinDriver.java | 24 +-
.../java/org/apache/ignite/IgniteServices.java | 112 +-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../org/apache/ignite/cache/CacheMetrics.java | 10 +
.../org/apache/ignite/cache/QueryEntity.java | 15 +-
.../org/apache/ignite/cache/QueryIndex.java | 10 +-
.../ignite/cache/query/SqlFieldsQuery.java | 38 +-
.../query/annotations/QueryGroupIndex.java | 20 +
.../cache/query/annotations/QuerySqlField.java | 23 +
.../configuration/CheckpointWriteOrder.java | 33 +
.../configuration/IgniteConfiguration.java | 5 +
.../configuration/MemoryConfiguration.java | 8 +-
.../PersistentStoreConfiguration.java | 31 +-
.../internal/DuplicateTypeIdException.java | 74 +
.../internal/IgniteDiagnosticMessage.java | 2 +-
.../org/apache/ignite/internal/IgniteEx.java | 14 +
.../apache/ignite/internal/IgniteKernal.java | 46 +-
.../ignite/internal/IgniteNodeAttributes.java | 6 +
.../ignite/internal/IgniteServicesImpl.java | 64 +-
.../ignite/internal/MarshallerContextImpl.java | 27 +-
.../internal/MarshallerMappingFileStore.java | 76 +-
.../ignite/internal/binary/BinaryContext.java | 66 +-
.../ignite/internal/binary/BinaryUtils.java | 26 +
.../binary/builder/BinaryObjectBuilderImpl.java | 2 +
.../GridClientConnectionManagerAdapter.java | 1 -
.../connection/GridClientNioTcpConnection.java | 2 +-
.../internal/jdbc/JdbcDatabaseMetadata.java | 2 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 135 +-
.../jdbc/thin/JdbcThinDatabaseMetadata.java | 1589 +++++++++++++
.../jdbc/thin/JdbcThinParameterMetadata.java | 115 +
.../jdbc/thin/JdbcThinPreparedStatement.java | 52 +-
.../internal/jdbc/thin/JdbcThinResultSet.java | 640 ++++--
.../internal/jdbc/thin/JdbcThinStatement.java | 102 +-
.../internal/jdbc/thin/JdbcThinTcpIo.java | 154 +-
.../internal/jdbc/thin/JdbcThinUtils.java | 16 +-
.../internal/jdbc2/JdbcBatchUpdateTask.java | 215 ++
.../ignite/internal/jdbc2/JdbcConnection.java | 62 +-
.../internal/jdbc2/JdbcDatabaseMetadata.java | 504 +++--
.../internal/jdbc2/JdbcPreparedStatement.java | 25 +-
.../ignite/internal/jdbc2/JdbcQueryTask.java | 16 +
.../ignite/internal/jdbc2/JdbcQueryTaskV2.java | 107 +
.../ignite/internal/jdbc2/JdbcResultSet.java | 11 +-
.../ignite/internal/jdbc2/JdbcStatement.java | 75 +-
.../managers/communication/GridIoManager.java | 7 -
.../communication/GridIoMessageFactory.java | 9 +-
.../internal/managers/discovery/DiscoCache.java | 141 +-
.../discovery/GridDiscoveryManager.java | 159 +-
.../ignite/internal/pagemem/PageUtils.java | 26 +
.../affinity/AffinityTopologyVersion.java | 7 +
.../affinity/GridAffinityAssignmentCache.java | 42 +
.../affinity/GridAffinityProcessor.java | 8 +-
.../cache/CacheAffinitySharedManager.java | 754 +++++--
.../cache/CacheClusterMetricsMXBeanImpl.java | 10 +
.../processors/cache/CacheGroupContext.java | 18 +-
.../cache/CacheLocalMetricsMXBeanImpl.java | 10 +
.../processors/cache/CacheMetricsImpl.java | 36 +-
.../processors/cache/CacheMetricsSnapshot.java | 18 +
.../processors/cache/CacheObjectUtils.java | 65 +-
.../cache/CachePartitionExchangeWorkerTask.java | 5 +-
.../ClientCacheChangeDummyDiscoveryMessage.java | 5 +
.../cache/ClientCacheUpdateTimeout.java | 5 +
.../processors/cache/ClusterCachesInfo.java | 22 +-
.../processors/cache/ExchangeContext.java | 131 ++
.../cache/ExchangeDiscoveryEvents.java | 262 +++
.../processors/cache/GridCacheAdapter.java | 14 +-
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryEx.java | 10 +
.../processors/cache/GridCacheIoManager.java | 57 +-
.../processors/cache/GridCacheLockCallback.java | 51 +
.../processors/cache/GridCacheMapEntry.java | 33 +-
.../processors/cache/GridCacheMvccCallback.java | 51 -
.../processors/cache/GridCacheMvccFuture.java | 37 -
.../processors/cache/GridCacheMvccManager.java | 46 +-
.../GridCachePartitionExchangeManager.java | 517 ++++-
.../processors/cache/GridCacheProcessor.java | 139 +-
.../cache/GridCacheSharedContext.java | 20 +
.../processors/cache/GridCacheUtils.java | 153 +-
.../cache/GridCacheVersionedFuture.java | 37 +
.../cache/IgniteCacheOffheapManager.java | 2 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 1199 +---------
.../processors/cache/IgniteCacheProxyImpl.java | 26 +-
.../cache/binary/BinaryMetadataTransport.java | 14 +-
.../binary/CacheObjectBinaryProcessor.java | 20 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 20 +-
.../dht/ClientCacheDhtTopologyFuture.java | 12 +-
.../dht/GridClientPartitionTopology.java | 225 +-
.../distributed/dht/GridDhtCacheAdapter.java | 18 +-
.../distributed/dht/GridDhtLocalPartition.java | 50 +-
.../distributed/dht/GridDhtLockFuture.java | 6 +-
.../dht/GridDhtPartitionTopology.java | 67 +-
.../dht/GridDhtPartitionTopologyImpl.java | 696 +++---
.../dht/GridDhtPartitionsReservation.java | 2 +-
.../distributed/dht/GridDhtTopologyFuture.java | 36 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 97 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 48 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 447 ++--
.../dht/GridPartitionedGetFuture.java | 4 +-
.../dht/GridPartitionedSingleGetFuture.java | 4 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 65 +-
.../GridNearAtomicSingleUpdateFuture.java | 1 -
.../dht/colocated/GridDhtColocatedCache.java | 6 +-
.../colocated/GridDhtColocatedLockFuture.java | 8 +-
.../colocated/GridDhtDetachedCacheEntry.java | 4 +-
.../preloader/CacheGroupAffinityMessage.java | 339 +++
.../CachePartitionFullCountersMap.java | 135 ++
.../CachePartitionPartialCountersMap.java | 184 ++
.../preloader/ForceRebalanceExchangeTask.java | 5 +
.../dht/preloader/GridDhtPartitionDemander.java | 31 +-
.../preloader/GridDhtPartitionExchangeId.java | 11 +
.../dht/preloader/GridDhtPartitionMap.java | 26 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 2 +-
.../GridDhtPartitionsAbstractMessage.java | 39 +-
.../GridDhtPartitionsExchangeFuture.java | 2116 ++++++++++++++----
.../preloader/GridDhtPartitionsFullMessage.java | 226 +-
.../GridDhtPartitionsSingleMessage.java | 108 +-
.../GridDhtPartitionsSingleRequest.java | 55 +-
.../dht/preloader/GridDhtPreloader.java | 40 +-
.../IgniteDhtPartitionCountersMap.java | 7 +
.../IgniteDhtPartitionCountersMap2.java | 69 +
.../dht/preloader/InitNewCoordinatorFuture.java | 339 +++
.../RebalanceReassignExchangeTask.java | 5 +
.../distributed/near/GridNearCacheAdapter.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../distributed/near/GridNearGetFuture.java | 6 +-
.../distributed/near/GridNearLockFuture.java | 8 +-
...arOptimisticSerializableTxPrepareFuture.java | 3 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 3 +-
.../GridNearPessimisticTxPrepareFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 6 +-
.../cache/distributed/near/GridNearTxLocal.java | 24 +-
.../near/GridNearTxPrepareFutureAdapter.java | 4 +-
.../near/GridNearTxPrepareRequest.java | 14 +
.../processors/cache/local/GridLocalCache.java | 5 +-
.../cache/local/GridLocalLockFuture.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 8 +-
.../GridCacheDatabaseSharedManager.java | 334 ++-
.../persistence/GridCacheOffheapManager.java | 32 +-
.../IgniteCacheDatabaseSharedManager.java | 49 +-
.../cache/persistence/MemoryMetricsImpl.java | 26 +-
.../cache/persistence/MemoryPolicy.java | 3 +-
.../cache/persistence/MetadataStorage.java | 21 +-
.../cache/persistence/file/FilePageStore.java | 4 +-
.../persistence/file/FilePageStoreManager.java | 4 +-
.../persistence/freelist/FreeListImpl.java | 7 +-
.../persistence/pagemem/PageMemoryImpl.java | 80 +-
.../cache/persistence/tree/io/PageIO.java | 25 +-
.../wal/AbstractWalRecordsIterator.java | 11 +-
.../persistence/wal/ByteBufferExpander.java | 27 +-
.../wal/FileWriteAheadLogManager.java | 79 +-
.../reader/StandaloneWalRecordsIterator.java | 9 +-
.../processors/cache/query/CacheQueryEntry.java | 58 +
.../query/GridCacheDistributedQueryManager.java | 16 +-
.../cache/query/GridCacheQueryAdapter.java | 59 +-
.../cache/query/GridCacheQueryManager.java | 476 ++--
.../cache/query/QueryEntityTypeDescriptor.java | 17 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 215 +-
.../IgniteTxImplicitSingleStateImpl.java | 5 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../cache/tree/AbstractDataInnerIO.java | 109 +
.../cache/tree/AbstractDataLeafIO.java | 108 +
.../cache/tree/AbstractPendingEntryInnerIO.java | 99 +
.../cache/tree/AbstractPendingEntryLeafIO.java | 98 +
.../cache/tree/CacheDataRowStore.java | 80 +
.../processors/cache/tree/CacheDataTree.java | 256 +++
.../cache/tree/CacheIdAwareDataInnerIO.java | 48 +
.../cache/tree/CacheIdAwareDataLeafIO.java | 48 +
.../tree/CacheIdAwarePendingEntryInnerIO.java | 48 +
.../tree/CacheIdAwarePendingEntryLeafIO.java | 48 +
.../processors/cache/tree/DataInnerIO.java | 48 +
.../processors/cache/tree/DataLeafIO.java | 48 +
.../internal/processors/cache/tree/DataRow.java | 105 +
.../cache/tree/PendingEntriesTree.java | 118 +
.../cache/tree/PendingEntryInnerIO.java | 48 +
.../cache/tree/PendingEntryLeafIO.java | 48 +
.../processors/cache/tree/PendingRow.java | 83 +
.../processors/cache/tree/PendingRowIO.java | 44 +
.../processors/cache/tree/RowLinkIO.java | 44 +
.../processors/cache/tree/SearchRow.java | 76 +
.../IgniteCacheObjectProcessorImpl.java | 164 --
.../UserCacheObjectByteArrayImpl.java | 59 +
.../cacheobject/UserCacheObjectImpl.java | 82 +
.../cacheobject/UserKeyCacheObjectImpl.java | 101 +
.../closure/GridClosureProcessor.java | 36 +-
.../cluster/GridClusterStateProcessor.java | 62 +-
.../continuous/GridContinuousProcessor.java | 7 +-
.../datastreamer/DataStreamProcessor.java | 57 +-
.../datastreamer/DataStreamerImpl.java | 130 +-
.../internal/processors/job/GridJobWorker.java | 19 -
.../odbc/SqlListenerConnectionContext.java | 36 +-
.../processors/odbc/SqlListenerNioListener.java | 82 +-
.../odbc/SqlListenerRequestHandler.java | 9 +
.../processors/odbc/SqlListenerUtils.java | 6 +
.../odbc/jdbc/JdbcBatchExecuteRequest.java | 20 +-
.../odbc/jdbc/JdbcBatchExecuteResult.java | 6 +
.../processors/odbc/jdbc/JdbcColumnMeta.java | 75 +-
.../odbc/jdbc/JdbcConnectionContext.java | 118 +
.../processors/odbc/jdbc/JdbcIndexMeta.java | 192 ++
.../odbc/jdbc/JdbcMetaColumnsRequest.java | 102 +
.../odbc/jdbc/JdbcMetaColumnsResult.java | 99 +
.../odbc/jdbc/JdbcMetaIndexesRequest.java | 88 +
.../odbc/jdbc/JdbcMetaIndexesResult.java | 98 +
.../odbc/jdbc/JdbcMetaParamsRequest.java | 87 +
.../odbc/jdbc/JdbcMetaParamsResult.java | 97 +
.../odbc/jdbc/JdbcMetaPrimaryKeysRequest.java | 88 +
.../odbc/jdbc/JdbcMetaPrimaryKeysResult.java | 99 +
.../odbc/jdbc/JdbcMetaSchemasRequest.java | 73 +
.../odbc/jdbc/JdbcMetaSchemasResult.java | 73 +
.../odbc/jdbc/JdbcMetaTablesRequest.java | 87 +
.../odbc/jdbc/JdbcMetaTablesResult.java | 97 +
.../processors/odbc/jdbc/JdbcParameterMeta.java | 163 ++
.../odbc/jdbc/JdbcPrimaryKeyMeta.java | 131 ++
.../odbc/jdbc/JdbcQueryCloseRequest.java | 4 +-
.../odbc/jdbc/JdbcQueryExecuteRequest.java | 8 +-
.../odbc/jdbc/JdbcQueryExecuteResult.java | 12 +-
.../odbc/jdbc/JdbcQueryFetchRequest.java | 4 +-
.../odbc/jdbc/JdbcQueryFetchResult.java | 12 +-
.../odbc/jdbc/JdbcQueryMetadataRequest.java | 18 +-
.../odbc/jdbc/JdbcQueryMetadataResult.java | 14 +-
.../processors/odbc/jdbc/JdbcRequest.java | 67 +-
.../odbc/jdbc/JdbcRequestHandler.java | 282 ++-
.../processors/odbc/jdbc/JdbcResult.java | 58 +-
.../processors/odbc/jdbc/JdbcTableMeta.java | 82 +
.../processors/odbc/jdbc/JdbcUtils.java | 37 +-
.../odbc/odbc/OdbcConnectionContext.java | 116 +
.../processors/odbc/odbc/OdbcMessageParser.java | 4 +-
.../odbc/odbc/OdbcQueryExecuteResult.java | 24 +-
.../odbc/odbc/OdbcRequestHandler.java | 89 +-
.../processors/odbc/odbc/OdbcUtils.java | 22 +
.../platform/cache/PlatformCache.java | 2 +
.../datastreamer/PlatformDataStreamer.java | 3 +-
.../services/PlatformAbstractService.java | 8 +
.../platform/services/PlatformServices.java | 64 +-
.../platform/utils/PlatformUtils.java | 2 +-
.../processors/query/GridQueryIndexing.java | 18 +-
.../processors/query/GridQueryProcessor.java | 170 +-
.../query/GridQueryTypeDescriptor.java | 7 +
.../internal/processors/query/QueryField.java | 64 +
.../internal/processors/query/QuerySchema.java | 37 +-
.../query/QueryTypeDescriptorImpl.java | 32 +-
.../internal/processors/query/QueryUtils.java | 7 +-
.../messages/GridQueryNextPageResponse.java | 36 +-
.../query/schema/SchemaExchangeWorkerTask.java | 5 +
.../schema/SchemaIndexCacheVisitorImpl.java | 7 +
.../SchemaNodeLeaveExchangeWorkerTask.java | 5 +
.../query/schema/SchemaOperationWorker.java | 2 +-
.../SchemaAbstractAlterTableOperation.java | 39 +
.../SchemaAlterTableAddColumnOperation.java | 96 +
.../GridServiceDeploymentCompoundFuture.java | 197 ++
.../service/GridServiceProcessor.java | 566 +++--
.../service/PreparedConfigurations.java | 53 +
.../processors/task/GridTaskWorker.java | 30 +-
.../internal/util/GridSpinReadWriteLock.java | 2 +-
.../apache/ignite/internal/util/GridUnsafe.java | 14 +
.../ignite/internal/util/IgniteUtils.java | 41 +
.../util/future/GridCompoundFuture.java | 55 +-
.../ignite/internal/util/lang/GridFunc.java | 3 +-
.../internal/util/nio/GridNioKeyAttachment.java | 33 +
.../util/nio/GridNioRecoveryDescriptor.java | 3 +-
.../ignite/internal/util/nio/GridNioServer.java | 248 +-
.../util/nio/GridSelectorNioSessionImpl.java | 28 +-
.../internal/util/nio/ssl/GridNioSslFilter.java | 12 +-
.../apache/ignite/internal/util/typedef/X.java | 4 +-
.../visor/cache/VisorCacheStopTask.java | 22 +-
.../visor/cache/VisorCacheStopTaskArg.java | 27 +
.../node/VisorNodeDataCollectorTaskResult.java | 29 +
.../internal/visor/query/VisorQueryTask.java | 1 +
.../internal/visor/query/VisorQueryTaskArg.java | 41 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 21 +
.../services/ServiceDeploymentException.java | 77 +
.../communication/tcp/TcpCommunicationSpi.java | 89 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 47 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +
.../tcp/internal/TcpDiscoveryNode.java | 20 +
.../org/apache/ignite/thread/IgniteThread.java | 9 +
.../resources/META-INF/classnames.properties | 85 +-
.../core/src/main/resources/ignite.properties | 2 +-
modules/core/src/test/config/tests.properties | 8 +
.../org.apache.ignite.plugin.PluginProvider | 3 +-
...atformCachePluginConfigurationClosureFactory | 1 -
...rm.PlatformPluginConfigurationClosureFactory | 1 -
.../cache/store/GridStoreLoadCacheTest.java | 120 +
.../ignite/internal/GridDiscoverySelfTest.java | 30 -
.../IgniteClientReconnectBinaryContexTest.java | 115 +
.../internal/TestDelayingCommunicationSpi.java | 63 +
.../BinaryObjectBuilderAdditionalSelfTest.java | 22 +
...CacheExchangeMessageDuplicatedStateTest.java | 9 +-
.../cache/CacheGroupsMetricsRebalanceTest.java | 123 +
.../cache/CacheRebalancingSelfTest.java | 88 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 17 +-
...ridCacheQuerySqlFieldInlineSizeSelfTest.java | 160 ++
.../processors/cache/GridCacheTestEntryEx.java | 6 +
...dMemoryConfigurationConsistencySelfTest.java | 79 +
...IgniteClientCacheInitializationFailTest.java | 10 +-
.../IgniteClientCacheStartFailoverTest.java | 4 +-
.../IgniteClusterActivateDeactivateTest.java | 4 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 26 +-
...niteTopologyValidatorGridSplitCacheTest.java | 6 +-
...AffinityCoordinatorDynamicStartStopTest.java | 2 +-
.../binary/BinaryMetadataUpdatesFlowTest.java | 48 +
...eAbstractDataStructuresFailoverSelfTest.java | 7 +-
.../distributed/CacheExchangeMergeTest.java | 1528 +++++++++++++
.../CacheLateAffinityAssignmentTest.java | 600 +++--
...CacheLoadingConcurrentGridStartSelfTest.java | 11 +
.../CacheLockReleaseNodeLeaveTest.java | 13 +-
.../distributed/CachePartitionStateTest.java | 18 +-
...ncurrentGridStartSelfTestAllowOverwrite.java | 33 +
...titionEvictionDuringReadThroughSelfTest.java | 2 +
...niteCacheClientNodeChangingTopologyTest.java | 5 +-
...teCacheClientNodePartitionsExchangeTest.java | 52 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 4 +-
.../IgniteOptimisticTxSuspendResumeTest.java | 11 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 111 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 36 +-
.../IgnitePdsCacheRebalancingAbstractTest.java | 137 +-
.../persistence/IgnitePdsDynamicCacheTest.java | 43 +
...MarshallerMappingRestoreOnNodeStartTest.java | 116 +
...nitePersistenceSequentialCheckpointTest.java | 44 +
.../IgnitePersistentStoreCacheGroupsTest.java | 35 +-
...faultPageSizeBackwardsCompatibilityTest.java | 147 ++
.../db/file/IgnitePdsEvictionTest.java | 3 +-
.../wal/IgniteWalHistoryReservationsTest.java | 70 +-
.../db/wal/IgniteWalRecoveryTest.java | 2 +
.../db/wal/crc/IgniteDataIntegrityTests.java | 66 +-
.../IgniteChangeGlobalStateTest.java | 11 +-
.../IgniteStandByClusterTest.java | 48 +-
.../join/JoinInActiveNodeToActiveCluster.java | 4 +-
.../GridCacheQueryTransformerSelfTest.java | 41 +
...ContinuousQueryFailoverAbstractSelfTest.java | 11 +-
.../processors/database/BPlusTreeSelfTest.java | 39 +-
.../datastreamer/DataStreamerImplSelfTest.java | 143 +-
.../processors/igfs/IgfsIgniteMock.java | 10 +
...ServiceDeploymentCompoundFutureSelfTest.java | 242 ++
...GridServiceProcessorBatchDeploySelfTest.java | 742 ++++++
.../internal/util/nio/GridNioSelfTest.java | 2 +-
.../platform/PlatformCacheWriteMetricsTask.java | 10 +
.../platform/plugin/PlatformTestPlugin.java | 27 -
.../plugin/PlatformTestPluginConfiguration.java | 63 -
...rmTestPluginConfigurationClosureFactory.java | 61 -
.../plugin/PlatformTestPluginException.java | 34 -
.../plugin/PlatformTestPluginExtension.java | 51 -
.../plugin/PlatformTestPluginProvider.java | 103 -
.../plugin/PlatformTestPluginTarget.java | 236 --
.../cache/PlatformGetCachePluginsTask.java | 85 -
.../PlatformTestCachePluginConfiguration.java | 55 -
...formTestCachePluginConfigurationClosure.java | 48 -
...tCachePluginConfigurationClosureFactory.java | 37 -
.../cache/PlatformTestCachePluginProvider.java | 72 -
.../spi/GridTcpSpiForwardingSelfTest.java | 1 +
.../GridAbstractCommunicationSelfTest.java | 27 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 28 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 39 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 47 +-
...CommunicationRecoveryAckClosureSelfTest.java | 36 +-
.../tcp/TcpCommunicationSpiDropNodesTest.java | 3 +-
.../discovery/tcp/IgniteClientConnectTest.java | 163 ++
...pClientDiscoveryMarshallerCheckSelfTest.java | 84 +-
.../tcp/TcpDiscoverySslTrustedSelfTest.java | 42 +
.../TcpDiscoverySslTrustedUntrustedTest.java | 140 ++
.../ignite/testframework/GridTestUtils.java | 20 +
.../junits/common/GridCommonAbstractTest.java | 22 +-
.../junits/multijvm/IgniteProcessProxy.java | 10 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 3 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 7 +-
.../testsuites/IgniteCacheTestSuite2.java | 7 +-
.../testsuites/IgniteCacheTestSuite6.java | 3 +
.../IgniteClientReconnectTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 4 +
.../ignite/testsuites/IgnitePdsTestSuite.java | 3 +
.../IgniteSpiDiscoverySelfTestSuite.java | 10 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/platform/README.txt | 4 +
.../extdata/platform/licenses/apache-2.0.txt | 202 ++
modules/extdata/platform/pom.xml | 46 +
.../platform/plugin/PlatformTestPlugin.java | 27 +
.../plugin/PlatformTestPluginConfiguration.java | 63 +
...rmTestPluginConfigurationClosureFactory.java | 61 +
.../plugin/PlatformTestPluginException.java | 34 +
.../plugin/PlatformTestPluginExtension.java | 51 +
.../plugin/PlatformTestPluginProvider.java | 103 +
.../plugin/PlatformTestPluginTarget.java | 236 ++
.../cache/PlatformGetCachePluginsTask.java | 85 +
.../PlatformTestCachePluginConfiguration.java | 55 +
...formTestCachePluginConfigurationClosure.java | 48 +
...tCachePluginConfigurationClosureFactory.java | 37 +
.../cache/PlatformTestCachePluginProvider.java | 72 +
.../platform/plugin/cache/package-info.java | 22 +
.../ignite/platform/plugin/package-info.java | 22 +
.../org.apache.ignite.plugin.PluginProvider | 1 +
...atformCachePluginConfigurationClosureFactory | 1 +
...rm.PlatformPluginConfigurationClosureFactory | 1 +
.../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 +-
.../query/h2/opt/GridH2SpatialIndex.java | 4 +-
modules/hadoop/pom.xml | 2 +-
.../HadoopExternalCommunication.java | 5 +-
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 +-
.../query/h2/DmlStatementsProcessor.java | 273 ++-
.../processors/query/h2/H2RowDescriptor.java | 105 +-
.../internal/processors/query/h2/H2Schema.java | 2 +
.../processors/query/h2/H2TableDescriptor.java | 3 +-
.../processors/query/h2/H2TableEngine.java | 13 +-
.../processors/query/h2/IgniteH2Indexing.java | 88 +-
.../query/h2/database/H2TreeIndex.java | 16 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 50 +-
.../query/h2/opt/GridH2IndexBase.java | 4 +-
.../processors/query/h2/opt/GridH2Table.java | 71 +-
.../query/h2/opt/GridLuceneDirectory.java | 9 +-
.../processors/query/h2/opt/GridLuceneFile.java | 6 +-
.../query/h2/opt/GridLuceneIndex.java | 17 +-
.../h2/sql/GridSqlAlterTableAddColumn.java | 113 +
.../query/h2/sql/GridSqlQueryParser.java | 160 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 243 +-
.../query/h2/twostep/GridMergeIndex.java | 7 +-
.../h2/twostep/GridMergeIndexIterator.java | 165 ++
.../h2/twostep/GridReduceQueryExecutor.java | 68 +-
.../query/h2/twostep/MapNodeResults.java | 19 +-
.../query/h2/twostep/MapQueryLazyWorker.java | 176 ++
.../query/h2/twostep/MapQueryLazyWorkerKey.java | 97 +
.../query/h2/twostep/MapQueryResult.java | 46 +-
.../query/h2/twostep/MapQueryResults.java | 26 +-
.../query/h2/twostep/MapRequestKey.java | 23 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 9 +
...titionOnAffinityRunWithCollisionSpiTest.java | 3 +-
...ynamicColumnsAbstractConcurrentSelfTest.java | 1056 +++++++++
.../cache/index/DynamicColumnsAbstractTest.java | 311 +++
...umnsConcurrentAtomicPartitionedSelfTest.java | 33 +
...lumnsConcurrentAtomicReplicatedSelfTest.java | 33 +
...currentTransactionalPartitionedSelfTest.java | 33 +
...ncurrentTransactionalReplicatedSelfTest.java | 33 +
.../DynamicIndexAbstractConcurrentSelfTest.java | 128 +-
.../H2DynamicColumnsAbstractBasicSelfTest.java | 348 +++
.../H2DynamicColumnsClientBasicSelfTest.java | 28 +
.../H2DynamicColumnsServerBasicSelfTest.java | 28 +
...icColumnsServerCoordinatorBasicSelfTest.java | 28 +
.../cache/index/LongIndexNameTest.java | 212 ++
.../processors/query/LazyQuerySelfTest.java | 389 ++++
.../h2/GridIndexingSpiAbstractSelfTest.java | 18 +-
.../query/h2/IgniteSqlBigIntegerKeyTest.java | 163 ++
.../h2/database/InlineIndexHelperTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 92 +-
.../IgniteCacheQuerySelfTestSuite.java | 15 +
.../IgniteCacheQuerySelfTestSuite2.java | 9 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 2 +
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 | 3 +-
.../clustering/KMeansDistributedClusterer.java | 55 +-
.../java/org/apache/ignite/ml/math/Blas.java | 4 +-
.../ignite/ml/math/IdentityValueMapper.java | 2 +
.../java/org/apache/ignite/ml/math/Matrix.java | 16 +
.../apache/ignite/ml/math/MatrixKeyMapper.java | 30 -
.../apache/ignite/ml/math/MatrixStorage.java | 7 +
.../org/apache/ignite/ml/math/ValueMapper.java | 37 -
.../apache/ignite/ml/math/VectorKeyMapper.java | 29 -
.../ignite/ml/math/distributed/CacheUtils.java | 546 +++++
.../ml/math/distributed/DistributedStorage.java | 35 +
.../ml/math/distributed/MatrixKeyMapper.java | 33 +
.../ignite/ml/math/distributed/ValueMapper.java | 37 +
.../ml/math/distributed/VectorKeyMapper.java | 32 +
.../math/distributed/keys/BlockMatrixKey.java | 30 +
.../math/distributed/keys/MatrixCacheKey.java | 35 +
.../math/distributed/keys/RowColMatrixKey.java | 30 +
.../distributed/keys/impl/BlockMatrixKey.java | 144 ++
.../distributed/keys/impl/SparseMatrixKey.java | 142 ++
.../distributed/keys/impl/package-info.java | 22 +
.../ml/math/distributed/keys/package-info.java | 22 +
.../ml/math/distributed/package-info.java | 22 +
.../apache/ignite/ml/math/impls/CacheUtils.java | 559 -----
.../ml/math/impls/matrix/AbstractMatrix.java | 25 +
.../ml/math/impls/matrix/CacheMatrix.java | 6 +-
.../impls/matrix/DenseLocalOnHeapMatrix.java | 4 +-
.../matrix/SparseBlockDistributedMatrix.java | 16 +-
.../impls/matrix/SparseDistributedMatrix.java | 83 +-
.../storage/matrix/BaseBlockMatrixKey.java | 41 -
.../impls/storage/matrix/BlockMatrixKey.java | 144 --
.../storage/matrix/BlockMatrixStorage.java | 38 +-
.../storage/matrix/CacheMatrixStorage.java | 9 +-
.../matrix/DenseOffHeapMatrixStorage.java | 5 +
.../storage/matrix/DiagonalMatrixStorage.java | 5 +
.../storage/matrix/FunctionMatrixStorage.java | 5 +
.../storage/matrix/MatrixDelegateStorage.java | 5 +
.../storage/matrix/PivotedMatrixStorage.java | 5 +
.../storage/matrix/RandomMatrixStorage.java | 5 +
.../matrix/SparseDistributedMatrixStorage.java | 54 +-
.../matrix/SparseLocalOnHeapMatrixStorage.java | 6 +-
.../storage/vector/CacheVectorStorage.java | 4 +-
.../ml/math/impls/vector/CacheVector.java | 6 +-
.../ml/math/impls/matrix/CacheMatrixTest.java | 2 +-
.../impls/matrix/MatrixImplementationsTest.java | 17 +
.../impls/matrix/MatrixKeyMapperForTests.java | 2 +-
.../SparseDistributedBlockMatrixTest.java | 7 +-
.../matrix/SparseDistributedMatrixTest.java | 40 +-
.../ml/math/impls/vector/CacheVectorTest.java | 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 -
.../ignite/cache/query/query_sql_fields.h | 71 +-
.../impl/cache/query/query_fields_row_impl.h | 2 +-
.../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 +-
modules/platforms/cpp/odbc-test/Makefile.am | 3 +-
.../cpp/odbc-test/include/test_utils.h | 9 +
.../cpp/odbc-test/project/vs/odbc-test.vcxproj | 8 +-
.../cpp/odbc-test/src/configuration_test.cpp | 11 +
.../cpp/odbc-test/src/meta_queries_test.cpp | 113 +
.../cpp/odbc-test/src/queries_test.cpp | 184 +-
.../platforms/cpp/odbc-test/src/test_utils.cpp | 13 +
.../include/ignite/odbc/config/configuration.h | 26 +
.../cpp/odbc/include/ignite/odbc/cursor.h | 7 +
.../cpp/odbc/include/ignite/odbc/message.h | 18 +-
.../odbc/include/ignite/odbc/protocol_version.h | 1 +
.../ignite/odbc/query/column_metadata_query.h | 3 +
.../odbc/include/ignite/odbc/query/data_query.h | 3 +
.../ignite/odbc/query/table_metadata_query.h | 3 +
.../include/ignite/odbc/query/type_info_query.h | 3 +
.../odbc/system/ui/dsn_configuration_window.h | 4 +
.../src/system/ui/dsn_configuration_window.cpp | 34 +-
.../cpp/odbc/src/config/configuration.cpp | 2 +
.../cpp/odbc/src/config/connection_info.cpp | 19 +-
modules/platforms/cpp/odbc/src/connection.cpp | 6 +-
modules/platforms/cpp/odbc/src/cursor.cpp | 5 +
modules/platforms/cpp/odbc/src/dsn_config.cpp | 3 +
modules/platforms/cpp/odbc/src/message.cpp | 22 +-
.../platforms/cpp/odbc/src/meta/column_meta.cpp | 3 +
.../platforms/cpp/odbc/src/protocol_version.cpp | 8 +-
.../cpp/odbc/src/query/batch_query.cpp | 7 +-
.../odbc/src/query/column_metadata_query.cpp | 16 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 30 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 16 +-
.../cpp/odbc/src/query/type_info_query.cpp | 16 +-
modules/platforms/cpp/odbc/src/statement.cpp | 32 +-
.../Binary/BinaryDynamicRegistrationTest.cs | 49 +
.../Binary/BinarySelfTest.cs | 19 +-
.../Cache/Affinity/AffinityFieldTest.cs | 10 +-
.../Cache/CacheAbstractTest.cs | 50 +-
.../Compute/ComputeApiTest.cs | 6 +
.../Dataload/DataStreamerTest.cs | 71 +-
.../Services/ServicesAsyncWrapper.cs | 9 +-
.../Services/ServicesTest.cs | 81 +-
.../Apache.Ignite.Core.csproj | 6 +-
.../Cache/CachePartialUpdateException.cs | 9 +-
.../Configuration/MemoryPolicyConfiguration.cs | 4 +-
.../Apache.Ignite.Core/Common/IgniteGuid.cs | 31 +-
.../Datastream/StreamTransformer.cs | 6 +-
.../Datastream/StreamVisitor.cs | 6 +-
.../Apache.Ignite.Core/Events/JobEvent.cs | 6 +-
.../Apache.Ignite.Core/Events/TaskEvent.cs | 4 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 132 +-
.../Impl/Binary/BinaryObjectSchemaSerializer.cs | 12 +-
.../Impl/Binary/BinaryProcessor.cs | 2 +-
.../Impl/Binary/BinaryReader.cs | 110 +-
.../Impl/Binary/BinarySystemHandlers.cs | 157 +-
.../Impl/Binary/BinaryTypeId.cs | 228 ++
.../Impl/Binary/BinaryUtils.cs | 155 +-
.../Impl/Binary/BinaryWriter.cs | 161 +-
.../Impl/Binary/BinaryWriterExtensions.cs | 4 +-
.../Impl/Binary/Marshaller.cs | 75 +-
.../Impl/Binary/Metadata/BinaryType.cs | 62 +-
.../Impl/Cache/CacheAffinityImpl.cs | 2 +-
.../Apache.Ignite.Core/Impl/Cache/CacheEntry.cs | 31 +-
.../Impl/Cache/CacheEntryFilterHolder.cs | 2 +-
.../Impl/Cache/CacheEntryProcessorHolder.cs | 4 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +-
.../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 +++
.../Impl/Cache/Store/CacheStoreInternal.cs | 14 +-
.../Impl/Cluster/ClusterGroupImpl.cs | 2 +-
.../Apache.Ignite.Core/Impl/Common/Classpath.cs | 1 +
.../Impl/Compute/Closure/ComputeActionJob.cs | 4 +-
.../Impl/Compute/Closure/ComputeFuncJob.cs | 6 +-
.../Impl/Compute/Closure/ComputeOutFuncJob.cs | 4 +-
.../Closure/ComputeReducingClosureTask.cs | 2 +-
.../Compute/Closure/IComputeResourceInjector.cs | 2 +-
.../Impl/Compute/ComputeFunc.cs | 2 +-
.../Impl/Compute/ComputeJob.cs | 2 +-
.../Impl/Compute/ComputeJobHolder.cs | 21 +-
.../Impl/Compute/ComputeOutFunc.cs | 2 +-
.../Impl/Deployment/PeerAssemblyResolver.cs | 13 +-
.../Impl/Deployment/PeerLoadingExtensions.cs | 4 +-
.../Impl/Deployment/PeerLoadingObjectHolder.cs | 4 +-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 14 +-
.../Apache.Ignite.Core/Impl/IIgniteInternal.cs | 69 +
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +-
.../Impl/Messaging/MessageListenerHolder.cs | 4 +-
.../Impl/PlatformTargetAdapter.cs | 13 +-
.../Impl/Resource/ResourceProcessor.cs | 2 +-
.../Impl/Resource/ResourceTypeDescriptor.cs | 2 +-
.../Impl/Services/ServiceProxySerializer.cs | 36 +
.../Impl/Services/Services.cs | 30 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 37 +-
.../PersistentStoreConfiguration.cs | 2 +-
.../Resource/InstanceResourceAttribute.cs | 3 +-
.../Services/ServiceDeploymentException.cs | 111 +
.../Services/ServiceInvocationException.cs | 9 +-
modules/platforms/dotnet/README.md | 2 +-
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 +-
.../http/jetty/GridJettyRestHandler.java | 31 +-
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 +-
.../commands/cache/VisorCacheCommand.scala | 4 +-
.../commands/top/VisorTopologyCommand.scala | 111 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 9 +-
.../top/VisorActivationCommandSpec.scala | 67 +
.../testsuites/VisorConsoleSelfTestSuite.scala | 3 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web-console/backend/app/agentSocket.js | 29 +-
modules/web-console/backend/app/mongo.js | 6 +-
modules/web-console/frontend/app/app.js | 3 +-
.../web-console-footer-links/component.js | 23 +
.../web-console-footer-links/style.scss | 31 +
.../web-console-footer-links/template.pug | 17 +
.../app/components/web-console-footer/index.js | 4 +-
.../components/web-console-footer/style.scss | 8 +-
.../components/web-console-footer/template.pug | 1 +
.../components/web-console-header/style.scss | 55 +-
.../components/web-console-header/template.pug | 13 +-
.../frontend/app/data/getting-started.json | 13 +
.../ui-ace-java/ui-ace-java.controller.js | 13 +
.../ui-ace-spring/ui-ace-spring.controller.js | 13 +
.../app/modules/agent/AgentManager.service.js | 42 +-
.../modules/configuration/Version.service.js | 2 +-
.../generator/AbstractTransformer.js | 2 +-
.../generator/ConfigurationGenerator.js | 3 +-
.../frontend/app/modules/sql/sql.controller.js | 21 +-
.../states/configuration/caches/memory.pug | 2 +-
.../states/configuration/caches/store.pug | 2 +-
.../states/configuration/clusters/connector.pug | 2 +-
.../states/configuration/clusters/memory.pug | 2 +-
.../states/configuration/clusters/swap.pug | 2 +-
.../states/configuration/domains/general.pug | 2 +-
.../states/configuration/domains/query.pug | 7 +
.../states/configuration/domains/store.pug | 2 +-
.../app/services/LegacyTable.service.js | 6 +-
.../frontend/controllers/domains-controller.js | 24 +-
.../frontend/public/images/multicluster.png | Bin 0 -> 21921 bytes
.../frontend/public/stylesheets/style.scss | 4 +
.../views/configuration/domains-import.tpl.pug | 6 +
.../frontend/views/includes/header-right.pug | 4 -
modules/web-console/frontend/views/index.pug | 8 +-
.../web-console/frontend/views/signin.tpl.pug | 6 +
.../web-console/frontend/views/sql/sql.tpl.pug | 7 +
.../frontend/webpack/webpack.common.js | 1 -
modules/web-console/pom.xml | 2 +-
modules/web-console/web-agent/pom.xml | 2 +-
.../agent/handlers/AbstractListener.java | 21 +
.../console/agent/handlers/ClusterListener.java | 34 +-
.../ignite/console/agent/rest/RestExecutor.java | 201 +-
.../ignite/console/agent/rest/RestResult.java | 25 +-
modules/web/ignite-appserver-test/pom.xml | 2 +-
modules/web/ignite-websphere-test/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
.../config/benchmark-bin-identity.properties | 1 +
.../config/benchmark-cache-load.properties | 1 +
.../config/benchmark-client-mode.properties | 1 +
.../config/benchmark-failover.properties | 1 +
.../yardstick/config/benchmark-full.properties | 1 +
.../yardstick/config/benchmark-h2.properties | 1 +
.../config/benchmark-multicast.properties | 1 +
.../yardstick/config/benchmark-mysql.properties | 1 +
.../yardstick/config/benchmark-pgsql.properties | 1 +
.../config/benchmark-put-indexed-val.properties | 1 +
.../benchmark-query-put-separated.properties | 1 +
.../yardstick/config/benchmark-query.properties | 1 +
.../config/benchmark-remote.properties | 1 +
.../config/benchmark-sql-dml.properties | 1 +
.../yardstick/config/benchmark-store.properties | 1 +
modules/yardstick/config/benchmark.properties | 1 +
modules/yardstick/pom.xml | 2 +-
.../cache/WaitMapExchangeFinishCallable.java | 4 +-
.../cache/jdbc/JdbcAbstractBenchmark.java | 4 +-
.../yardstick/cache/jdbc/RdbmsBenchmark.java | 6 +-
modules/yarn/pom.xml | 2 +-
modules/zeromq/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
parent/pom.xml | 7 +
pom.xml | 156 +-
794 files changed, 40244 insertions(+), 9748 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ee47d2/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
index a7c44c9,0ff9cfe..3f89840
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
@@@ -360,15 -362,13 +363,15 @@@ public class DmlStatementsProcessor
return doFastUpdate(plan, fieldsQry.getArgs());
}
- assert !F.isEmpty(plan.selectQry);
+ assert !F.isEmpty(plan.rows) ^ !F.isEmpty(plan.selectQry);
- QueryCursorImpl<List<?>> cur;
+ Iterable<List<?>> cur;
// Do a two-step query only if locality flag is not set AND if plan's SELECT corresponds to an actual
- // subquery and not some dummy stuff like "select 1, 2, 3;"
+ // sub-query and not some dummy stuff like "select 1, 2, 3;"
if (!loc && !plan.isLocSubqry) {
+ assert !F.isEmpty(plan.selectQry);
+
SqlFieldsQuery newFieldsQry = new SqlFieldsQuery(plan.selectQry, fieldsQry.isCollocated())
.setArgs(fieldsQry.getArgs())
.setDistributedJoins(fieldsQry.isDistributedJoins())