Merge branches 'sprint-1' and 'sprint-1-start-nodes' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1-start-nodes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a6b799e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a6b799e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a6b799e Branch: refs/heads/sprint-1-start-nodes Commit: 1a6b799ed685b6c02c3485887f97b39d864b7bdc Parents: b075762 519daee Author: anovikov <anovi...@gridgain.com> Authored: Sun Feb 15 17:45:54 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Sun Feb 15 17:45:54 2015 +0700 ---------------------------------------------------------------------- examples/config/example-cache.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 69 +- .../datagrid/CacheDataLoaderExample.java | 1 - .../datagrid/CachePopularNumbersExample.java | 31 +- .../examples/datagrid/CacheQueryExample.java | 209 ++--- .../starschema/CacheStarSchemaExample.java | 41 +- .../datagrid/starschema/DimProduct.java | 6 +- .../examples/datagrid/starschema/DimStore.java | 6 +- .../datagrid/starschema/FactPurchase.java | 10 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 15 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 13 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 32 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 39 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 11 +- .../clients/src/test/resources/spring-cache.xml | 2 +- .../CommunicationMessageCodeGenerator.java | 212 ++--- .../java/org/apache/ignite/IgniteCache.java | 44 +- .../org/apache/ignite/IgniteDataLoader.java | 22 +- .../apache/ignite/cache/CacheProjection.java | 4 +- .../cache/query/CacheContinuousQuery.java | 284 ------ .../cache/query/CacheContinuousQueryEntry.java | 49 - .../apache/ignite/cache/query/CacheQueries.java | 152 ---- .../apache/ignite/cache/query/CacheQuery.java | 294 ------ .../cache/query/CacheQueryConfiguration.java | 180 ---- .../ignite/cache/query/CacheQueryFuture.java | 66 -- .../cache/query/CacheQueryGroupIndex.java | 49 - .../ignite/cache/query/CacheQueryMetrics.java | 60 -- .../ignite/cache/query/CacheQuerySqlField.java | 123 --- .../cache/query/CacheQuerySqlFunction.java | 67 -- .../ignite/cache/query/CacheQueryTextField.java | 33 - .../ignite/cache/query/CacheQueryType.java | 47 - .../cache/query/CacheQueryTypeResolver.java | 32 - .../ignite/cache/query/ContinuousQuery.java | 314 +++++++ .../org/apache/ignite/cache/query/Query.java | 143 +++ .../cache/query/QueryAffinityPredicate.java | 135 --- .../cache/query/QueryContinuousPredicate.java | 215 ----- .../apache/ignite/cache/query/QueryCursor.java | 22 +- .../apache/ignite/cache/query/QueryMetrics.java | 62 ++ .../ignite/cache/query/QueryPredicate.java | 76 -- .../apache/ignite/cache/query/QueryReducer.java | 30 - .../ignite/cache/query/QuerySqlPredicate.java | 118 --- .../ignite/cache/query/QueryTextPredicate.java | 90 -- .../ignite/cache/query/QueryTypeResolver.java | 32 + .../apache/ignite/cache/query/ScanQuery.java | 76 ++ .../org/apache/ignite/cache/query/SpiQuery.java | 64 ++ .../ignite/cache/query/SqlFieldsQuery.java | 98 ++ .../org/apache/ignite/cache/query/SqlQuery.java | 142 +++ .../apache/ignite/cache/query/TextQuery.java | 119 +++ .../cache/query/annotations/QuerySqlField.java | 8 +- .../query/annotations/QuerySqlFunction.java | 4 +- .../cache/query/annotations/QueryTextField.java | 8 +- .../configuration/CacheConfiguration.java | 6 +- .../configuration/CacheQueryConfiguration.java | 182 ++++ .../configuration/IgniteConfiguration.java | 10 +- .../configuration/QueryConfiguration.java | 3 +- .../ignite/events/CacheQueryExecutedEvent.java | 9 +- .../ignite/events/CacheQueryReadEvent.java | 9 +- .../org/apache/ignite/events/EventType.java | 2 +- .../ignite/internal/GridJobCancelRequest.java | 43 +- .../ignite/internal/GridJobExecuteRequest.java | 154 ++-- .../ignite/internal/GridJobExecuteResponse.java | 67 +- .../ignite/internal/GridJobSiblingsRequest.java | 39 +- .../internal/GridJobSiblingsResponse.java | 34 +- .../ignite/internal/GridTaskCancelRequest.java | 33 +- .../ignite/internal/GridTaskSessionRequest.java | 44 +- .../org/apache/ignite/internal/IgnitionEx.java | 5 +- .../internal/direct/DirectByteBufferStream.java | 274 ++---- .../internal/direct/DirectMessageReader.java | 23 +- .../internal/direct/DirectMessageWriter.java | 57 +- .../direct/DirectMessageWriterState.java | 113 +++ .../checkpoint/GridCheckpointRequest.java | 43 +- .../managers/communication/GridIoManager.java | 6 +- .../managers/communication/GridIoMessage.java | 73 +- .../communication/GridIoMessageFactory.java | 10 - .../communication/GridIoUserMessage.java | 78 +- .../deployment/GridDeploymentInfoBean.java | 65 +- .../deployment/GridDeploymentRequest.java | 58 +- .../deployment/GridDeploymentResponse.java | 43 +- .../eventstorage/GridEventStorageMessage.java | 88 +- .../managers/indexing/GridIndexingManager.java | 4 +- .../affinity/GridAffinityProcessor.java | 36 +- .../processors/cache/CacheEntryEvent.java | 78 -- .../processors/cache/CacheMetricsImpl.java | 8 +- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../processors/cache/GridCacheAdapter.java | 36 +- .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheEntryInfo.java | 9 + .../cache/GridCacheEvictionRequest.java | 48 +- .../cache/GridCacheEvictionResponse.java | 52 +- .../processors/cache/GridCacheMapEntry.java | 185 ++-- .../processors/cache/GridCacheMessage.java | 35 +- .../processors/cache/GridCacheMvcc.java | 8 +- .../cache/GridCacheMvccCandidate.java | 18 - .../processors/cache/GridCacheProcessor.java | 8 +- .../processors/cache/GridCacheProjectionEx.java | 5 + .../cache/GridCacheProjectionImpl.java | 1 - .../processors/cache/GridCacheProxyImpl.java | 1 - .../processors/cache/GridCacheReturn.java | 57 ++ .../cache/GridCacheSharedContext.java | 2 + .../processors/cache/GridCacheUtils.java | 15 - .../processors/cache/GridCacheValueBytes.java | 36 +- .../processors/cache/IgniteCacheProxy.java | 356 +++++++- .../CacheDataStructuresManager.java | 81 +- .../distributed/GridCacheCommittedTxInfo.java | 2 - ...idCacheOptimisticCheckPreparedTxRequest.java | 57 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 47 +- .../GridCachePerThreadTxCommitBuffer.java | 186 ---- ...dCachePessimisticCheckCommittedTxFuture.java | 383 -------- ...CachePessimisticCheckCommittedTxRequest.java | 309 ------- ...achePessimisticCheckCommittedTxResponse.java | 253 ------ .../distributed/GridCacheTtlUpdateRequest.java | 78 +- .../distributed/GridCacheTxCommitBuffer.java | 60 -- .../distributed/GridDistributedBaseMessage.java | 58 +- .../distributed/GridDistributedLockRequest.java | 273 ++---- .../GridDistributedLockResponse.java | 54 +- .../GridDistributedTxFinishRequest.java | 237 +---- .../GridDistributedTxFinishResponse.java | 43 +- .../distributed/GridDistributedTxMapping.java | 6 +- .../GridDistributedTxPrepareRequest.java | 183 ++-- .../GridDistributedTxPrepareResponse.java | 45 +- .../GridDistributedTxRemoteAdapter.java | 58 +- .../GridDistributedUnlockRequest.java | 43 +- .../dht/GridDhtAffinityAssignmentRequest.java | 35 +- .../dht/GridDhtAffinityAssignmentResponse.java | 46 +- .../distributed/dht/GridDhtCacheEntry.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 156 +--- .../distributed/dht/GridDhtLockRequest.java | 125 +-- .../distributed/dht/GridDhtLockResponse.java | 66 +- .../dht/GridDhtTransactionalCacheAdapter.java | 20 +- .../distributed/dht/GridDhtTxFinishFuture.java | 44 +- .../distributed/dht/GridDhtTxFinishRequest.java | 316 ++----- .../dht/GridDhtTxFinishResponse.java | 37 +- .../cache/distributed/dht/GridDhtTxLocal.java | 56 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 109 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 654 +++++++++----- .../dht/GridDhtTxPrepareRequest.java | 150 ++-- .../dht/GridDhtTxPrepareResponse.java | 73 +- .../cache/distributed/dht/GridDhtTxRemote.java | 12 +- .../distributed/dht/GridDhtUnlockRequest.java | 42 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../GridDhtAtomicDeferredUpdateResponse.java | 41 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 179 ++-- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 59 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 169 ++-- .../atomic/GridNearAtomicUpdateResponse.java | 105 +-- .../colocated/GridDhtColocatedLockFuture.java | 41 - .../dht/preloader/GridDhtForceKeysRequest.java | 57 +- .../dht/preloader/GridDhtForceKeysResponse.java | 58 +- .../GridDhtPartitionDemandMessage.java | 67 +- .../preloader/GridDhtPartitionExchangeId.java | 41 +- .../GridDhtPartitionSupplyMessage.java | 73 +- .../GridDhtPartitionsAbstractMessage.java | 32 +- .../preloader/GridDhtPartitionsFullMessage.java | 43 +- .../GridDhtPartitionsSingleMessage.java | 38 +- .../GridDhtPartitionsSingleRequest.java | 26 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearGetRequest.java | 114 +-- .../distributed/near/GridNearGetResponse.java | 73 +- .../distributed/near/GridNearLockFuture.java | 8 - .../distributed/near/GridNearLockRequest.java | 160 ++-- .../distributed/near/GridNearLockResponse.java | 69 +- .../near/GridNearTransactionalCache.java | 3 +- .../near/GridNearTxFinishFuture.java | 2 - .../near/GridNearTxFinishRequest.java | 93 +- .../near/GridNearTxFinishResponse.java | 48 +- .../cache/distributed/near/GridNearTxLocal.java | 68 +- .../near/GridNearTxPrepareFuture.java | 421 +++++---- .../near/GridNearTxPrepareRequest.java | 165 ++-- .../near/GridNearTxPrepareResponse.java | 170 ++-- .../distributed/near/GridNearUnlockRequest.java | 26 +- .../processors/cache/query/CacheQueries.java | 143 +++ .../processors/cache/query/CacheQuery.java | 296 +++++++ .../cache/query/CacheQueryFuture.java | 66 ++ .../processors/cache/query/CacheQueryType.java | 47 + .../query/GridCacheDistributedQueryManager.java | 1 - .../cache/query/GridCacheLocalQueryManager.java | 1 - .../cache/query/GridCacheQueriesEx.java | 1 - .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java | 14 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryErrorFuture.java | 1 - .../query/GridCacheQueryFutureAdapter.java | 1 - .../cache/query/GridCacheQueryManager.java | 36 +- .../query/GridCacheQueryMetricsAdapter.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 140 ++- .../cache/query/GridCacheQueryResponse.java | 73 +- .../cache/query/GridCacheQueryType.java | 4 +- .../cache/query/GridCacheSqlMetadata.java | 2 +- .../processors/cache/query/QueryCursorImpl.java | 87 ++ .../continuous/CacheContinuousQueryEntry.java | 234 +++++ .../continuous/CacheContinuousQueryEvent.java | 87 ++ .../CacheContinuousQueryFilterEx.java | 31 + .../continuous/CacheContinuousQueryHandler.java | 490 ++++++++++ .../CacheContinuousQueryListener.java | 47 + .../continuous/CacheContinuousQueryManager.java | 664 ++++++++++++++ .../GridCacheContinuousQueryAdapter.java | 319 ------- .../GridCacheContinuousQueryEntry.java | 344 ------- .../GridCacheContinuousQueryFilterEx.java | 33 - .../GridCacheContinuousQueryHandler.java | 570 ------------ .../GridCacheContinuousQueryListener.java | 41 - .../GridCacheContinuousQueryManager.java | 784 ---------------- .../query/jdbc/GridCacheQueryJdbcTask.java | 1 - .../cache/transactions/IgniteInternalTx.java | 7 - .../cache/transactions/IgniteTxAdapter.java | 60 +- .../cache/transactions/IgniteTxEntry.java | 17 - .../cache/transactions/IgniteTxHandler.java | 688 +++----------- .../transactions/IgniteTxLocalAdapter.java | 260 +++--- .../cache/transactions/IgniteTxLocalEx.java | 5 + .../cache/transactions/IgniteTxManager.java | 210 +---- .../cache/transactions/IgniteTxProxyImpl.java | 14 +- .../cache/version/GridCacheVersion.java | 46 +- .../clock/GridClockDeltaSnapshotMessage.java | 42 +- .../processors/clock/GridClockDeltaVersion.java | 36 +- .../continuous/GridContinuousMessage.java | 57 +- .../dataload/GridDataLoadRequest.java | 102 +-- .../dataload/GridDataLoadResponse.java | 43 +- .../dataload/IgniteDataLoaderImpl.java | 101 ++- .../datastructures/GridCacheSetImpl.java | 1 - .../processors/hadoop/GridHadoopJobId.java | 3 +- .../processors/igfs/IgfsAckMessage.java | 48 +- .../internal/processors/igfs/IgfsBlockKey.java | 48 +- .../processors/igfs/IgfsBlocksMessage.java | 51 +- .../igfs/IgfsCommunicationMessage.java | 10 +- .../processors/igfs/IgfsDeleteMessage.java | 43 +- .../processors/igfs/IgfsFileAffinityRange.java | 53 +- .../igfs/IgfsFragmentizerRequest.java | 46 +- .../igfs/IgfsFragmentizerResponse.java | 37 +- .../processors/igfs/IgfsSyncMessage.java | 42 +- .../processors/query/GridQueryIndexing.java | 15 +- .../processors/query/GridQueryProcessor.java | 151 +++- .../cache/GridCacheQueryCommandHandler.java | 1 - .../handlers/task/GridTaskResultRequest.java | 39 +- .../handlers/task/GridTaskResultResponse.java | 49 +- .../service/GridServiceProcessor.java | 75 +- .../streamer/GridStreamerCancelRequest.java | 33 +- .../streamer/GridStreamerExecutionRequest.java | 75 +- .../streamer/GridStreamerResponse.java | 38 +- .../util/GridBoundedConcurrentOrderedMap.java | 20 +- .../ignite/internal/util/GridByteArrayList.java | 36 +- .../ignite/internal/util/GridLongList.java | 36 +- .../ignite/internal/util/IgniteUtils.java | 8 +- .../internal/util/ipc/IpcToNioAdapter.java | 4 +- .../internal/util/nio/GridDirectParser.java | 7 +- .../ignite/internal/util/nio/GridNioServer.java | 32 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 4 +- .../util/nio/GridTcpCommunicationClient.java | 4 +- .../apache/ignite/internal/visor/VisorJob.java | 3 +- .../internal/visor/VisorMultiNodeTask.java | 9 +- .../ignite/internal/visor/cache/VisorCache.java | 8 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../visor/cache/VisorCacheConfiguration.java | 18 - .../visor/cache/VisorCacheDgcConfiguration.java | 97 -- .../visor/cache/VisorCacheLoadTask.java | 4 +- .../internal/visor/cache/VisorCacheMetrics.java | 18 +- .../visor/cache/VisorCacheQueryMetrics.java | 2 +- .../cache/VisorCacheStoreConfiguration.java | 7 +- .../VisorCacheWriteBehindConfiguration.java | 6 +- .../compute/VisorComputeMonitoringHolder.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 17 +- .../visor/debug/VisorThreadLockInfo.java | 12 +- .../visor/debug/VisorThreadMonitorInfo.java | 6 +- .../event/VisorGridAuthenticationEvent.java | 10 +- .../event/VisorGridAuthorizationEvent.java | 10 +- .../visor/event/VisorGridDeploymentEvent.java | 10 +- .../visor/event/VisorGridDiscoveryEvent.java | 10 +- .../internal/visor/event/VisorGridEvent.java | 18 +- .../internal/visor/event/VisorGridJobEvent.java | 30 +- .../event/VisorGridSecuritySessionEvent.java | 10 +- .../visor/event/VisorGridTaskEvent.java | 30 +- .../internal/visor/file/VisorFileBlock.java | 10 +- .../internal/visor/file/VisorFileBlockTask.java | 10 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 3 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 6 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 10 +- .../visor/igfs/VisorIgfsProfilerTask.java | 12 + .../VisorIgfsProfilerUniformityCounters.java | 19 +- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../visor/log/VisorLogSearchResult.java | 20 +- .../internal/visor/misc/VisorNopTask.java | 3 + .../visor/node/VisorAtomicConfiguration.java | 104 +++ .../visor/node/VisorBasicConfiguration.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 86 +- .../visor/node/VisorGridConfiguration.java | 37 + .../visor/node/VisorIgfsConfiguration.java | 48 +- .../visor/node/VisorMetricsConfiguration.java | 10 +- .../node/VisorNodeDataCollectorJobResult.java | 67 +- .../visor/node/VisorNodeDataCollectorTask.java | 71 +- .../node/VisorNodeDataCollectorTaskArg.java | 19 +- .../node/VisorNodeDataCollectorTaskResult.java | 18 +- .../node/VisorNodeEventsCollectorTask.java | 33 +- .../visor/node/VisorRestConfiguration.java | 6 +- .../visor/node/VisorSpisConfiguration.java | 9 +- .../node/VisorTransactionConfiguration.java | 158 ++++ .../visor/query/VisorQueryCleanupTask.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 5 +- .../internal/visor/query/VisorQueryUtils.java | 2 +- .../streamer/VisorStreamerConfiguration.java | 6 +- .../visor/streamer/VisorStreamerMetrics.java | 6 +- .../internal/visor/util/VisorMimeTypes.java | 51 +- .../internal/visor/util/VisorTaskUtils.java | 48 +- .../optimized/optimized-classnames.properties | 44 +- .../communication/MessageAdapter.java | 108 ++- .../extensions/communication/MessageReader.java | 25 +- .../extensions/communication/MessageWriter.java | 63 +- .../jobstealing/JobStealingRequest.java | 33 +- .../communication/tcp/TcpCommunicationSpi.java | 50 +- .../spi/indexing/GridIndexingQueryFilter.java | 34 - .../ignite/spi/indexing/GridIndexingSpi.java | 112 --- .../spi/indexing/GridNoopIndexingSpi.java | 66 -- .../spi/indexing/IndexingQueryFilter.java | 34 + .../apache/ignite/spi/indexing/IndexingSpi.java | 113 +++ .../spi/indexing/noop/NoopIndexingSpi.java | 68 ++ .../GridCommunicationSendMessageSelfTest.java | 13 +- .../communication/GridIoManagerSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 171 ++-- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 3 +- .../GridCacheConcurrentTxMultiNodeTest.java | 23 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 5 +- .../cache/GridCacheLuceneQueryIndexTest.java | 6 +- .../cache/GridCacheOffHeapSelfTest.java | 4 +- .../cache/GridCacheQueryEmbeddedValue.java | 10 +- .../cache/GridCacheQueryIndexSelfTest.java | 5 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 16 +- .../processors/cache/GridCacheTestValue.java | 4 +- .../processors/cache/GridCacheTestValue2.java | 4 +- .../cache/IgniteCacheInvokeAbstractTest.java | 6 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../IgniteClientAffinityAssignmentSelfTest.java | 164 ++++ .../cache/IgnitePutAllLargeBatchSelfTest.java | 301 +++++++ ...tAllUpdateNonPreloadedPartitionSelfTest.java | 129 +++ .../IgniteTxExceptionAbstractSelfTest.java | 43 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- .../distributed/GridCacheEventAbstractTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 29 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 2 +- .../near/GridCacheNearMetricsSelfTest.java | 8 +- .../near/GridCacheNearReadersSelfTest.java | 2 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 11 +- ...eReplicatedGetAndTransformStoreSelfTest.java | 8 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 5 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- ...heConcurrentEvictionConsistencySelfTest.java | 8 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 6 +- ...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 888 ++++--------------- ...dCacheContinuousQueryReplicatedSelfTest.java | 96 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 13 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +- .../GridDataLoaderProcessorSelfTest.java | 95 +- .../communication/GridTestMessage.java | 13 +- .../GridContinuousOperationsLoadTest.java | 54 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../ignite/loadtests/mapper/TestObject.java | 6 +- .../spi/communication/GridTestMessage.java | 48 +- .../testsuites/IgniteCacheRestartTestSuite.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 17 +- .../webapp/META-INF/ignite-webapp-config.xml | 8 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 7 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 31 +- .../processors/query/h2/IgniteH2Indexing.java | 34 +- .../query/h2/opt/GridH2IndexBase.java | 6 +- .../query/h2/opt/GridH2TreeIndex.java | 2 +- .../query/h2/opt/GridLuceneIndex.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 14 +- .../cache/GridCacheAbstractQuerySelfTest.java | 32 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 18 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 410 +++++++++ .../cache/GridCacheQueryLoadSelfTest.java | 4 +- .../cache/GridCacheQueryMetricsSelfTest.java | 5 +- .../GridCacheQueryMultiThreadedSelfTest.java | 4 +- .../cache/GridCacheQueryTestValue.java | 20 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 5 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 2 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 2 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 4 +- .../local/GridCacheLocalQuerySelfTest.java | 2 +- .../query/h2/GridH2IndexRebuildTest.java | 15 +- .../query/h2/sql/GridQueryParsingTest.java | 17 +- .../loadtests/h2indexing/GridTestEntity.java | 6 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 1 - .../IgniteCacheQuerySelfTestSuite.java | 1 + .../scala/org/apache/ignite/scalar/scalar.scala | 10 +- .../commands/cache/VisorCacheCommand.scala | 5 - .../config/VisorConfigurationCommand.scala | 10 +- .../commands/cache/VisorCacheCommandSpec.scala | 43 +- .../config/benchmark-multicast.properties | 2 +- .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- .../cache/IgniteSqlQueryPutBenchmark.java | 2 +- .../yardstick/cache/model/Organization.java | 6 +- .../ignite/yardstick/cache/model/Person.java | 12 +- pom.xml | 4 +- 408 files changed, 11190 insertions(+), 14554 deletions(-) ----------------------------------------------------------------------
