ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/8] ignite git commit: Merge branch 'ignite-3477-master' into ignite-4811
Date Wed, 05 Apr 2017 14:59:12 GMT
Merge branch 'ignite-3477-master' into ignite-4811


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

Branch: refs/heads/ignite-4811-no-start-ver
Commit: e34222b3b88fb85a3dabdcf87763d55235554c4f
Parents: 682f3be 6107992
Author: Igor Seliverstov <gvvinblade@gmail.com>
Authored: Thu Mar 30 11:01:08 2017 +0300
Committer: Igor Seliverstov <gvvinblade@gmail.com>
Committed: Thu Mar 30 11:37:21 2017 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorAbstractSelfTest.java     |   3 +-
 .../configuration/CacheConfiguration.java       |  25 ++
 .../configuration/MemoryConfiguration.java      | 104 ++++--
 .../MemoryPolicyConfiguration.java              |  80 +++++
 .../apache/ignite/internal/IgniteKernal.java    |  50 ++-
 .../processors/cache/GridCacheContext.java      |  43 +++
 .../processors/cache/GridCacheProcessor.java    |  21 +-
 .../cache/IgniteCacheOffheapManagerImpl.java    |  35 +-
 .../cache/database/CacheDataRowAdapter.java     |   2 +-
 .../IgniteCacheDatabaseSharedManager.java       | 354 ++++++++++++++++---
 .../processors/cache/database/MemoryPolicy.java |  53 +++
 .../processors/cache/database/RowStore.java     |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   5 +
 .../cache/distributed/near/GridNearTxLocal.java |   1 -
 .../cache/query/GridCacheQueryManager.java      |   3 +-
 .../cache/transactions/IgniteTxManager.java     |   2 +
 .../visor/node/VisorGridConfiguration.java      |   2 +-
 .../visor/node/VisorMemoryConfiguration.java    |  55 ++-
 .../node/VisorMemoryPolicyConfiguration.java    |  72 ++++
 .../resources/META-INF/classnames.properties    |   1 +
 .../ignite/cache/LargeEntryUpdateTest.java      |   1 -
 .../binary/BinaryObjectExceptionSelfTest.java   | 209 -----------
 .../cache/CacheConfigurationLeakTest.java       |   7 +-
 .../CacheMemoryPolicyConfigurationTest.java     | 164 +++++++++
 .../GridCacheAbstractFailoverSelfTest.java      |   4 +
 .../cache/MemoryPolicyConfigValidationTest.java | 241 +++++++++++++
 .../database/IgniteDbAbstractTest.java          |   2 -
 .../database/IgniteDbDynamicCacheSelfTest.java  |   9 +-
 .../IgniteDbMemoryLeakAbstractTest.java         |  10 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   3 +
 .../IgniteBinaryObjectsTestSuite.java           |   2 -
 .../testsuites/IgniteCacheTestSuite2.java       |   4 +
 .../query/h2/database/H2TreeIndex.java          |  23 +-
 .../processors/query/h2/opt/GridH2Table.java    |  16 +-
 .../query/h2/opt/GridH2TreeIndex.java           |  16 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  13 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     | 196 +++++-----
 .../query/h2/opt/GridH2TableSelfTest.java       |   3 +-
 .../query/h2/sql/GridQueryParsingTest.java      | 112 +++---
 .../cpp/core-test/config/cache-query-32.xml     |  50 +++
 .../config/cache-query-continuous-32.xml        |  46 +++
 .../config/cache-query-continuous-default.xml   |  87 +++++
 .../core-test/config/cache-query-continuous.xml |  61 +---
 .../core-test/config/cache-query-default.xml    | 131 +++++++
 .../cpp/core-test/config/cache-query.xml        | 114 +-----
 .../cpp/core-test/config/cache-test-32.xml      |  50 +++
 .../cpp/core-test/config/cache-test-default.xml | 135 +++++++
 .../cpp/core-test/config/cache-test.xml         | 105 +-----
 .../cpp/core-test/project/vs/core-test.vcxproj  |   7 +
 .../project/vs/core-test.vcxproj.filters        |  21 ++
 .../cpp/core-test/src/cache_query_test.cpp      |   4 +
 .../platforms/cpp/core-test/src/cache_test.cpp  |   5 +
 .../cpp/core-test/src/continuous_query_test.cpp |   4 +
 .../cpp/core-test/src/ignition_test.cpp         |   4 +
 .../cpp/core-test/src/interop_test.cpp          |   4 +
 .../cpp/core-test/src/transactions_test.cpp     |   4 +
 .../cpp/odbc-test/config/queries-test-32.xml    |  47 +++
 .../odbc-test/config/queries-test-default.xml   |  38 ++
 .../odbc-test/config/queries-test-noodbc-32.xml |  47 +++
 .../cpp/odbc-test/config/queries-test.xml       |  11 +-
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   3 +
 .../project/vs/odbc-test.vcxproj.filters        |   6 +
 .../cpp/odbc-test/src/api_robustness_test.cpp   |  20 +-
 .../cpp/odbc-test/src/queries_test.cpp          |   8 +
 .../odbc-test/src/sql_test_suite_fixture.cpp    |   6 +-
 66 files changed, 2159 insertions(+), 809 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e34222b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e34222b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
index b751274,72b7d02..eca59d6
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
@@@ -97,9 -98,6 +97,9 @@@ public class CacheDataRowAdapter implem
          assert key == null : "key";
  
          final CacheObjectContext coctx = cctx.cacheObjectContext();
-         final PageMemory pageMem = cctx.shared().database().pageMemory();
++        final PageMemory pageMem = cctx.memoryPolicy().pageMemory();
 +
 +        final int cacheId = cctx.cacheId();
  
          long nextLink = link;
          IncompleteObject<?> incomplete = null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/e34222b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e34222b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------


Mime
View raw message