ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [03/51] incubator-ignite git commit: Merge branch ignite-sprint-3 into ignite-674
Date Fri, 10 Apr 2015 12:10:38 GMT
Merge branch ignite-sprint-3 into ignite-674


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68eacf8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68eacf8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68eacf8e

Branch: refs/heads/ignite-537
Commit: 68eacf8ed556ab3332abc0a955f1c040723b8334
Parents: ab01e7d 580f051
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Fri Apr 3 15:25:21 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Fri Apr 3 15:25:21 2015 -0700

----------------------------------------------------------------------
 .gitignore                                      |   2 +-
 examples/schema-import/bin/db-init.sql          |  17 +
 modules/core/pom.xml                            |  38 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   4 +-
 .../configuration/CacheConfiguration.java       |  31 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |  11 +-
 .../ignite/events/CacheQueryReadEvent.java      |  11 +-
 .../ignite/internal/GridCachePluginContext.java |   6 +
 .../cache/CacheEvictableEntryImpl.java          |  11 +-
 .../processors/cache/CacheProjection.java       |  36 --
 .../processors/cache/GridCacheAdapter.java      | 260 +------------
 .../processors/cache/GridCacheAttributes.java   |   8 -
 .../cache/GridCacheConcurrentMap.java           |  34 +-
 .../cache/GridCacheDeploymentManager.java       |   7 +-
 .../processors/cache/GridCacheEntryEx.java      |  55 +--
 .../processors/cache/GridCacheMapEntry.java     | 240 +-----------
 .../cache/GridCacheMapEntryFactory.java         |   2 -
 .../processors/cache/GridCachePeekMode.java     |  81 ----
 .../processors/cache/GridCacheProcessor.java    |  67 ++--
 .../cache/GridCacheProjectionImpl.java          |  11 -
 .../processors/cache/GridCacheProxyImpl.java    |  24 --
 .../processors/cache/GridCacheUtils.java        |  11 -
 .../distributed/GridDistributedCacheEntry.java  |   4 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  25 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   4 +-
 .../distributed/dht/GridNoStorageCacheMap.java  |  11 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  32 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   4 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  35 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   4 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |   5 +-
 .../distributed/near/GridNearCacheAdapter.java  |  75 +---
 .../distributed/near/GridNearCacheEntry.java    |   4 +-
 .../distributed/near/GridNearTxRemote.java      |  11 +-
 .../processors/cache/local/GridLocalCache.java  |   3 +-
 .../cache/local/GridLocalCacheEntry.java        |   4 +-
 .../local/atomic/GridLocalAtomicCache.java      |   3 +-
 .../cache/query/GridCacheQueryManager.java      |  18 +-
 .../continuous/CacheContinuousQueryHandler.java |   4 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   8 +
 .../IgniteCacheObjectProcessorImpl.java         |   5 +
 .../datastreamer/DataStreamerImpl.java          |  21 +-
 .../processors/plugin/CachePluginManager.java   |  51 ++-
 .../processors/query/GridQueryProcessor.java    | 147 ++++----
 .../messages/GridQueryNextPageResponse.java     |  34 +-
 .../processors/task/GridTaskProcessor.java      |   9 +-
 .../cache/VisorCacheDefaultConfiguration.java   |  21 --
 .../ignite/plugin/CachePluginContext.java       |  11 +
 .../ignite/plugin/CachePluginProvider.java      |   4 +-
 .../org/apache/ignite/plugin/PluginContext.java |   9 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   7 +
 .../communication/tcp/TcpCommunicationSpi.java  |   6 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   7 -
 .../resources/META-INF/classnames.properties    |   1 -
 ...idCacheConfigurationConsistencySelfTest.java |   3 -
 .../GridCachePreloadingEvictionsSelfTest.java   |   4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  40 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  14 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |  24 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |   8 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |   2 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   5 +
 .../near/GridCacheNearMultiNodeSelfTest.java    | 103 +++---
 .../near/GridCacheNearOneNodeSelfTest.java      |  33 +-
 .../near/GridCacheNearReadersSelfTest.java      | 154 ++++----
 .../GridCacheReplicatedPreloadSelfTest.java     |  11 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |   3 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  46 +--
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   2 +-
 .../junits/common/GridCommonAbstractTest.java   |  42 +++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |   3 +
 .../query/h2/twostep/GridMapQueryExecutor.java  |  88 ++++-
 .../query/h2/twostep/GridResultPage.java        |   9 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |   2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   8 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     | 368 +++++++++++++++++++
 .../ttl/CacheTtlOffheapAbstractSelfTest.java    |  29 ++
 .../CacheTtlOffheapAtomicAbstractSelfTest.java  |  29 ++
 .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java |  34 ++
 ...acheTtlOffheapAtomicPartitionedSelfTest.java |  34 ++
 ...TtlOffheapTransactionalAbstractSelfTest.java |  29 ++
 ...cheTtlOffheapTransactionalLocalSelfTest.java |  34 ++
 ...OffheapTransactionalPartitionedSelfTest.java |  34 ++
 .../ttl/CacheTtlOnheapAbstractSelfTest.java     |  29 ++
 .../CacheTtlOnheapAtomicAbstractSelfTest.java   |  29 ++
 .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java  |  34 ++
 ...CacheTtlOnheapAtomicPartitionedSelfTest.java |  34 ++
 ...eTtlOnheapTransactionalAbstractSelfTest.java |  29 ++
 ...acheTtlOnheapTransactionalLocalSelfTest.java |  34 ++
 ...lOnheapTransactionalPartitionedSelfTest.java |  34 ++
 .../IgniteCacheWithIndexingTestSuite.java       |  51 +++
 .../IgniteH2IndexingSpiTestSuite.java           |   7 -
 .../commands/cache/VisorCacheCommand.scala      |   4 +-
 parent/pom.xml                                  |   1 -
 scripts/git-apply-patch.sh                      |  94 +++++
 scripts/git-format-patch.sh                     |  87 +++++
 scripts/git-patch-functions.sh                  | 171 +++++++++
 scripts/git-patch-prop.sh                       |  24 ++
 101 files changed, 1983 insertions(+), 1435 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index e941d30,0de4653..a9026b0
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@@ -18,9 -18,9 +18,10 @@@
  package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
  
  import org.apache.ignite.*;
+ import org.apache.ignite.cache.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.cluster.*;
  import org.apache.ignite.internal.processors.affinity.*;
  import org.apache.ignite.internal.processors.cache.*;
  import org.apache.ignite.internal.processors.cache.distributed.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68eacf8e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------


Mime
View raw message