You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/08/28 14:48:08 UTC
[7/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-6149
Merge remote-tracking branch 'remotes/origin/master' into ignite-6149
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57b9e8db
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57b9e8db
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57b9e8db
Branch: refs/heads/ignite-6149
Commit: 57b9e8dbd0ec1e71fc36df6fff8804cc6275e591
Parents: 5a4c6f3 a1fab62
Author: sboikov <sb...@gridgain.com>
Authored: Mon Aug 28 11:04:01 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Aug 28 11:04:01 2017 +0300
----------------------------------------------------------------------
modules/clients/src/test/keystore/ca/node01.jks | Bin 0 -> 3719 bytes
modules/clients/src/test/keystore/ca/node02.jks | Bin 0 -> 4598 bytes
modules/clients/src/test/keystore/ca/node03.jks | Bin 0 -> 3754 bytes
modules/clients/src/test/keystore/ca/oneca.cnf | 15 +
modules/clients/src/test/keystore/ca/oneca.key | 28 ++
.../clients/src/test/keystore/ca/oneindex.txt | 1 +
.../src/test/keystore/ca/oneindex.txt.attr | 1 +
modules/clients/src/test/keystore/ca/oneserial | 1 +
.../clients/src/test/keystore/ca/trust-both.jks | Bin 0 -> 1718 bytes
.../clients/src/test/keystore/ca/trust-one.jks | Bin 0 -> 877 bytes
.../clients/src/test/keystore/ca/trust-two.jks | Bin 0 -> 891 bytes
modules/clients/src/test/keystore/ca/twoca.cnf | 15 +
modules/clients/src/test/keystore/ca/twoca.key | 28 ++
.../clients/src/test/keystore/ca/twoindex.txt | 2 +
.../src/test/keystore/ca/twoindex.txt.attr | 1 +
modules/clients/src/test/keystore/ca/twoserial | 1 +
.../PersistentStoreConfiguration.java | 7 +-
.../ignite/internal/MarshallerContextImpl.java | 3 +
.../internal/MarshallerMappingFileStore.java | 76 ++-
.../ignite/internal/binary/BinaryUtils.java | 26 +
.../processors/cache/CacheObjectUtils.java | 65 ++-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheEntryEx.java | 10 +
.../processors/cache/GridCacheMapEntry.java | 27 +-
.../processors/cache/IgniteCacheProxyImpl.java | 26 +-
.../colocated/GridDhtDetachedCacheEntry.java | 4 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../GridCacheDatabaseSharedManager.java | 4 +-
.../processors/cache/query/CacheQueryEntry.java | 58 +++
.../query/GridCacheDistributedQueryManager.java | 16 +-
.../cache/query/GridCacheQueryAdapter.java | 53 ++-
.../cache/query/GridCacheQueryManager.java | 470 +++++++++----------
.../IgniteCacheObjectProcessorImpl.java | 164 -------
.../UserCacheObjectByteArrayImpl.java | 59 +++
.../cacheobject/UserCacheObjectImpl.java | 82 ++++
.../cacheobject/UserKeyCacheObjectImpl.java | 101 ++++
.../service/GridServiceProcessor.java | 6 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 11 +-
.../resources/META-INF/classnames.properties | 88 ++--
modules/core/src/test/config/tests.properties | 8 +
.../processors/cache/GridCacheTestEntryEx.java | 6 +
...MarshallerMappingRestoreOnNodeStartTest.java | 116 +++++
.../GridCacheQueryTransformerSelfTest.java | 41 ++
.../tcp/TcpDiscoverySslTrustedSelfTest.java | 42 ++
.../TcpDiscoverySslTrustedUntrustedTest.java | 140 ++++++
.../ignite/testframework/GridTestUtils.java | 20 +
.../IgniteSpiDiscoverySelfTestSuite.java | 4 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 2 +
48 files changed, 1305 insertions(+), 533 deletions(-)
----------------------------------------------------------------------