You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/10 09:05:27 UTC
[3/6] ignite git commit: Merge remote-tracking branch
'origin/ignite-3477-master' into ignite-3477-master
Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6be3a035
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6be3a035
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6be3a035
Branch: refs/heads/ignite-3477-master
Commit: 6be3a035778ebf9b023b003a462606c83e2cffa3
Parents: aa66de6 c449d6e
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Apr 10 11:19:57 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Apr 10 11:19:57 2017 +0300
----------------------------------------------------------------------
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 2 +
.../src/main/java/org/apache/ignite/Ignite.java | 8 +
.../java/org/apache/ignite/MemoryMetrics.java | 95 +++
.../binary/BinaryAbstractIdentityResolver.java | 53 --
.../binary/BinaryArrayIdentityResolver.java | 224 -----
.../binary/BinaryFieldIdentityResolver.java | 307 -------
.../ignite/binary/BinaryIdentityResolver.java | 42 -
.../ignite/binary/BinaryTypeConfiguration.java | 25 -
.../org/apache/ignite/cache/CacheMetrics.java | 70 --
.../configuration/MemoryConfiguration.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 7 +-
.../binary/BinaryAbstractIdentityResolver.java | 56 ++
.../binary/BinaryArrayIdentityResolver.java | 222 +++++
.../ignite/internal/binary/BinaryContext.java | 4 +-
.../internal/binary/BinaryIdentityResolver.java | 43 +
.../internal/binary/BinaryObjectExImpl.java | 1 -
.../internal/binary/BinaryWriterExImpl.java | 1 -
.../pagemem/impl/PageMemoryNoStoreImpl.java | 11 +-
.../cache/CacheClusterMetricsMXBeanImpl.java | 50 --
.../cache/CacheLocalMetricsMXBeanImpl.java | 50 --
.../processors/cache/CacheMetricsImpl.java | 125 +--
.../processors/cache/CacheMetricsSnapshot.java | 120 ---
.../processors/cache/GridCacheProcessor.java | 3 +
.../IgniteCacheDatabaseSharedManager.java | 98 ++-
.../cache/database/IgniteMemoryPoolMetrics.java | 33 -
.../cache/database/MemoryMetricsImpl.java | 314 +++++++
.../processors/cache/database/MemoryPolicy.java | 18 +-
.../cache/database/freelist/FreeListImpl.java | 35 +
.../cache/database/tree/BPlusTree.java | 110 ++-
.../platform/cache/PlatformCache.java | 10 -
.../utils/PlatformConfigurationUtils.java | 64 +-
.../apache/ignite/internal/util/IgniteTree.java | 14 +
.../visor/node/VisorMemoryConfiguration.java | 1 -
.../ignite/mxbean/CacheMetricsMXBean.java | 40 -
.../ignite/mxbean/MemoryMetricsMXBean.java | 89 ++
.../BinaryArrayIdentityResolverSelfTest.java | 4 -
.../BinaryFieldIdentityResolverSelfTest.java | 333 --------
...ryIdentityResolverConfigurationSelfTest.java | 138 ----
.../BinaryObjectBuilderAdditionalSelfTest.java | 1 -
...naryObjectBuilderDefaultMappersSelfTest.java | 1 -
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 3 +-
.../cache/CacheConfigurationLeakTest.java | 3 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 58 +-
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 182 +----
.../processors/database/BPlusTreeSelfTest.java | 31 +-
.../database/FreeListImplSelfTest.java | 5 +-
.../database/MemoryMetricsSelfTest.java | 313 +++++++
.../database/MetadataStorageSelfTest.java | 3 +-
.../processors/igfs/IgfsIgniteMock.java | 8 +
.../platform/PlatformCacheWriteMetricsTask.java | 126 +--
.../ignite/testframework/junits/IgniteMock.java | 6 +
.../junits/multijvm/IgniteProcessProxy.java | 6 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../IgniteBinaryObjectsTestSuite.java | 4 -
.../HibernateAccessStrategyAdapter.java | 8 +-
.../cache/hibernate/HibernateCacheProxy.java | 811 +++++++++++++++++++
.../hibernate/HibernateCollectionRegion.java | 3 +-
.../cache/hibernate/HibernateEntityRegion.java | 3 +-
.../hibernate/HibernateGeneralDataRegion.java | 3 +-
.../hibernate/HibernateKeyTransformer.java | 28 +
.../cache/hibernate/HibernateKeyWrapper.java | 62 ++
.../hibernate/HibernateNaturalIdRegion.java | 3 +-
.../HibernateNonStrictAccessStrategy.java | 5 +-
.../hibernate/HibernateQueryResultsRegion.java | 3 +-
.../HibernateReadOnlyAccessStrategy.java | 3 +-
.../HibernateReadWriteAccessStrategy.java | 3 +-
.../ignite/cache/hibernate/HibernateRegion.java | 6 +-
.../cache/hibernate/HibernateRegionFactory.java | 29 +-
.../hibernate/HibernateTimestampsRegion.java | 3 +-
.../HibernateTransactionalAccessStrategy.java | 2 +-
.../HibernateTransactionalDataRegion.java | 3 +-
.../IgniteBinaryHibernateTestSuite.java | 37 +
.../query/h2/database/H2TreeIndex.java | 16 +-
.../query/h2/opt/GridH2TreeIndex.java | 29 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 129 ---
.../IgniteCacheInsertSqlQuerySelfTest.java | 40 -
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 38 -
.../query/h2/IgniteSqlQueryMinMaxTest.java | 376 +++++++++
.../h2/database/InlineIndexHelperTest.java | 4 +
.../query/h2/opt/GridH2TableSelfTest.java | 50 ++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
modules/platforms/cpp/binary/Makefile.am | 1 -
.../platforms/cpp/binary/include/Makefile.am | 3 -
.../binary/binary_array_identity_resolver.h | 64 --
.../ignite/binary/binary_identity_resolver.h | 61 --
.../include/ignite/binary/binary_object.h | 12 +-
.../binary/include/ignite/binary/binary_type.h | 10 -
.../ignite/impl/binary/binary_type_impl.h | 149 ----
.../ignite/impl/binary/binary_writer_impl.h | 5 +-
.../cpp/binary/project/vs/binary.vcxproj | 4 -
.../binary/project/vs/binary.vcxproj.filters | 12 -
.../binary/binary_array_identity_resolver.cpp | 42 -
.../cpp/core-test/config/cache-test.xml | 2 +-
.../core-test/include/ignite/binary_test_defs.h | 25 -
.../cpp/core-test/include/ignite/complex_type.h | 2 -
.../cpp/core-test/include/ignite/test_type.h | 1 -
.../src/binary_identity_resolver_test.cpp | 254 ------
.../cpp/core-test/src/cache_invoke_test.cpp | 3 -
.../cpp/core-test/src/cache_query_test.cpp | 2 -
.../platforms/cpp/core-test/src/cache_test.cpp | 3 +-
.../cpp/core-test/src/continuous_query_test.cpp | 6 -
.../cpp/odbc-test/include/complex_type.h | 2 -
.../platforms/cpp/odbc-test/include/test_type.h | 1 -
.../Binary/BinaryEqualityComparerTest.cs | 220 ++---
.../Cache/Query/CacheDmlQueriesTest.cs | 13 +-
.../IgniteConfigurationSerializerTest.cs | 9 +-
.../IgniteConfigurationTest.cs | 7 +-
.../Apache.Ignite.Core.csproj | 5 +-
.../Binary/BinaryArrayEqualityComparer.cs | 160 ----
.../Binary/BinaryTypeConfiguration.cs | 13 -
.../Apache.Ignite.Core/IgniteConfiguration.cs | 43 -
.../IgniteConfigurationSection.xsd | 14 -
.../Impl/Binary/BinaryArrayEqualityComparer.cs | 159 ++++
.../Binary/BinaryEqualityComparerSerializer.cs | 100 +--
.../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 ----
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 20 -
.../Impl/Binary/BinaryObject.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 7 +-
.../Binary/BinarySurrogateTypeDescriptor.cs | 6 -
.../Impl/Binary/BinaryUtils.cs | 10 -
.../Impl/Binary/BinaryWriter.cs | 6 +-
.../Impl/Binary/IBinaryEqualityComparer.cs | 63 --
.../Impl/Binary/IBinaryTypeDescriptor.cs | 5 -
.../Impl/Binary/Marshaller.cs | 24 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../ant/beautifier/GridJavadocAntTask.java | 18 +-
126 files changed, 3253 insertions(+), 3735 deletions(-)
----------------------------------------------------------------------