You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/06/12 15:34:15 UTC

[61/62] [abbrv] ignite git commit: Merge branches 'ignite-5239' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5239

Merge branches 'ignite-5239' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5239


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5384f73d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5384f73d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5384f73d

Branch: refs/heads/ignite-5239
Commit: 5384f73d0cade91482fb38fc0cb2fb66f2308c25
Parents: ebd2687 0879ca8
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Mon Jun 12 22:16:36 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Mon Jun 12 22:16:36 2017 +0700

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |    6 +-
 config/ignite-log4j2.xml                        |    6 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |    6 +-
 .../jdbc2/JdbcAbstractDmlStatementSelfTest.java |    2 -
 .../jdbc2/JdbcComplexQuerySelfTest.java         |    2 -
 .../internal/jdbc2/JdbcConnectionSelfTest.java  |    2 -
 .../jdbc2/JdbcDistributedJoinsQueryTest.java    |    2 -
 .../internal/jdbc2/JdbcEmptyCacheSelfTest.java  |    2 -
 .../internal/jdbc2/JdbcLocalCachesSelfTest.java |    2 -
 .../internal/jdbc2/JdbcMetadataSelfTest.java    |    2 -
 .../internal/jdbc2/JdbcNoDefaultCacheTest.java  |    2 -
 .../jdbc2/JdbcPreparedStatementSelfTest.java    |    2 -
 .../internal/jdbc2/JdbcResultSetSelfTest.java   |    2 -
 .../internal/jdbc2/JdbcSpringSelfTest.java      |    2 -
 .../internal/jdbc2/JdbcStatementSelfTest.java   |    2 -
 .../internal/jdbc2/JdbcStreamingSelfTest.java   |    2 -
 .../jdbc/AbstractJdbcPojoQuerySelfTest.java     |    2 -
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |    2 -
 .../ignite/jdbc/JdbcConnectionSelfTest.java     |    2 -
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |    2 -
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |    2 -
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |    2 -
 .../ignite/jdbc/JdbcNoDefaultCacheTest.java     |    2 -
 .../jdbc/JdbcPreparedStatementSelfTest.java     |    2 -
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |    2 -
 .../ignite/jdbc/JdbcStatementSelfTest.java      |    2 -
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |    2 +
 .../JdbcThinAbstractDmlStatementSelfTest.java   |    5 -
 .../jdbc/thin/JdbcThinAbstractSelfTest.java     |   16 +-
 .../thin/JdbcThinAutoCloseServerCursorTest.java |  359 ++
 .../jdbc/thin/JdbcThinConnectionSelfTest.java   |  120 +-
 .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java   |    3 -
 .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java  |    2 -
 .../thin/JdbcThinPreparedStatementSelfTest.java |    3 -
 .../jdbc/thin/JdbcThinStatementSelfTest.java    |    3 -
 modules/clients/src/test/resources/log4j.xml    |    2 +-
 .../main/java/META-INF/services/java.sql.Driver |    2 +
 .../org/apache/ignite/IgniteJdbcDriver.java     |    9 +-
 .../org/apache/ignite/IgniteJdbcThinDriver.java |   19 +-
 .../apache/ignite/IgniteSystemProperties.java   |    9 +
 .../ignite/cache/query/SqlFieldsQuery.java      |   12 +-
 .../configuration/CacheConfiguration.java       |   45 +
 .../configuration/IgniteConfiguration.java      |   36 +
 .../ignite/configuration/OdbcConfiguration.java |    4 +
 .../SqlConnectorConfiguration.java              |  275 ++
 .../org/apache/ignite/internal/GridTopic.java   |    6 +-
 .../ignite/internal/IgniteDiagnosticAware.java  |   28 +
 .../ignite/internal/IgniteDiagnosticInfo.java   |   45 +
 .../internal/IgniteDiagnosticMessage.java       |  467 ++
 .../IgniteDiagnosticPrepareContext.java         |  279 ++
 .../apache/ignite/internal/IgniteKernal.java    |    7 +-
 .../internal/binary/BinaryClassDescriptor.java  |    1 -
 .../ignite/internal/binary/BinaryContext.java   |    1 -
 .../ignite/internal/binary/BinaryFieldEx.java   |    5 +
 .../ignite/internal/binary/BinaryFieldImpl.java |    5 +
 .../ignite/internal/client/GridClientNode.java  |    9 +-
 .../client/impl/GridClientNodeImpl.java         |   22 +-
 .../connection/GridClientNioTcpConnection.java  |    3 +-
 .../internal/jdbc/thin/JdbcThinConnection.java  |   12 +-
 .../internal/jdbc/thin/JdbcThinResultSet.java   |   18 +-
 .../internal/jdbc/thin/JdbcThinStatement.java   |    2 +-
 .../internal/jdbc/thin/JdbcThinTcpIo.java       |   62 +-
 .../internal/jdbc/thin/JdbcThinUtils.java       |   22 +-
 .../managers/communication/GridIoManager.java   |   12 +-
 .../communication/GridIoMessageFactory.java     |    8 +-
 .../internal/managers/discovery/DiscoCache.java |   30 +-
 .../discovery/GridDiscoveryManager.java         |  193 +-
 .../ignite/internal/pagemem/PageSupport.java    |    2 +-
 .../processors/GridProcessorAdapter.java        |   10 +
 .../affinity/GridAffinityAssignmentCache.java   |   38 +-
 .../cache/CacheAffinitySharedManager.java       |  626 +--
 .../CacheClientReconnectDiscoveryData.java      |   66 +-
 .../internal/processors/cache/CacheData.java    |   22 +-
 .../processors/cache/CacheGroupContext.java     |  943 ++++
 .../processors/cache/CacheGroupData.java        |  147 +
 .../processors/cache/CacheGroupDescriptor.java  |  210 +
 .../cache/CacheJoinNodeDiscoveryData.java       |    4 +-
 .../processors/cache/CacheMetricsImpl.java      |   10 +-
 .../cache/CacheNodeCommonDiscoveryData.java     |   19 +
 .../cache/CacheOffheapEvictionManager.java      |   11 +-
 .../processors/cache/ClusterCachesInfo.java     |  564 ++-
 .../cache/ClusterCachesReconnectResult.java     |   61 +
 .../cache/DynamicCacheDescriptor.java           |   26 +
 .../processors/cache/ExchangeActions.java       |   86 +-
 .../processors/cache/GridCacheAdapter.java      |   60 +-
 .../cache/GridCacheAffinityManager.java         |   62 +-
 .../processors/cache/GridCacheAttributes.java   |   28 +-
 .../cache/GridCacheClearAllRunnable.java        |    2 +-
 .../cache/GridCacheConcurrentMap.java           |   55 +-
 .../cache/GridCacheConcurrentMapImpl.java       |  171 +-
 .../processors/cache/GridCacheContext.java      |  166 +-
 .../processors/cache/GridCacheEntryInfo.java    |   37 +-
 .../processors/cache/GridCacheEventManager.java |   36 -
 .../cache/GridCacheGroupIdMessage.java          |  110 +
 .../processors/cache/GridCacheIdMessage.java    |  117 +
 .../processors/cache/GridCacheIoManager.java    |  317 +-
 .../cache/GridCacheLocalConcurrentMap.java      |   56 +-
 .../processors/cache/GridCacheMapEntry.java     |   73 +-
 .../processors/cache/GridCacheMessage.java      |   97 +-
 .../GridCachePartitionExchangeManager.java      |  530 ++-
 .../processors/cache/GridCachePreloader.java    |   23 +-
 .../cache/GridCachePreloaderAdapter.java        |   46 +-
 .../processors/cache/GridCacheProcessor.java    |  391 +-
 .../cache/GridCacheSharedContext.java           |    4 +-
 .../cache/GridCacheSharedManagerAdapter.java    |    9 +
 .../processors/cache/GridCacheTtlManager.java   |   22 +-
 .../processors/cache/GridCacheUtils.java        |   45 +-
 .../GridChangeGlobalStateMessageResponse.java   |   20 +-
 .../processors/cache/GridNoStorageCacheMap.java |   30 +-
 .../cache/IgniteCacheOffheapManager.java        |  143 +-
 .../cache/IgniteCacheOffheapManagerImpl.java    | 1194 +++--
 .../cache/affinity/GridCacheAffinityImpl.java   |    9 +-
 .../processors/cache/database/CacheDataRow.java |    5 -
 .../cache/database/CacheDataRowAdapter.java     |   65 +-
 .../cache/database/CacheSearchRow.java          |    5 +
 .../processors/cache/database/RowStore.java     |   19 +-
 .../cache/database/tree/BPlusTree.java          |   41 +-
 .../cache/database/tree/io/PageIO.java          |   24 +
 .../distributed/GridCacheTtlUpdateRequest.java  |    4 +-
 .../distributed/GridDistributedBaseMessage.java |    4 +-
 .../GridDistributedCacheAdapter.java            |   19 +-
 .../GridDistributedTxFinishResponse.java        |   28 +-
 .../GridDistributedTxPrepareRequest.java        |   14 +-
 .../GridDistributedTxPrepareResponse.java       |    2 +-
 .../GridDistributedTxRemoteAdapter.java         |    2 +
 .../dht/GridCachePartitionedConcurrentMap.java  |   76 +-
 .../dht/GridClientPartitionTopology.java        |   25 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   10 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   12 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |   20 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  384 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   46 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   24 +-
 .../distributed/dht/GridDhtGetSingleFuture.java |   51 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  413 +-
 .../distributed/dht/GridDhtLockResponse.java    |    2 +-
 .../dht/GridDhtPartitionTopology.java           |    9 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  290 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   40 +-
 .../dht/GridDhtTxFinishResponse.java            |   14 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |    2 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |    8 +-
 .../dht/GridDhtTxOnePhaseCommitAckRequest.java  |   16 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   46 +-
 .../dht/GridPartitionedGetFuture.java           |    4 +-
 .../dht/GridPartitionedSingleGetFuture.java     |   48 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |   76 +-
 .../GridDhtAtomicAbstractUpdateRequest.java     |   26 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  113 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   53 -
 .../GridDhtAtomicDeferredUpdateResponse.java    |    4 +-
 .../dht/atomic/GridDhtAtomicNearResponse.java   |    4 +-
 .../atomic/GridDhtAtomicSingleUpdateFuture.java |    6 +-
 .../GridDhtAtomicSingleUpdateRequest.java       |   14 +
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |    4 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |    5 +-
 ...idNearAtomicAbstractSingleUpdateRequest.java |   19 +-
 .../GridNearAtomicAbstractUpdateFuture.java     |  200 +-
 .../GridNearAtomicAbstractUpdateRequest.java    |   90 +-
 .../GridNearAtomicCheckUpdateRequest.java       |    4 +-
 .../atomic/GridNearAtomicFullUpdateRequest.java |   24 +-
 ...GridNearAtomicSingleUpdateFilterRequest.java |   23 +-
 .../GridNearAtomicSingleUpdateFuture.java       |   42 +-
 ...GridNearAtomicSingleUpdateInvokeRequest.java |   23 +-
 .../GridNearAtomicSingleUpdateRequest.java      |   20 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   46 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   28 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   24 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   52 -
 .../colocated/GridDhtColocatedLockFuture.java   |   88 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   15 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |    4 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |    8 +-
 .../GridDhtPartitionDemandMessage.java          |   12 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  207 +-
 .../dht/preloader/GridDhtPartitionSupplier.java |   58 +-
 .../GridDhtPartitionSupplyMessage.java          |   29 +-
 .../GridDhtPartitionsAbstractMessage.java       |   26 +-
 .../GridDhtPartitionsExchangeFuture.java        |  330 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   60 +-
 .../GridDhtPartitionsSingleMessage.java         |   40 +-
 .../GridDhtPartitionsSingleRequest.java         |    7 +-
 .../dht/preloader/GridDhtPreloader.java         |  410 +-
 .../distributed/near/GridNearAtomicCache.java   |    2 +-
 .../distributed/near/GridNearCacheAdapter.java  |   16 +-
 .../distributed/near/GridNearGetFuture.java     |    4 +-
 .../distributed/near/GridNearGetRequest.java    |  149 +-
 .../distributed/near/GridNearGetResponse.java   |    4 +-
 .../distributed/near/GridNearLockFuture.java    |    1 +
 .../distributed/near/GridNearLockRequest.java   |   13 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   21 +-
 .../near/GridNearSingleGetRequest.java          |    4 +-
 .../near/GridNearSingleGetResponse.java         |    6 +-
 .../near/GridNearTransactionalCache.java        |    4 +-
 .../near/GridNearTxFinishFuture.java            |   11 +-
 .../near/GridNearTxFinishResponse.java          |   14 +-
 .../cache/distributed/near/GridNearTxLocal.java |   15 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |    5 +-
 .../near/GridNearTxPrepareResponse.java         |   14 +
 .../processors/cache/local/GridLocalCache.java  |   21 +-
 .../local/atomic/GridLocalAtomicCache.java      |    4 +-
 .../query/GridCacheDistributedQueryManager.java |   10 +-
 .../cache/query/GridCacheQueryManager.java      |    4 +-
 .../cache/query/GridCacheQueryRequest.java      |    3 +-
 .../cache/query/GridCacheQueryResponse.java     |    4 +-
 .../CacheContinuousQueryBatchAck.java           |    4 +-
 .../CacheContinuousQueryEventBuffer.java        |    5 +-
 .../continuous/CacheContinuousQueryHandler.java |   66 +-
 .../CacheContinuousQueryListener.java           |   20 +
 .../continuous/CacheContinuousQueryManager.java |   59 +-
 .../query/continuous/CounterSkipContext.java    |   78 +
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    6 +-
 .../cache/transactions/IgniteTxAdapter.java     |    2 +-
 .../cache/transactions/IgniteTxEntry.java       |   26 +-
 .../cache/transactions/IgniteTxHandler.java     |   28 +-
 .../IgniteTxImplicitSingleStateImpl.java        |   11 -
 .../transactions/IgniteTxLocalAdapter.java      |    8 +-
 .../cache/transactions/IgniteTxLocalState.java  |   10 -
 .../IgniteTxRemoteStateAdapter.java             |    7 -
 .../cache/transactions/IgniteTxState.java       |    6 -
 .../cache/transactions/IgniteTxStateImpl.java   |   32 -
 .../cache/transactions/TxLocksRequest.java      |   20 +-
 .../cache/transactions/TxLocksResponse.java     |   28 +-
 .../processors/cluster/ClusterProcessor.java    |  310 +-
 .../cluster/GridClusterStateProcessor.java      |    6 +-
 .../internal/processors/odbc/OdbcTypes.java     |  131 -
 .../internal/processors/odbc/OdbcUtils.java     |  141 -
 .../processors/odbc/SqlListenerDataTypes.java   |   30 +-
 .../processors/odbc/SqlListenerNioListener.java |   41 +-
 .../processors/odbc/SqlListenerProcessor.java   |  187 +-
 .../processors/odbc/jdbc/JdbcQueryCursor.java   |    9 +-
 .../odbc/jdbc/JdbcRequestHandler.java           |   53 +-
 .../processors/odbc/odbc/OdbcColumnMeta.java    |    1 -
 .../odbc/odbc/OdbcRequestHandler.java           |    1 -
 .../processors/odbc/odbc/OdbcTableMeta.java     |    1 -
 .../processors/odbc/odbc/OdbcTypes.java         |  131 +
 .../processors/odbc/odbc/OdbcUtils.java         |  142 +
 .../odbc/odbc/escape/OdbcEscapeUtils.java       |    2 +-
 .../platform/cache/PlatformCache.java           |    4 +-
 .../PlatformDotNetConfigurationClosure.java     |    8 +-
 .../utils/PlatformConfigurationUtils.java       |   94 +
 .../query/DynamicTableAffinityKeyMapper.java    |   92 +
 .../processors/query/GridQueryProcessor.java    |   76 +-
 .../internal/processors/query/QueryUtils.java   |  124 +-
 .../rest/client/message/GridClientNodeBean.java |   25 +
 .../handlers/cache/GridCacheCommandHandler.java |    4 +-
 .../top/GridTopologyCommandHandler.java         |   11 +-
 .../service/GridServiceProcessor.java           |   32 +-
 .../ignite/internal/util/nio/GridNioServer.java |  212 +-
 .../visor/cache/VisorCachePartitionsTask.java   |    2 +-
 .../node/VisorExecutorServiceConfiguration.java |   20 +-
 .../visor/node/VisorGridConfiguration.java      |   22 +-
 .../visor/node/VisorOdbcConfiguration.java      |  114 -
 .../node/VisorSqlConnectorConfiguration.java    |  166 +
 .../visor/query/VisorQueryIndexField.java       |   32 +-
 .../internal/visor/query/VisorRunningQuery.java |   20 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  185 +-
 .../resources/META-INF/classnames.properties    |    2 +-
 modules/core/src/test/config/log4j-test.xml     |    6 +-
 modules/core/src/test/config/log4j2-test.xml    |    6 +-
 .../src/test/config/log4j2-verbose-test.xml     |    4 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  100 +
 .../managers/IgniteDiagnosticMessagesTest.java  |  255 ++
 .../CacheAtomicSingleMessageCountSelfTest.java  |    2 +-
 .../cache/CacheDeferredDeleteQueueTest.java     |    2 +-
 ...cheDhtLocalPartitionAfterRemoveSelfTest.java |    2 +-
 ...CacheExchangeMessageDuplicatedStateTest.java |   54 +-
 .../cache/CacheOffheapMapEntrySelfTest.java     |    9 +-
 .../GridCacheConditionalDeploymentSelfTest.java |   18 +
 .../processors/cache/GridCacheLeakTest.java     |    3 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |   14 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |    3 +-
 .../processors/cache/IgniteCacheGroupsTest.java | 4319 ++++++++++++++++++
 .../cache/IgniteCachePeekModesAbstractTest.java |    2 +-
 .../processors/cache/IgniteCacheStartTest.java  |    5 +-
 .../cache/IgniteOnePhaseCommitInvokeTest.java   |    4 +-
 .../IgniteOnePhaseCommitNearReadersTest.java    |  270 ++
 ...ologyValidatorAbstractTxCacheGroupsTest.java |  126 +
 ...opologyValidatorCacheGroupsAbstractTest.java |  131 +
 ...niteTopologyValidatorGridSplitCacheTest.java |    8 +-
 ...torNearPartitionedAtomicCacheGroupsTest.java |   31 +
 ...lidatorNearPartitionedTxCacheGroupsTest.java |   31 +
 ...lidatorPartitionedAtomicCacheGroupsTest.java |   45 +
 ...gyValidatorPartitionedTxCacheGroupsTest.java |   31 +
 ...alidatorReplicatedAtomicCacheGroupsTest.java |   45 +
 ...ogyValidatorReplicatedTxCacheGroupsTest.java |   31 +
 .../IgniteTxStoreExceptionAbstractSelfTest.java |    4 +-
 .../GridCacheBinaryObjectsAbstractSelfTest.java |    2 +-
 .../GridCacheQueueCleanupSelfTest.java          |   13 +-
 .../GridCacheSetAbstractSelfTest.java           |   17 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    6 +-
 .../IgnitePartitionedQueueNoBackupsTest.java    |    6 +-
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |    6 +-
 .../CacheDiscoveryDataConcurrentJoinTest.java   |   17 +
 .../CacheLateAffinityAssignmentTest.java        |    6 +-
 ...eCacheGroupsPartitionLossPolicySelfTest.java |  355 ++
 .../IgniteCachePartitionLossPolicySelfTest.java |   19 +-
 .../IgniteCacheReadFromBackupTest.java          |    5 +-
 ...sabledMultiNodeWithGroupFullApiSelfTest.java |   35 +
 .../atomic/IgniteCacheAtomicProtocolTest.java   |  135 +-
 ...AtomicMultiNodeWithGroupFullApiSelfTest.java |   34 +
 ...nabledMultiNodeWithGroupFullApiSelfTest.java |   35 +
 .../near/GridCacheNearReadersSelfTest.java      |    4 +-
 ...tionedMultiNodeWithGroupFullApiSelfTest.java |   34 +
 .../GridCacheReplicatedPreloadSelfTest.java     |    3 +-
 .../IgniteCacheClientNearCacheExpiryTest.java   |   20 +-
 .../expiry/IgniteCacheTtlCleanupSelfTest.java   |    2 +-
 ...IgniteCacheJdbcBlobStoreNodeRestartTest.java |    3 +
 ...acheLocalAtomicWithGroupFullApiSelfTest.java |   34 +
 .../local/GridCacheLocalFullApiSelfTest.java    |    1 -
 .../GridCacheLocalWithGroupFullApiSelfTest.java |   34 +
 ...nuousQueryConcurrentPartitionUpdateTest.java |  229 +-
 ...ContinuousQueryFailoverAbstractSelfTest.java |    7 +-
 .../TxOptimisticDeadlockDetectionTest.java      |    2 +-
 .../TxPessimisticDeadlockDetectionTest.java     |    2 +-
 .../OdbcConfigurationValidationSelfTest.java    |  186 +
 .../SqlListenerProcessorValidationSelfTest.java |  184 -
 .../top/CacheTopologyCommandHandlerTest.java    |  152 +
 .../loadtest/GridSingleExecutionTest.java       |    4 +-
 .../cache/GridCacheAbstractLoadTest.java        |    4 +-
 .../loadtests/hashmap/GridCacheTestContext.java |    6 +-
 .../platform/PlatformComputeEchoTask.java       |    4 +-
 .../communication/GridCacheMessageSelfTest.java |   30 +
 .../testframework/junits/GridAbstractTest.java  |   21 +-
 .../junits/common/GridCommonAbstractTest.java   |   64 +
 .../junits/logger/GridTestLog4jLogger.java      |    4 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    8 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |   13 +
 .../testsuites/IgniteCacheTestSuite2.java       |    3 +
 .../testsuites/IgniteCacheTestSuite3.java       |    3 +
 .../testsuites/IgniteCacheTestSuite5.java       |    2 +
 .../testsuites/IgniteRestHandlerTestSuite.java  |    2 +
 .../IgniteTopologyValidatorTestSuite.java       |   14 +
 .../shuffle/streams/HadoopOffheapBuffer.java    |    2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    2 +-
 .../query/h2/database/H2PkHashIndex.java        |    4 +-
 .../query/h2/database/H2RowFactory.java         |    2 +-
 .../processors/query/h2/database/H2Tree.java    |    6 +-
 .../query/h2/database/H2TreeIndex.java          |    7 +-
 .../query/h2/ddl/DdlStatementsProcessor.java    |   32 +-
 .../processors/query/h2/opt/GridH2Table.java    |    5 +-
 .../query/h2/sql/GridSqlCreateTable.java        |   37 +-
 .../processors/query/h2/sql/GridSqlJoin.java    |    7 +
 .../query/h2/sql/GridSqlQueryParser.java        |   54 +
 .../query/h2/sql/GridSqlQuerySplitter.java      |  147 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   12 +-
 .../h2/twostep/msg/GridH2IndexRangeRequest.java |    2 +
 .../cache/IgniteCacheGroupsSqlTest.java         |  312 ++
 .../cache/IgniteCacheNoClassQuerySelfTest.java  |   25 +-
 .../cache/index/H2DynamicTableSelfTest.java     |  354 +-
 .../IgniteCacheGroupsCompareQueryTest.java      |   45 +
 ...teCacheGroupsSqlDistributedJoinSelfTest.java |   30 +
 ...roupsSqlSegmentedIndexMultiNodeSelfTest.java |   28 +
 ...iteCacheGroupsSqlSegmentedIndexSelfTest.java |   37 +
 .../query/IgniteSqlDistributedJoinSelfTest.java |    2 +-
 .../query/IgniteSqlSplitterSelfTest.java        |   97 +
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   35 +-
 ...onnectorConfigurationValidationSelfTest.java |  240 +
 .../IgniteCacheQuerySelfTestSuite.java          |    3 +
 .../IgniteCacheQuerySelfTestSuite2.java         |    9 +
 .../IgniteCacheWithIndexingTestSuite.java       |    3 +
 .../apache/ignite/logger/log4j/Log4JLogger.java |    4 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |    2 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |    2 +-
 .../impls/matrix/SparseDistributedMatrix.java   |    9 -
 .../matrix/SparseDistributedMatrixTest.java     |    9 -
 .../core-test/config/cache-query-default.xml    |   27 +-
 .../cpp/core-test/src/cache_query_test.cpp      |   47 +-
 .../ignite/cache/query/query_sql_fields.h       |   53 +-
 .../odbc-example/config/example-odbc.xml        |    6 -
 .../odbc-test/config/queries-test-default.xml   |    9 +-
 .../odbc-test/config/queries-test-noodbc-32.xml |    4 +
 .../odbc-test/config/queries-test-noodbc.xml    |    6 +-
 .../Binary/BinaryCompactFooterInteropTest.cs    |    8 +-
 .../Binary/BinaryDynamicRegistrationTest.cs     |    7 +-
 .../Cache/CacheConfigurationTest.cs             |   10 +
 .../Cache/Query/CacheDmlQueriesTest.cs          |  197 +-
 .../Cache/Query/CacheLinqTest.cs                |   12 +-
 .../Cache/Query/CacheQueriesTest.cs             |   32 +
 .../Compute/ComputeApiTest.cs                   |   25 +-
 .../Config/Log/dotnet-log4j.xml                 |    2 +-
 .../IgniteConfigurationSerializerTest.cs        |   37 +-
 .../IgniteConfigurationTest.cs                  |   60 +
 .../Apache.Ignite.Core.csproj                   |    2 +
 .../Cache/Configuration/CacheConfiguration.cs   |   23 +
 .../Cache/Query/SqlFieldsQuery.cs               |   12 +-
 .../Configuration/Package-Info.cs               |   26 +
 .../Configuration/SqlConnectorConfiguration.cs  |  159 +
 .../Datastream/IDataStreamer.cs                 |    8 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  184 +
 .../IgniteConfigurationSection.xsd              |  104 +
 .../Impl/Binary/BinaryArrayEqualityComparer.cs  |    6 +-
 .../Impl/Binary/BinaryObjectHeader.cs           |    8 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |    1 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |   10 +
 .../config/VisorConfigurationCommand.scala      |    1 +
 .../src/main/java/log4j.properties              |    2 +-
 modules/web-console/backend/.gitignore          |    1 +
 modules/web-console/backend/app/mongo.js        |   12 +
 modules/web-console/frontend/.gitignore         |    1 +
 .../app/modules/agent/AgentManager.service.js   |    2 +
 .../modules/configuration/Version.service.js    |    4 +
 .../generator/AbstractTransformer.js            |    9 +-
 .../generator/ConfigurationGenerator.js         |   35 +-
 .../generator/defaults/Cluster.service.js       |    9 +
 .../states/configuration/caches/query.pug       |    3 +-
 .../states/configuration/clusters/memory.pug    |    9 +
 .../states/configuration/clusters/odbc.pug      |    2 +-
 .../configuration/clusters/sql-connector.pug    |   62 +
 .../frontend/controllers/clusters-controller.js |    5 +-
 .../frontend/controllers/domains-controller.js  |  169 +-
 .../views/configuration/clusters.tpl.pug        |    6 +
 .../views/configuration/domains-import.tpl.pug  |    4 +-
 .../apache/ignite/console/agent/AgentUtils.java |   24 +-
 .../ignite/console/agent/db/DbColumn.java       |   17 +-
 .../ignite/console/agent/db/DbSchema.java       |   60 +
 .../apache/ignite/console/agent/db/DbTable.java |   21 +-
 .../db/dialect/DatabaseMetadataDialect.java     |   27 +-
 .../agent/db/dialect/JdbcMetadataDialect.java   |   42 +-
 .../agent/db/dialect/OracleMetadataDialect.java |  116 +-
 .../console/agent/handlers/ClusterListener.java |   28 +-
 .../agent/handlers/DatabaseListener.java        |   18 +-
 .../src/main/resources/log4j.properties         |    6 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   27 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |    3 +
 .../cache/IgniteCacheAbstractBenchmark.java     |  158 +
 .../yardstick/cache/IgniteGetAllBenchmark.java  |    3 +
 .../cache/IgniteGetAllPutAllTxBenchmark.java    |    2 +
 .../cache/IgniteGetAndPutBenchmark.java         |    2 +
 .../cache/IgniteGetAndPutTxBenchmark.java       |    2 +
 .../yardstick/cache/IgniteGetBenchmark.java     |   35 +-
 .../IgniteGetEntriesPutAllTxBenchmark.java      |    2 +
 .../yardstick/cache/IgniteInvokeBenchmark.java  |    2 +
 .../cache/IgniteInvokeTxBenchmark.java          |    2 +
 .../IgniteInvokeWithInjectionBenchmark.java     |    2 +
 .../yardstick/cache/IgnitePutAllBenchmark.java  |    2 +
 .../IgnitePutAllSerializableTxBenchmark.java    |    2 +
 .../yardstick/cache/IgnitePutBenchmark.java     |    2 +
 .../cache/IgnitePutGetBatchBenchmark.java       |    2 +
 .../yardstick/cache/IgnitePutGetBenchmark.java  |    2 +
 .../cache/IgnitePutGetEntryBenchmark.java       |    2 +
 .../cache/IgnitePutGetEntryTxBenchmark.java     |    2 +
 .../cache/IgnitePutGetTxBatchBenchmark.java     |    2 +
 .../cache/IgnitePutGetTxBenchmark.java          |    2 +
 ...IgnitePutIfAbsentIndexedValue1Benchmark.java |    2 +
 .../cache/IgnitePutIndexedValue1Benchmark.java  |    2 +
 .../cache/IgnitePutIndexedValue2Benchmark.java  |    2 +
 .../cache/IgnitePutIndexedValue8Benchmark.java  |    2 +
 .../IgnitePutRandomValueSizeBenchmark.java      |    2 +
 .../cache/IgnitePutRemoveBenchmark.java         |    2 +
 .../yardstick/cache/IgnitePutTxBenchmark.java   |    2 +
 .../cache/IgnitePutTxImplicitBenchmark.java     |    2 +
 .../cache/IgnitePutTxPrimaryOnlyBenchmark.java  |    2 +
 .../IgnitePutTxSkipLocalBackupBenchmark.java    |    2 +
 .../cache/IgnitePutValue8Benchmark.java         |    2 +
 .../IgniteReplaceIndexedValue1Benchmark.java    |    2 +
 .../cache/IgniteScanQueryBenchmark.java         |   88 +
 .../cache/IgniteSqlQueryBenchmark.java          |   16 +-
 .../IgniteSqlQueryDistributedJoinBenchmark.java |   24 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |   14 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |    8 +-
 .../IgniteSqlQueryPutSeparatedBenchmark.java    |    4 +
 .../cache/jdbc/JdbcPutGetBenchmark.java         |    4 +-
 .../IgniteCacheRandomOperationBenchmark.java    |   42 +-
 .../yardstick/cache/load/model/ModelUtil.java   |    4 +
 465 files changed, 21733 insertions(+), 5496 deletions(-)
----------------------------------------------------------------------