Merge branches 'ignite-nio' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-nio
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c09107ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c09107ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c09107ba Branch: refs/heads/sprint-1 Commit: c09107ba20c0a92db1ca6e848e60d51e3d918a22 Parents: 35e64ef a8573b4 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Feb 14 23:59:26 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Feb 14 23:59:26 2015 -0800 ---------------------------------------------------------------------- examples/config/example-cache.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 69 +- .../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 +- .../java/org/apache/ignite/IgniteCache.java | 44 +- .../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/internal/IgnitionEx.java | 5 +- .../managers/indexing/GridIndexingManager.java | 4 +- .../processors/cache/CacheEntryEvent.java | 78 -- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../processors/cache/GridCacheAdapter.java | 1 - .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheMapEntry.java | 26 +- .../processors/cache/GridCacheProcessor.java | 8 +- .../processors/cache/GridCacheProjectionEx.java | 5 + .../cache/GridCacheProjectionImpl.java | 1 - .../processors/cache/GridCacheProxyImpl.java | 1 - .../processors/cache/IgniteCacheProxy.java | 356 +++++++- .../CacheDataStructuresManager.java | 81 +- .../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/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 - .../datastructures/GridCacheSetImpl.java | 1 - .../processors/hadoop/GridHadoopJobId.java | 3 +- .../processors/query/GridQueryIndexing.java | 15 +- .../processors/query/GridQueryProcessor.java | 151 +++- .../cache/GridCacheQueryCommandHandler.java | 1 - .../service/GridServiceProcessor.java | 75 +- .../visor/cache/VisorCacheQueryMetrics.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 1 - .../internal/visor/query/VisorQueryUtils.java | 2 +- .../optimized/optimized-classnames.properties | 6 +- .../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 ++ .../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/GridCacheTestValue.java | 4 +- .../processors/cache/GridCacheTestValue2.java | 4 +- .../IgniteTxExceptionAbstractSelfTest.java | 6 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 11 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 888 ++++--------------- ...dCacheContinuousQueryReplicatedSelfTest.java | 96 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 13 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 54 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../ignite/loadtests/mapper/TestObject.java | 6 +- .../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/VisorCacheCommandSpec.scala | 43 +- .../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 +- 176 files changed, 5392 insertions(+), 6072 deletions(-) ----------------------------------------------------------------------
