Merge branch 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c5b45a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c5b45a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c5b45a8 Branch: refs/heads/ignite-gg-9933 Commit: 1c5b45a8b9796c7d6760aa3d370a28604e5204f3 Parents: 8d38c52 3eca5e7 Author: anovikov <anovi...@gridgain.com> Authored: Wed Mar 18 10:23:05 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Mar 18 10:23:05 2015 +0700 ---------------------------------------------------------------------- examples/config/example-cache.xml | 42 +- examples/config/filesystem/example-igfs.xml | 11 +- .../failover/ComputeFailoverExample.java | 1 + .../datagrid/CachePopularNumbersExample.java | 6 +- .../examples/datagrid/CacheQueryExample.java | 73 +- .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java | 3 +- .../examples/datagrid/starschema/DimStore.java | 3 +- .../datagrid/starschema/FactPurchase.java | 2 + .../store/CacheNodeWithStoreStartup.java | 3 - .../store/dummy/CacheDummyPersonStore.java | 1 + .../MemcacheRestExampleNodeStartup.java | 7 - .../apache/ignite/examples/ComputeExample.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 8 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 16 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 6 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 5 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 7 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 7 +- .../clients/src/test/resources/spring-cache.xml | 15 - .../src/test/resources/spring-server-node.xml | 7 - .../test/resources/spring-server-ssl-node.xml | 4 - modules/codegen/pom.xml | 6 + .../ignite/codegen/MessageCodeGenerator.java | 8 + .../java/org/apache/ignite/IgniteCache.java | 17 +- .../org/apache/ignite/cache/query/Query.java | 72 +- .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../ignite/cache/query/QueryTypeResolver.java | 32 - .../org/apache/ignite/cache/query/SqlQuery.java | 16 +- .../query/annotations/QuerySqlFunction.java | 4 +- .../configuration/CacheConfiguration.java | 284 +-- .../configuration/CacheQueryConfiguration.java | 182 -- .../configuration/IgniteConfiguration.java | 20 +- .../configuration/QueryConfiguration.java | 227 -- .../ignite/events/CacheQueryExecutedEvent.java | 2 +- .../ignite/events/CacheQueryReadEvent.java | 2 + .../org/apache/ignite/internal/IgnitionEx.java | 3 - .../managers/communication/GridIoManager.java | 8 +- .../communication/GridIoMessageFactory.java | 26 + .../processors/cache/CacheProjection.java | 5 +- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../processors/cache/GridCacheAttributes.java | 27 - .../cache/GridCacheClearAllRunnable.java | 5 +- .../processors/cache/GridCacheContext.java | 2 + .../processors/cache/GridCacheProcessor.java | 22 +- .../processors/cache/GridCacheSwapListener.java | 5 +- .../processors/cache/GridCacheSwapManager.java | 29 +- .../processors/cache/GridCacheUtils.java | 1 - .../processors/cache/IgniteCacheProxy.java | 145 +- .../processors/cache/QueryCursorImpl.java | 116 + .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 2 + .../cache/query/GridCacheQueriesEx.java | 9 +- .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java | 4 +- .../cache/query/GridCacheQueryAdapter.java | 3 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheSqlResult.java | 29 - .../cache/query/GridCacheTwoStepQuery.java | 2 +- .../processors/cache/query/QueryCursorImpl.java | 97 - .../continuous/CacheContinuousQueryHandler.java | 3 + .../query/jdbc/GridCacheQueryJdbcTask.java | 241 +- .../IgniteCacheObjectProcessorImpl.java | 6 +- .../internal/processors/igfs/IgfsProcessor.java | 6 - .../processors/query/GridQueryIndexing.java | 34 +- .../processors/query/GridQueryProcessor.java | 523 ++--- .../query/GridQueryTypeDescriptor.java | 18 +- .../messages/GridQueryCancelRequest.java | 114 + .../twostep/messages/GridQueryFailResponse.java | 140 ++ .../messages/GridQueryNextPageRequest.java | 167 ++ .../messages/GridQueryNextPageResponse.java | 240 ++ .../h2/twostep/messages/GridQueryRequest.java | 211 ++ .../visor/cache/VisorCacheConfiguration.java | 35 +- .../cache/VisorCacheDefaultConfiguration.java | 1 - .../visor/cache/VisorCacheMetadataTask.java | 1 - .../cache/VisorCacheMetricsCollectorTask.java | 1 - .../visor/cache/VisorCachePreloadTask.java | 1 - .../cache/VisorCacheQueryConfiguration.java | 123 ++ .../visor/cache/VisorCacheResetMetricsTask.java | 1 - .../visor/cache/VisorCacheSwapBackupsTask.java | 1 - .../node/VisorCacheQueryConfiguration.java | 106 - .../visor/node/VisorGridConfiguration.java | 11 - .../visor/node/VisorQueryConfiguration.java | 138 -- .../spi/indexing/IndexingQueryFilter.java | 2 +- .../ignite/spi/indexing/noop/package.html | 24 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../spring-cache-client-benchmark-1.xml | 2 - .../spring-cache-client-benchmark-2.xml | 2 - .../spring-cache-client-benchmark-3.xml | 2 - .../core/src/test/config/discovery-stress.xml | 1 - modules/core/src/test/config/example-cache.xml | 3 - modules/core/src/test/config/igfs-loopback.xml | 2 - modules/core/src/test/config/igfs-shmem.xml | 2 - .../src/test/config/load/cache-benchmark.xml | 2 - .../test/config/load/cache-client-benchmark.xml | 2 - modules/core/src/test/config/log4j-test.xml | 6 + .../config/spring-cache-put-remove-load.xml | 2 - .../test/config/websession/example-cache.xml | 164 ++ .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 2 - .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 - .../GridDiscoveryManagerAliveCacheSelfTest.java | 1 - .../cache/GridCacheAbstractFullApiSelfTest.java | 1 - .../cache/GridCacheAbstractSelfTest.java | 8 + .../GridCacheConcurrentTxMultiNodeTest.java | 5 +- ...idCacheConfigurationConsistencySelfTest.java | 23 - ...ridCacheConfigurationValidationSelfTest.java | 3 + .../GridCacheDeploymentOffHeapSelfTest.java | 1 - .../GridCacheFieldsQueryNoDataSelfTest.java | 83 - .../cache/GridCacheKeyCheckSelfTest.java | 1 - .../processors/cache/GridCacheLeakTest.java | 1 - .../cache/GridCacheMemoryModeSelfTest.java | 1 - .../cache/GridCacheOffHeapSelfTest.java | 5 +- .../processors/cache/GridCacheOffHeapTest.java | 1 - .../cache/GridCacheP2PUndeploySelfTest.java | 2 - .../cache/GridCachePutAllFailoverSelfTest.java | 1 - .../cache/GridCacheQueryEmbeddedValue.java | 2 + .../cache/GridCacheQueryIndexSelfTest.java | 126 -- .../GridCacheQueryIndexingDisabledSelfTest.java | 1 - .../GridCacheQueryInternalKeysSelfTest.java | 1 - .../processors/cache/GridCacheStopSelfTest.java | 1 - .../processors/cache/GridCacheTestValue.java | 2 +- .../processors/cache/GridCacheTestValue2.java | 2 + .../IgniteTxExceptionAbstractSelfTest.java | 1 - .../cache/IgniteTxMultiNodeAbstractTest.java | 4 + ...tractPartitionedByteArrayValuesSelfTest.java | 2 - .../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 1 - ...idCachePartitionedHitsAndMissesSelfTest.java | 6 - ...hePartitionedQueryMultiThreadedSelfTest.java | 306 --- ...stractReplicatedByteArrayValuesSelfTest.java | 2 - ...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 1 - ...heNearOnlyLruNearEvictionPolicySelfTest.java | 1 - .../GridCacheLocalByteArrayValuesSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 46 +- ...dCacheContinuousQueryReplicatedSelfTest.java | 6 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 409 ---- ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 - ...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 - ...cheReduceFieldsQueryPartitionedSelfTest.java | 59 - ...acheReduceFieldsQueryReplicatedSelfTest.java | 37 - .../processors/igfs/IgfsAbstractSelfTest.java | 2 - ...sCachePerBlockLruEvictionPolicySelfTest.java | 4 - .../processors/igfs/IgfsCacheSelfTest.java | 1 - .../igfs/IgfsDataManagerSelfTest.java | 1 - .../igfs/IgfsMetaManagerSelfTest.java | 1 - .../processors/igfs/IgfsMetricsSelfTest.java | 4 - .../processors/igfs/IgfsModesSelfTest.java | 4 - .../processors/igfs/IgfsProcessorSelfTest.java | 1 - .../igfs/IgfsProcessorValidationSelfTest.java | 7 - ...IpcEndpointRegistrationAbstractSelfTest.java | 2 - .../processors/igfs/IgfsSizeSelfTest.java | 2 - .../processors/igfs/IgfsStreamsSelfTest.java | 1 - .../processors/igfs/IgfsTaskSelfTest.java | 2 - .../IgfsAbstractRecordResolverSelfTest.java | 2 - .../cache/GridCacheCommandHandlerSelfTest.java | 1 - .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 1 - .../loadtests/colocation/spring-colocation.xml | 2 - .../GridContinuousOperationsLoadTest.java | 2 +- .../ignite/loadtests/mapper/TestObject.java | 2 +- .../swap/GridSwapEvictAllBenchmark.java | 1 - .../marshaller/GridMarshallerAbstractTest.java | 1 - .../testframework/junits/GridAbstractTest.java | 1 - .../webapp/META-INF/ignite-webapp-config.xml | 60 - .../query/h2/GridH2IndexingGeoSelfTest.java | 7 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 - .../igfs/HadoopIgfsDualAbstractSelfTest.java | 2 - ...oopSecondaryFileSystemConfigurationTest.java | 4 - .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 1 - .../IgniteHadoopFileSystemAbstractSelfTest.java | 4 - .../IgniteHadoopFileSystemClientSelfTest.java | 2 - ...IgniteHadoopFileSystemHandshakeSelfTest.java | 2 - .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 - ...niteHadoopFileSystemLoggerStateSelfTest.java | 2 - ...teHadoopFileSystemSecondaryModeSelfTest.java | 4 - .../processors/query/h2/IgniteH2Indexing.java | 843 +++---- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 16 +- .../query/h2/opt/GridLuceneIndex.java | 8 +- .../processors/query/h2/sql/GridSqlColumn.java | 6 + .../processors/query/h2/sql/GridSqlElement.java | 48 +- .../query/h2/sql/GridSqlFunction.java | 26 +- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../processors/query/h2/sql/GridSqlJoin.java | 30 +- .../query/h2/sql/GridSqlOperationType.java | 6 +- .../query/h2/sql/GridSqlQueryParser.java | 124 +- .../query/h2/sql/GridSqlQuerySplitter.java | 198 +- .../processors/query/h2/sql/GridSqlSelect.java | 100 +- .../query/h2/sql/GridSqlSortColumn.java | 76 + .../processors/query/h2/sql/GridSqlType.java | 94 + .../query/h2/twostep/GridMapQueryExecutor.java | 436 +++- .../query/h2/twostep/GridMergeIndex.java | 111 +- .../h2/twostep/GridMergeIndexUnsorted.java | 44 +- .../h2/twostep/GridReduceQueryExecutor.java | 415 +++- .../query/h2/twostep/GridResultPage.java | 47 +- .../twostep/messages/GridNextPageRequest.java | 70 - .../twostep/messages/GridNextPageResponse.java | 191 -- .../query/h2/twostep/messages/GridQueryAck.java | 45 - .../twostep/messages/GridQueryFailResponse.java | 57 - .../h2/twostep/messages/GridQueryRequest.java | 72 - .../GridCacheAbstractFieldsQuerySelfTest.java | 8 - .../cache/GridCacheAbstractQuerySelfTest.java | 2058 ------------------ .../cache/GridCacheCrossCacheQuerySelfTest.java | 150 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 411 ---- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 12 +- ...idCacheQueryEvictsMultiThreadedSelfTest.java | 28 - .../GridCacheQueryIndexDisabledSelfTest.java | 257 +++ .../cache/GridCacheQueryLoadSelfTest.java | 355 --- .../cache/GridCacheQueryMetricsSelfTest.java | 6 - .../GridCacheQueryMultiThreadedSelfTest.java | 869 -------- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 - ...dCacheQueryOffheapMultiThreadedSelfTest.java | 28 - .../cache/GridCacheQuerySimpleBenchmark.java | 196 ++ .../cache/GridCacheQueryTestValue.java | 2 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 8 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 142 -- .../processors/cache/GridCacheSwapSelfTest.java | 5 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 13 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 778 +++++++ .../cache/IgniteCacheAbstractQuerySelfTest.java | 1550 +++++++++++++ .../IgniteCacheFieldsQueryNoDataSelfTest.java | 84 + ...hePartitionedQueryMultiThreadedSelfTest.java | 311 +++ ...teCacheQueryEvictsMultiThreadedSelfTest.java | 28 + .../cache/IgniteCacheQueryIndexSelfTest.java | 133 ++ .../cache/IgniteCacheQueryLoadSelfTest.java | 339 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 747 +++++++ ...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 + ...eCacheQueryOffheapMultiThreadedSelfTest.java | 28 + ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 197 ++ .../GridCacheAtomicFieldsQuerySelfTest.java | 66 - ...cheAtomicNearEnabledFieldsQuerySelfTest.java | 32 - ...GridCacheAtomicNearEnabledQuerySelfTest.java | 38 - .../near/GridCacheAtomicQuerySelfTest.java | 38 - ...CachePartitionedQueryP2PEnabledSelfTest.java | 34 - .../near/GridCachePartitionedQuerySelfTest.java | 479 ---- .../near/GridCacheQueryNodeRestartSelfTest.java | 225 -- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 59 + ...cheAtomicNearEnabledFieldsQuerySelfTest.java | 32 + ...niteCacheAtomicNearEnabledQuerySelfTest.java | 38 + .../near/IgniteCacheAtomicQuerySelfTest.java | 38 + ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 + ...niteCachePartitionedFieldsQuerySelfTest.java | 57 + ...achePartitionedQueryP2PDisabledSelfTest.java | 34 + .../IgniteCachePartitionedQuerySelfTest.java | 133 ++ .../IgniteCacheQueryNodeRestartSelfTest.java | 220 ++ .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- ...dCacheReplicatedQueryP2PEnabledSelfTest.java | 34 - .../GridCacheReplicatedQuerySelfTest.java | 683 ------ ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 + ...gniteCacheReplicatedFieldsQuerySelfTest.java | 79 + ...CacheReplicatedQueryP2PDisabledSelfTest.java | 34 + .../IgniteCacheReplicatedQuerySelfTest.java | 576 +++++ .../GridCacheLocalAtomicQuerySelfTest.java | 32 - .../GridCacheLocalFieldsQuerySelfTest.java | 38 - .../local/GridCacheLocalQuerySelfTest.java | 107 - .../IgniteCacheLocalAtomicQuerySelfTest.java | 32 + .../IgniteCacheLocalFieldsQuerySelfTest.java | 38 + .../local/IgniteCacheLocalQuerySelfTest.java | 85 + ...dCacheAbstractReduceFieldsQuerySelfTest.java | 413 ++++ ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 + ...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 + ...cheReduceFieldsQueryPartitionedSelfTest.java | 59 + ...acheReduceFieldsQueryReplicatedSelfTest.java | 37 + .../query/h2/GridH2IndexRebuildTest.java | 8 + .../query/h2/GridH2IndexingOffheapSelfTest.java | 20 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 98 +- .../query/h2/sql/GridQueryParsingTest.java | 66 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 10 - .../IgniteCacheQuerySelfTestSuite.java | 55 +- .../scalar/src/test/resources/spring-cache.xml | 67 +- .../tests/ScalarAffinityRoutingSpec.scala | 6 +- .../ignite/scalar/tests/ScalarCacheSpec.scala | 4 +- .../commands/cache/VisorCacheCommand.scala | 53 +- .../config/VisorConfigurationCommand.scala | 15 - .../commands/cache/VisorCacheCommandSpec.scala | 17 +- .../internal/websession/WebSessionSelfTest.java | 2 +- modules/yardstick/config/ignite-base-config.xml | 46 +- .../yardstick/config/ignite-store-config.xml | 4 - modules/yardstick/pom.xml | 8 +- 280 files changed, 11275 insertions(+), 10418 deletions(-) ----------------------------------------------------------------------
