Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-630
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ceabaa8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ceabaa8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ceabaa8 Branch: refs/heads/ignite-630 Commit: 4ceabaa85ff3b91745b8d80fbf06a5e7f7799a36 Parents: c438a76 5f8f6f4 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue May 5 15:15:56 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue May 5 15:15:56 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 34 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 +++ dev-tools/.gitignore | 2 + dev-tools/build.gradle | 46 +++ dev-tools/src/main/groovy/jiraslurp.groovy | 147 ++++++++ examples/pom.xml | 2 +- .../streaming/wordcount/CacheConfig.java | 5 - modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- .../config/grid-client-config.properties | 50 +-- modules/clients/pom.xml | 2 +- .../ClientPropertiesConfigurationSelfTest.java | 12 +- modules/cloud/pom.xml | 6 +- modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 26 +- modules/core/pom.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 +++-- .../configuration/CacheConfiguration.java | 259 +++++++++++--- .../configuration/IgniteConfiguration.java | 344 +++++++++++++++---- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/GridUpdateNotifier.java | 66 +++- .../ignite/internal/IgniteComponentType.java | 36 +- .../apache/ignite/internal/IgniteKernal.java | 83 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 30 +- .../communication/GridIoMessageFactory.java | 8 + .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheIoManager.java | 314 +++++++++++++---- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheMessage.java | 8 +- .../processors/cache/GridCacheProcessor.java | 3 +- .../processors/cache/GridCacheSwapManager.java | 35 +- .../processors/cache/GridCacheTtlManager.java | 168 +++++---- .../processors/cache/GridCacheUtils.java | 5 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- .../atomic/GridNearAtomicUpdateResponse.java | 18 +- .../dht/preloader/GridDhtForceKeysFuture.java | 6 + .../dht/preloader/GridDhtForceKeysResponse.java | 54 ++- .../distributed/near/GridNearGetResponse.java | 8 +- .../cache/query/GridCacheQueryManager.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 135 +++++++- .../cache/query/GridCacheTwoStepQuery.java | 8 +- .../processors/query/GridQueryIndexing.java | 19 +- .../processors/query/GridQueryProcessor.java | 78 ++++- .../messages/GridQueryNextPageResponse.java | 68 ++-- .../h2/twostep/messages/GridQueryRequest.java | 21 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +-- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheStartTask.java | 155 +++++++++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../resources/META-INF/classnames.properties | 13 + .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 13 +- .../cache/GridCacheSwapReloadSelfTest.java | 20 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 189 ++++++++++ ...gniteCacheP2pUnmarshallingNearErrorTest.java | 56 +++ ...CacheP2pUnmarshallingRebalanceErrorTest.java | 80 +++++ .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 109 ++++++ .../cache/IgniteCachePeekModesAbstractTest.java | 15 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 +++++++++ ...GridCacheLoadingConcurrentGridStartTest.java | 154 --------- .../dht/GridCacheDhtPreloadSelfTest.java | 2 +- ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 6 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 169 ++++++++- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 +---- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +- .../query/h2/opt/GridH2RowDescriptor.java | 14 +- .../processors/query/h2/opt/GridH2Table.java | 10 +- .../query/h2/opt/GridH2ValueCacheObject.java | 191 ++++++++++ .../query/h2/opt/GridLuceneIndex.java | 84 +++-- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../query/h2/twostep/GridMergeIndex.java | 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../query/h2/twostep/GridResultPage.java | 80 ++++- .../query/h2/twostep/msg/GridH2Array.java | 124 +++++++ .../query/h2/twostep/msg/GridH2Boolean.java | 112 ++++++ .../query/h2/twostep/msg/GridH2Byte.java | 113 ++++++ .../query/h2/twostep/msg/GridH2Bytes.java | 113 ++++++ .../query/h2/twostep/msg/GridH2CacheObject.java | 148 ++++++++ .../query/h2/twostep/msg/GridH2Date.java | 115 +++++++ .../query/h2/twostep/msg/GridH2Decimal.java | 134 ++++++++ .../query/h2/twostep/msg/GridH2Double.java | 113 ++++++ .../query/h2/twostep/msg/GridH2Float.java | 113 ++++++ .../query/h2/twostep/msg/GridH2Geometry.java | 134 ++++++++ .../query/h2/twostep/msg/GridH2Integer.java | 113 ++++++ .../query/h2/twostep/msg/GridH2JavaObject.java | 113 ++++++ .../query/h2/twostep/msg/GridH2Long.java | 113 ++++++ .../query/h2/twostep/msg/GridH2Null.java | 78 +++++ .../query/h2/twostep/msg/GridH2Short.java | 113 ++++++ .../query/h2/twostep/msg/GridH2String.java | 115 +++++++ .../query/h2/twostep/msg/GridH2Time.java | 116 +++++++ .../query/h2/twostep/msg/GridH2Timestamp.java | 133 +++++++ .../query/h2/twostep/msg/GridH2Uuid.java | 133 +++++++ .../h2/twostep/msg/GridH2ValueMessage.java | 49 +++ .../twostep/msg/GridH2ValueMessageFactory.java | 201 +++++++++++ .../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +- .../cache/GridCacheOffHeapSelfTest.java | 11 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 56 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 130 +++++-- .../IgniteCacheQuerySelfTestSuite.java | 3 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 8 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheCommand.scala | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 232 +++++++++++-- 144 files changed, 6100 insertions(+), 1059 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ceabaa8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ceabaa8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ----------------------------------------------------------------------
