Merge branches 'ignite-qry' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7b13de91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7b13de91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7b13de91 Branch: refs/heads/master Commit: 7b13de91745a1c3f95715a4724a325421c16d8e7 Parents: 73b5ef6 7f6fdca Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Dec 10 18:58:03 2014 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Dec 10 18:58:03 2014 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 22 +- .../java/org/apache/ignite/IgniteCache.java | 300 +++++++++++++++++++ .../apache/ignite/cache/CacheConfiguration.java | 23 ++ .../apache/ignite/cache/CacheEntryEvent.java | 36 +++ .../java/org/apache/ignite/cache/CacheFlag.java | 68 +++++ .../org/apache/ignite/cache/CachePeekMode.java | 72 +++++ .../ignite/cache/eviction/EvictableEntry.java | 39 +++ .../cache/query/QueryAffinityPredicate.java | 124 ++++++++ .../cache/query/QueryContinuousPredicate.java | 204 +++++++++++++ .../apache/ignite/cache/query/QueryCursor.java | 29 ++ .../ignite/cache/query/QueryPredicate.java | 68 +++++ .../apache/ignite/cache/query/QueryReducer.java | 22 ++ .../ignite/cache/query/QuerySqlPredicate.java | 107 +++++++ .../ignite/cache/query/QueryTextPredicate.java | 79 +++++ .../query/annotations/QueryGroupIndex.java | 50 ++++ .../cache/query/annotations/QuerySqlField.java | 125 ++++++++ .../query/annotations/QuerySqlFunction.java | 59 ++++ .../cache/query/annotations/QueryTextField.java | 25 ++ .../ignite/spi/deployment/DeploymentSpi.java | 2 +- .../org/gridgain/grid/kernal/GridKernal.java | 5 + modules/core/src/test/config/tests.properties | 2 +- .../java/org/gridgain/grid/GridSpringBean.java | 5 + ...loymentClassLoaderMultiThreadedSelfTest.java | 4 +- .../GridUriDeploymentFileProcessorSelfTest.java | 2 +- .../GridUriDeploymentMultiScannersSelfTest.java | 2 +- .../file/GridFileDeploymentSelfTest.java | 24 +- .../GridFileDeploymentUndeploySelfTest.java | 4 +- .../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +- .../http/GridHttpDeploymentSelfTest.java | 2 +- pom.xml | 34 ++- 30 files changed, 1496 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b13de91/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ----------------------------------------------------------------------
