ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Date Tue, 24 Mar 2015 17:20:25 GMT
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/sprint-2
Commit: c620ee0d72af70ddffa1b29ff987a9bfa5aa6b43
Parents: 1821ee6 db1e5c0
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 24 20:20:49 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 24 20:20:49 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/schema/CacheConfig.java   |   2 +-
 .../java/org/apache/ignite/schema/Demo.java     |  56 +++---
 .../java/org/apache/ignite/schema/DemoNode.java |  37 ++++
 .../ignite/cache/CacheDistributionMode.java     |  69 -------
 .../java/org/apache/ignite/cache/CacheMode.java |   3 +-
 .../cache/eviction/CacheEvictableEntry.java     |  96 +++++++++
 .../cache/eviction/CacheEvictionFilter.java     |   4 +-
 .../cache/eviction/CacheEvictionPolicy.java     |   6 +-
 .../ignite/cache/eviction/EvictableEntry.java   |  96 ---------
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |  14 +-
 .../CacheIgfsPerBlockLruEvictionPolicy.java     |  24 +--
 .../eviction/lru/CacheLruEvictionPolicy.java    |  16 +-
 .../random/CacheRandomEvictionPolicy.java       |   4 +-
 .../processors/cache/CacheDistributionMode.java |  67 +++++++
 .../cache/CacheEvictableEntryImpl.java          | 197 +++++++++++++++++++
 .../processors/cache/EvictableEntryImpl.java    | 197 -------------------
 .../processors/cache/GridCacheEntryEx.java      |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../processors/cache/GridCacheUtils.java        |   4 +-
 .../dht/GridClientPartitionTopology.java        |   4 +-
 .../distributed/near/GridNearCacheEntry.java    |  64 +++---
 .../resources/META-INF/classnames.properties    |   2 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |   2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   2 -
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   2 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |   1 -
 ...hePartitionedProjectionAffinitySelfTest.java |   1 -
 .../processors/cache/GridCacheTestEntryEx.java  |   3 +-
 .../IgniteCollectionAbstractTest.java           |   3 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |  17 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |   3 -
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |   1 -
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |   2 -
 .../near/GridCacheNearTxPreloadSelfTest.java    |   1 -
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   3 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   1 -
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |   4 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   4 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   4 +-
 .../GridCacheEvictionFilterSelfTest.java        |   2 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   2 +-
 .../cache/eviction/GridCacheMockEntry.java      |   2 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |   2 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |   2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   1 -
 .../IgniteCacheStoreSessionAbstractTest.java    |   6 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |   1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   2 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |   3 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |   3 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |   1 -
 .../query/h2/sql/GridQueryParsingTest.java      |   2 -
 .../ignite/schema/generator/CodeGenerator.java  |   5 +-
 .../schema/test/model/ignite-type-metadata.xml  |  28 ---
 .../yardstick/IgniteAbstractBenchmark.java      |   2 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   1 +
 .../org/apache/ignite/yardstick/IgniteNode.java |   4 +-
 58 files changed, 548 insertions(+), 547 deletions(-)
----------------------------------------------------------------------



Mime
View raw message