Merge branches 'ignite-sql-tests' and 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Conflicts:
modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1090455d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1090455d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1090455d
Branch: refs/heads/ignite-sql-tests
Commit: 1090455dceb4db53a7a5e3d3b1b31c1fdf42d1d5
Parents: 24c6f90 d70e59f
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Tue Feb 10 17:03:40 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Tue Feb 10 17:03:40 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 5 +
.../client/ClientPortableArgumentTask.java | 52 --
.../ignite/client/ClientPutPortableTask.java | 43 --
.../ignite/client/ClientTestPortable.java | 490 -------------------
.../ClientTestPortableAffinityKeyTask.java | 85 ----
.../clients/src/test/resources/spring-cache.xml | 6 +-
.../src/test/resources/spring-server-node.xml | 12 +-
.../test/resources/spring-server-ssl-node.xml | 6 +-
.../src/main/java/org/apache/ignite/Ignite.java | 7 -
.../java/org/apache/ignite/IgniteCache.java | 2 +-
.../java/org/apache/ignite/IgnitePortables.java | 364 --------------
.../apache/ignite/cache/CacheProjection.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 10 +-
.../ignite/client/GridClientCacheFlag.java | 2 +-
.../ignite/client/GridClientConfiguration.java | 23 -
.../configuration/CacheConfiguration.java | 64 ---
.../configuration/IgniteConfiguration.java | 19 -
.../ignite/internal/GridKernalContextImpl.java | 6 +
.../ignite/internal/GridPortablesImpl.java | 174 -------
.../apache/ignite/internal/IgniteKernal.java | 15 +-
.../org/apache/ignite/internal/IgnitionEx.java | 3 -
.../affinity/GridAffinityAssignmentCache.java | 3 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 21 +-
.../processors/cache/GridCacheAttributes.java | 11 -
.../processors/cache/GridCacheContext.java | 129 +----
.../GridCacheDefaultAffinityKeyMapper.java | 34 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../GridCachePartitionExchangeManager.java | 18 +-
.../processors/cache/GridCacheProcessor.java | 12 +-
.../cache/GridCacheProjectionImpl.java | 12 +-
.../processors/cache/GridCacheStoreManager.java | 4 +-
.../cache/GridCacheUpdateAtomicResult.java | 6 +-
.../IgniteCacheOsSerializationManager.java | 48 ++
.../cache/affinity/GridCacheAffinityImpl.java | 3 +-
.../GridDistributedTxRemoteAdapter.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../IgniteCacheSerializationManager.java | 51 ++
.../cache/transactions/IgniteTxAdapter.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +-
...ridCacheVersionAbstractConflictResolver.java | 6 +-
.../GridCacheVersionConflictContext.java | 166 ++++++-
.../GridCacheVersionConflictContextImpl.java | 187 -------
.../GridCacheVersionConflictResolver.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 6 +-
.../plugin/IgnitePluginProcessor.java | 4 +-
.../portable/GridPortableProcessor.java | 88 ++--
.../portable/os/GridOsPortableProcessor.java | 48 +-
.../processors/query/GridQueryProcessor.java | 33 +-
.../processors/rest/GridRestProcessor.java | 10 +-
.../message/GridClientAbstractMessage.java | 17 +-
.../GridClientAuthenticationRequest.java | 19 -
.../message/GridClientCacheQueryRequest.java | 45 --
.../client/message/GridClientCacheRequest.java | 48 --
.../message/GridClientGetMetaDataRequest.java | 64 ---
.../client/message/GridClientLogRequest.java | 23 -
.../message/GridClientMetaDataResponse.java | 57 ---
.../rest/client/message/GridClientNodeBean.java | 40 +-
.../message/GridClientNodeMetricsBean.java | 120 +----
.../message/GridClientPortableMetaData.java | 23 +-
.../message/GridClientPutMetaDataRequest.java | 64 ---
.../rest/client/message/GridClientResponse.java | 23 -
.../client/message/GridClientTaskRequest.java | 28 --
.../message/GridClientTaskResultBean.java | 28 +-
.../message/GridClientTopologyRequest.java | 25 -
.../cache/GridCacheClientQueryResult.java | 24 +-
.../metadata/GridPortableMetadataHandler.java | 103 ----
.../handlers/task/GridTaskCommandHandler.java | 3 +-
.../protocols/tcp/GridTcpRestNioListener.java | 14 -
.../GridRestPortableGetMetaDataRequest.java | 44 --
.../GridRestPortablePutMetaDataRequest.java | 44 --
.../ignite/internal/util/IgniteUtils.java | 73 ---
.../util/portable/PortableRawReaderEx.java | 32 --
.../util/portable/PortableRawWriterEx.java | 43 --
.../visor/portable/VisorPortableMetadata.java | 72 ---
.../VisorPortableMetadataCollectorTask.java | 94 ----
.../portable/VisorPortableMetadataField.java | 71 ---
.../optimized/optimized-classnames.properties | 8 -
.../apache/ignite/plugin/PluginProvider.java | 2 +-
.../security/GridSecurityCredentials.java | 20 +-
.../ignite/portables/PortableBuilder.java | 137 ------
.../ignite/portables/PortableConfiguration.java | 189 -------
.../ignite/portables/PortableException.java | 57 ---
.../ignite/portables/PortableIdMapper.java | 55 ---
.../PortableInvalidClassException.java | 58 ---
.../ignite/portables/PortableMarshalAware.java | 48 --
.../ignite/portables/PortableMetadata.java | 61 ---
.../apache/ignite/portables/PortableObject.java | 160 ------
.../ignite/portables/PortableRawReader.java | 235 ---------
.../ignite/portables/PortableRawWriter.java | 218 ---------
.../apache/ignite/portables/PortableReader.java | 286 -----------
.../ignite/portables/PortableSerializer.java | 47 --
.../portables/PortableTypeConfiguration.java | 195 --------
.../apache/ignite/portables/PortableWriter.java | 265 ----------
.../org/apache/ignite/portables/package.html | 24 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 38 +-
.../cache/GridCacheAbstractSelfTest.java | 8 -
.../cache/GridCacheAffinityMapperSelfTest.java | 17 +
.../cache/GridCacheMemoryModeSelfTest.java | 8 -
...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 -
.../GridCacheOffHeapTieredAbstractSelfTest.java | 15 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 78 +--
.../cache/IgniteCacheAbstractTest.java | 8 -
...tractDistributedByteArrayValuesSelfTest.java | 10 -
...tractPartitionedByteArrayValuesSelfTest.java | 3 -
.../dht/GridCacheAtomicFullApiSelfTest.java | 18 +
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 19 +-
.../near/GridCachePartitionedLockSelfTest.java | 34 --
.../GridCacheSwapScanQueryAbstractSelfTest.java | 59 ++-
.../query/GridCacheSwapScanQuerySelfTest.java | 4 -
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/testframework/junits/IgniteMock.java | 5 -
.../org/apache/ignite/IgniteSpringBean.java | 7 -
114 files changed, 576 insertions(+), 5390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 83cabd0,b57b435..1adc678
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -22,9 -22,9 +22,8 @@@ import org.apache.ignite.cache.*
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.cloner.*;
import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.internal.util.typedef.internal.*;
- import org.apache.ignite.portables.*;
import org.apache.ignite.spi.indexing.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1090455d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
