Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7eea46d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7eea46d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7eea46d3 Branch: refs/heads/ignite-1.5 Commit: 7eea46d3ebb4268acf7e095187f5f2194732b89d Parents: ae0ea3c d99fc8d Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Thu Nov 26 11:39:19 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Nov 26 11:39:19 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- .../client/router/RouterFactorySelfTest.java | 2 + .../java/org/apache/ignite/IgniteCache.java | 23 ++ .../configuration/CacheConfiguration.java | 30 +++ .../internal/portable/BinaryReaderExImpl.java | 18 +- .../processors/cache/GridCacheAdapter.java | 156 ++++++++++++- .../processors/cache/GridCacheProxyImpl.java | 61 +++++ .../processors/cache/IgniteCacheProxy.java | 42 ++++ .../processors/cache/IgniteInternalCache.java | 47 +++- .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../distributed/near/GridNearCacheAdapter.java | 10 + .../cache/query/GridCacheSqlQuery.java | 42 ++++ .../cache/query/GridCacheTwoStepQuery.java | 35 ++- .../platform/PlatformContextImpl.java | 2 +- .../processors/query/GridQueryProcessor.java | 40 +--- .../processors/query/GridQueryProperty.java | 45 ++++ .../query/GridQueryTypeDescriptor.java | 6 + .../visor/cache/VisorCacheConfiguration.java | 4 +- .../cache/VisorCacheTypeFieldMetadata.java | 30 ++- .../visor/cache/VisorCacheTypeMetadata.java | 133 ++++++++++- .../ignite/resources/MBeanServerResource.java | 69 ------ .../META-INF/classnames-jdk.properties | 2 + .../IgniteClientReconnectCacheTest.java | 7 + .../CacheDeferredDeleteSanitySelfTest.java | 98 ++++++++ .../cache/CacheStopAndDestroySelfTest.java | 8 +- ...eAbstractDataStructuresFailoverSelfTest.java | 3 + .../IgniteCollectionAbstractTest.java | 3 + .../IgniteCachePutRetryAbstractSelfTest.java | 2 + .../multijvm/IgniteCacheProcessProxy.java | 38 ++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../query/h2/GridH2ResultSetIterator.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 227 ++++++++++++++++--- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java | 69 +++++- .../query/h2/opt/GridH2TreeIndex.java | 98 +++++--- .../query/h2/sql/GridSqlQuerySplitter.java | 73 ++++-- .../processors/query/h2/sql/GridSqlSelect.java | 27 +++ .../query/h2/twostep/GridMapQueryExecutor.java | 17 +- .../query/h2/twostep/GridMergeIndex.java | 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 14 ++ .../h2/twostep/GridReduceQueryExecutor.java | 117 +++++++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 69 +++--- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 +- ...PartitionedSnapshotEnabledQuerySelfTest.java | 28 +++ .../h2/GridIndexingSpiAbstractSelfTest.java | 19 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../Services/ServicesExample.cs | 4 + modules/scalar/pom.xml | 4 +- modules/spark/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- .../ignite-int-max-values-offheap-config.xml | 89 ++++++++ .../ignite-int-max-values-onheap-config.xml | 84 +++++++ .../ignite-int-max-values-swap-config.xml | 93 ++++++++ .../test-max-int-values-offheap.properties | 70 ++++++ .../test-max-int-values-onheap.properties | 70 ++++++ .../config/test-max-int-values-swap.properties | 69 ++++++ .../yardstick/cache/IntMaxValueEntriesTest.java | 135 +++++++++++ parent/pom.xml | 2 +- 58 files changed, 2071 insertions(+), 320 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java ----------------------------------------------------------------------