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 2016/02/26 13:12:44 UTC
[16/17] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b26504a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b26504a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b26504a
Branch: refs/heads/ignite-1232
Commit: 2b26504a3e3bbaa1b403fbc5b8c0bec93638e82b
Parents: 1882f01 7d65ec9
Author: sboikov <sb...@gridgain.com>
Authored: Fri Feb 26 15:11:54 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Feb 26 15:11:54 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../internal/GridEventConsumeHandler.java | 4 +-
.../internal/GridMessageListenHandler.java | 4 +-
.../ignite/internal/binary/BinaryUtils.java | 9 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 9 +-
.../deployment/GridDeploymentCommunication.java | 2 +-
.../deployment/GridDeploymentLocalStore.java | 2 +-
.../eventstorage/GridEventStorageManager.java | 10 +-
.../processors/affinity/GridAffinityUtils.java | 3 +-
.../cache/CacheEntryPredicateAdapter.java | 3 +
.../cache/CacheEntrySerializablePredicate.java | 3 +-
.../cache/CacheInvokeDirectResult.java | 3 +-
.../cache/GridCacheDeploymentManager.java | 5 +
.../processors/cache/GridCacheMessage.java | 4 +-
.../processors/cache/GridCacheMvccManager.java | 142 ++++++++++------
.../processors/cache/GridCacheProcessor.java | 5 +-
.../GridDistributedLockResponse.java | 3 +-
.../GridDistributedTxPrepareRequest.java | 2 +-
.../GridDistributedTxPrepareResponse.java | 3 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 3 +-
.../distributed/dht/GridDhtLockFuture.java | 17 +-
.../dht/GridDhtTxFinishResponse.java | 3 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 3 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 3 +-
.../atomic/GridNearAtomicUpdateResponse.java | 3 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 3 +-
.../GridDhtPartitionDemandMessage.java | 3 +-
.../preloader/GridDhtPartitionsFullMessage.java | 5 +-
.../GridDhtPartitionsSingleMessage.java | 5 +-
.../distributed/near/GridNearGetResponse.java | 3 +-
.../near/GridNearSingleGetResponse.java | 3 +-
.../near/GridNearTxFinishResponse.java | 3 +-
.../cache/query/GridCacheLocalQueryFuture.java | 7 +-
.../cache/query/GridCacheQueryRequest.java | 13 +-
.../cache/query/GridCacheQueryResponse.java | 3 +-
.../cache/query/GridCacheSqlQuery.java | 6 +-
.../CacheContinuousQueryBatchAck.java | 4 +
.../continuous/CacheContinuousQueryHandler.java | 53 +++---
.../cache/transactions/IgniteTxEntry.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +
.../version/GridCacheRawVersionedEntry.java | 5 +-
.../IgniteCacheObjectProcessorImpl.java | 3 +-
.../closure/GridClosureProcessor.java | 6 +-
.../continuous/GridContinuousProcessor.java | 7 +-
.../datastreamer/DataStreamProcessor.java | 4 +-
.../datastreamer/DataStreamerImpl.java | 21 +--
.../internal/processors/igfs/IgfsFileImpl.java | 23 +++
.../internal/processors/igfs/IgfsFileInfo.java | 54 +++---
.../internal/processors/igfs/IgfsImpl.java | 23 +--
.../processors/igfs/IgfsMetaManager.java | 23 ++-
.../processors/job/GridJobProcessor.java | 10 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../offheap/GridOffHeapProcessor.java | 2 +-
.../handlers/log/GridLogCommandHandler.java | 32 +++-
.../handlers/task/GridTaskCommandHandler.java | 6 +-
.../service/GridServiceProcessor.java | 3 +-
.../processors/task/GridTaskProcessor.java | 5 +-
.../processors/task/GridTaskWorker.java | 9 +-
.../ignite/internal/util/IgniteUtils.java | 26 ++-
.../OptimizedObjectStreamRegistry.java | 151 +++++++++--------
.../ignite/spi/discovery/tcp/ClientImpl.java | 12 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 16 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../TcpDiscoveryCustomEventMessage.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 65 ++++++++
.../cache/GridCacheAbstractSelfTest.java | 19 +++
.../IgniteCachePutStackOverflowSelfTest.java | 133 +++++++++++++++
.../GridCacheBinaryObjectsAbstractSelfTest.java | 40 +++++
.../GridCacheReplicatedPreloadSelfTest.java | 163 +++++++++++++++++++
.../igfs/IgfsDataManagerSelfTest.java | 24 ++-
.../igfs/IgfsDualAbstractSelfTest.java | 74 ++++++++-
.../processors/igfs/IgfsFileInfoSelfTest.java | 11 +-
.../handlers/log/GridLogCommandHandlerTest.java | 97 ++++++++---
...namicProxySerializationMultiJvmSelfTest.java | 106 +++++++++---
.../OptimizedMarshallerPooledSelfTest.java | 8 +
.../testframework/junits/GridAbstractTest.java | 8 +
.../junits/GridTestKernalContext.java | 34 ++--
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../CacheDeploymentExternalizableTestValue.java | 69 ++++++++
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 7 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
82 files changed, 1309 insertions(+), 377 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index fe3b49e,0733827..6b81ed1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@@ -20,8 -20,8 +20,9 @@@ package org.apache.ignite.internal.proc
import java.nio.ByteBuffer;
import java.util.LinkedHashMap;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.GridDirectTransient;
+ import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
@@@ -136,27 -140,20 +138,27 @@@ public class GridCacheSqlQuery implemen
assert params != null;
- paramsBytes = m.marshal(params);
+ try {
+ paramsBytes = m.marshal(params);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
}
- /**
- * @param m Marshaller.
- * @throws IgniteCheckedException If failed.
- */
- public void unmarshallParams(Marshaller m, GridKernalContext ctx) throws IgniteCheckedException {
+ /** {@inheritDoc} */
- @Override public void unmarshall(Marshaller m) {
++ @Override public void unmarshall(Marshaller m, GridKernalContext ctx) {
if (params != null)
return;
assert paramsBytes != null;
- params = m.unmarshal(paramsBytes, U.resolveClassLoader(ctx.config()));
+ try {
- params = m.unmarshal(paramsBytes, null);
++ params = m.unmarshal(paramsBytes, U.resolveClassLoader(ctx.config()));
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b26504a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------