ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [49/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-299' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-299
Date Wed, 25 Feb 2015 18:03:40 GMT
Merge branches 'ignite-299' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-299


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

Branch: refs/heads/ignite-299
Commit: 157b6ce8a6db22d37b0b3d98b36f836d279500f8
Parents: f7affb3 9a69903
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Feb 25 20:47:48 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Feb 25 20:47:48 2015 +0300

----------------------------------------------------------------------
 README.md                                       |  179 --
 .../examples/datagrid/CacheApiExample.java      |    4 +-
 .../datagrid/CacheContinuousQueryExample.java   |    6 +-
 .../examples/datagrid/CacheQueryExample.java    |    2 +-
 .../ClientAbstractMultiNodeSelfTest.java        |    2 +-
 .../processors/rest/TestBinaryClient.java       |    1 -
 .../processors/rest/TestMemcacheClient.java     |   13 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |    2 +-
 .../ignite/codegen/MessageCodeGenerator.java    |  161 +-
 .../apache/ignite/IgniteSystemProperties.java   |    5 +
 .../CacheRendezvousAffinityFunction.java        |    1 +
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   28 +-
 .../IgfsByteDelimiterRecordResolver.java        |    1 +
 .../ignite/internal/ClusterMetricsSnapshot.java |    9 +-
 .../internal/GridEventConsumeHandler.java       |    1 +
 .../ignite/internal/GridJobCancelRequest.java   |   26 +-
 .../ignite/internal/GridJobExecuteRequest.java  |   70 +-
 .../ignite/internal/GridJobExecuteResponse.java |   34 +-
 .../ignite/internal/GridJobSiblingsRequest.java |   24 +-
 .../internal/GridJobSiblingsResponse.java       |   22 +-
 .../ignite/internal/GridKernalContext.java      |   16 +-
 .../ignite/internal/GridKernalContextImpl.java  |   23 +-
 .../internal/GridMessageListenHandler.java      |    1 +
 .../ignite/internal/GridTaskCancelRequest.java  |   22 +-
 .../ignite/internal/GridTaskSessionRequest.java |   26 +-
 .../apache/ignite/internal/IgniteKernal.java    |   11 +-
 .../internal/direct/DirectByteBufferStream.java |   44 +-
 .../internal/direct/DirectMessageReader.java    |   33 +-
 .../internal/direct/DirectMessageWriter.java    |   23 +-
 .../direct/DirectMessageWriterState.java        |   13 +-
 .../igfs/common/IgfsControlResponse.java        |    1 +
 .../internal/igfs/common/IgfsMarshaller.java    |    1 +
 .../internal/managers/GridManagerAdapter.java   |    9 +-
 .../checkpoint/GridCheckpointRequest.java       |   26 +-
 .../managers/communication/GridIoManager.java   |   30 +-
 .../managers/communication/GridIoMessage.java   |   38 +-
 .../communication/GridIoMessageFactory.java     |   33 +-
 .../communication/GridIoUserMessage.java        |   38 +-
 .../deployment/GridDeploymentCommunication.java |    4 +-
 .../deployment/GridDeploymentInfoBean.java      |   35 +-
 .../deployment/GridDeploymentRequest.java       |   34 +-
 .../deployment/GridDeploymentResponse.java      |   26 +-
 .../discovery/GridDiscoveryManager.java         |   26 +-
 .../eventstorage/GridEventStorageMessage.java   |   42 +-
 .../affinity/GridAffinityMessage.java           |    1 +
 .../processors/cache/GridCacheEntryInfo.java    |    5 +-
 .../cache/GridCacheEvictionRequest.java         |   26 +-
 .../cache/GridCacheEvictionResponse.java        |   30 +-
 .../processors/cache/GridCacheMapEntry.java     |  562 ++---
 .../processors/cache/GridCacheMessage.java      |   21 +-
 .../processors/cache/GridCacheValueBytes.java   |   24 +-
 ...idCacheOptimisticCheckPreparedTxRequest.java |   30 +-
 ...dCacheOptimisticCheckPreparedTxResponse.java |   26 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |   58 +-
 .../distributed/GridDistributedBaseMessage.java |   33 +-
 .../distributed/GridDistributedLockRequest.java |   52 +-
 .../GridDistributedLockResponse.java            |   30 +-
 .../GridDistributedTxFinishRequest.java         |   42 +-
 .../GridDistributedTxFinishResponse.java        |   24 +-
 .../GridDistributedTxPrepareRequest.java        |   58 +-
 .../GridDistributedTxPrepareResponse.java       |   24 +-
 .../GridDistributedTxRemoteAdapter.java         |   66 +-
 .../GridDistributedUnlockRequest.java           |   26 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   22 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   24 +-
 .../distributed/dht/GridDhtLockRequest.java     |   42 +-
 .../distributed/dht/GridDhtLockResponse.java    |   40 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   42 +-
 .../dht/GridDhtTxFinishResponse.java            |   22 +-
 .../dht/GridDhtTxPrepareRequest.java            |   48 +-
 .../dht/GridDhtTxPrepareResponse.java           |   42 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |   26 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   44 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   26 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   92 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   32 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   84 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   78 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   54 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   32 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   32 +-
 .../GridDhtPartitionDemandMessage.java          |   36 +-
 .../preloader/GridDhtPartitionExchangeId.java   |   27 +-
 .../GridDhtPartitionSupplyMessage.java          |   40 +-
 .../GridDhtPartitionsAbstractMessage.java       |   19 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   24 +-
 .../GridDhtPartitionsSingleMessage.java         |   22 +-
 .../GridDhtPartitionsSingleRequest.java         |   18 +-
 .../distributed/near/GridNearAtomicCache.java   |    3 -
 .../distributed/near/GridNearGetRequest.java    |   47 +-
 .../distributed/near/GridNearGetResponse.java   |   38 +-
 .../distributed/near/GridNearLockRequest.java   |   52 +-
 .../distributed/near/GridNearLockResponse.java  |   42 +-
 .../near/GridNearTxFinishRequest.java           |   32 +-
 .../near/GridNearTxFinishResponse.java          |   26 +-
 .../near/GridNearTxPrepareRequest.java          |   44 +-
 .../near/GridNearTxPrepareResponse.java         |   48 +-
 .../distributed/near/GridNearUnlockRequest.java |   18 +-
 .../cache/query/GridCacheQueryRequest.java      |   58 +-
 .../cache/query/GridCacheQueryResponse.java     |   40 +-
 .../continuous/CacheContinuousQueryEntry.java   |    1 +
 .../continuous/CacheContinuousQueryHandler.java |    1 +
 .../cache/transactions/IgniteTxAdapter.java     |   58 +-
 .../cache/transactions/IgniteTxEntry.java       |   17 +-
 .../transactions/IgniteTxLocalAdapter.java      |   48 +-
 .../version/GridCacheRawVersionedEntry.java     |    1 +
 .../cache/version/GridCacheVersion.java         |   32 +-
 .../GridCacheVersionConflictContext.java        |   35 +-
 .../cache/version/GridCacheVersionEx.java       |    2 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |   28 +-
 .../processors/clock/GridClockDeltaVersion.java |   24 +-
 .../processors/clock/GridClockMessage.java      |    1 +
 .../closure/GridClosureProcessor.java           |   82 +-
 .../continuous/GridContinuousMessage.java       |   28 +-
 .../dataload/GridDataLoadRequest.java           |   50 +-
 .../dataload/GridDataLoadResponse.java          |   26 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |    6 +-
 .../processors/igfs/IgfsAckMessage.java         |   26 +-
 .../internal/processors/igfs/IgfsBlockKey.java  |   28 +-
 .../processors/igfs/IgfsBlocksMessage.java      |   30 +-
 .../igfs/IgfsCommunicationMessage.java          |   18 +-
 .../processors/igfs/IgfsDeleteMessage.java      |   24 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |   30 +-
 .../igfs/IgfsFragmentizerRequest.java           |   28 +-
 .../igfs/IgfsFragmentizerResponse.java          |   22 +-
 .../internal/processors/igfs/IgfsServer.java    |    1 +
 .../processors/igfs/IgfsSyncMessage.java        |   24 +-
 .../plugin/IgnitePluginProcessor.java           |    2 +-
 .../processors/rest/GridRestProcessor.java      |   85 +-
 .../processors/rest/GridRestResponse.java       |    1 +
 .../message/GridClientAbstractMessage.java      |    1 +
 .../message/GridClientHandshakeRequest.java     |    1 +
 .../handlers/task/GridTaskResultRequest.java    |   24 +-
 .../handlers/task/GridTaskResultResponse.java   |   28 +-
 .../protocols/tcp/GridMemcachedMessage.java     |    3 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   10 +-
 .../securesession/GridSecureSession.java        |   60 -
 .../GridSecureSessionProcessor.java             |   59 -
 .../os/GridOsSecureSessionProcessor.java        |   61 -
 .../security/GridSecurityContext.java           |  251 ---
 .../security/GridSecurityProcessor.java         |    6 +-
 .../processors/security/SecurityContext.java    |   56 +
 .../security/os/GridOsSecurityProcessor.java    |  146 +-
 .../streamer/GridStreamerCancelRequest.java     |   22 +-
 .../streamer/GridStreamerExecutionRequest.java  |   38 +-
 .../streamer/GridStreamerResponse.java          |   24 +-
 .../processors/streamer/IgniteStreamerImpl.java |    4 +-
 .../ignite/internal/util/GridByteArrayList.java |   24 +-
 .../ignite/internal/util/GridLongList.java      |   24 +-
 .../internal/util/IgniteExceptionRegistry.java  |  259 +++
 .../ignite/internal/util/IgniteUtils.java       | 2011 +++++++++---------
 .../internal/util/ipc/IpcToNioAdapter.java      |    4 +-
 .../util/nio/GridCommunicationClient.java       |    2 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |    1 +
 .../internal/util/nio/GridDirectParser.java     |   33 +-
 .../internal/util/nio/GridNioMessageReader.java |    2 +-
 .../internal/util/nio/GridNioMessageWriter.java |    4 +-
 .../ignite/internal/util/nio/GridNioServer.java |   59 +-
 .../util/nio/GridShmemCommunicationClient.java  |    2 +-
 .../util/nio/GridTcpCommunicationClient.java    |    3 +-
 .../util/nio/GridTcpNioCommunicationClient.java |    2 +-
 .../internal/visor/util/VisorTaskUtils.java     |   42 +-
 .../ignite/lang/IgniteProductVersion.java       |    1 +
 .../optimized/optimized-classnames.properties   |    1 -
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    6 +
 .../extensions/communication/Message.java       |   58 +
 .../communication/MessageAdapter.java           |  143 --
 .../MessageCollectionItemType.java              |  101 +
 .../communication/MessageFactory.java           |    4 +-
 .../communication/MessageFormatter.java         |    3 +-
 .../extensions/communication/MessageReader.java |   24 +-
 .../extensions/communication/MessageWriter.java |   26 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   15 +
 .../org/apache/ignite/spi/IgniteSpiContext.java |    8 +
 .../jobstealing/JobStealingRequest.java         |   22 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  134 +-
 .../DiscoverySpiNodeAuthenticator.java          |    2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  221 +-
 .../tcp/internal/TcpDiscoveryNode.java          |    1 +
 .../TcpDiscoveryMulticastIpFinder.java          |    1 +
 .../messages/TcpDiscoveryAuthFailedMessage.java |    1 +
 .../messages/TcpDiscoveryHeartbeatMessage.java  |    1 +
 .../core/src/main/resources/ignite.properties   |    2 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |    4 +-
 .../GridCommunicationSendMessageSelfTest.java   |   13 +-
 .../communication/GridIoManagerSelfTest.java    |   18 +-
 .../GridDeploymentMessageCountSelfTest.java     |    2 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |    2 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    2 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |    5 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    2 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |    3 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |    2 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |    2 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |    2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    2 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |    3 +
 .../GridCacheReplicatedInvalidateSelfTest.java  |    2 +-
 .../igfs/IgfsDataManagerSelfTest.java           |    1 +
 .../util/IgniteExceptionRegistrySelfTest.java   |   89 +
 .../internal/util/IgniteUtilsSelfTest.java      |    6 +-
 .../internal/util/nio/GridRoundTripTest.java    |    1 +
 .../offheap/GridOffHeapMapAbstractSelfTest.java |    1 +
 .../communication/GridIoManagerBenchmark0.java  |    6 +-
 .../communication/GridTestMessage.java          |    9 +-
 .../GridAbstractCommunicationSelfTest.java      |   22 +-
 .../spi/communication/GridTestMessage.java      |   25 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    4 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |    2 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   16 +-
 .../tcp/GridTcpCommunicationSpiLanTest.java     |    4 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   22 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   10 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   10 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   15 -
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   23 -
 .../file/GridFileSwapSpaceSpiSelfTest.java      |    1 +
 .../testframework/GridSpiTestContext.java       |   12 +-
 .../junits/GridTestKernalContext.java           |    2 +
 .../ignite/testframework/junits/IgniteMock.java |    1 -
 .../junits/spi/GridSpiAbstractTest.java         |   12 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    3 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |    1 +
 .../client/hadoop/GridHadoopClientProtocol.java |    3 +-
 .../hadoop/GridHadoopDefaultJobInfo.java        |    5 +-
 .../shuffle/GridHadoopShuffleMessage.java       |    1 +
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    2 +-
 .../http/jetty/GridJettyRestHandler.java        |    1 +
 pom.xml                                         |    2 +-
 229 files changed, 4838 insertions(+), 4038 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/157b6ce8/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 2593372,d674182..a9b4e57
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@@ -41,8 -41,8 +41,9 @@@ import java.nio.charset.*
  import java.nio.file.*;
  import java.text.*;
  import java.util.*;
 +import java.util.concurrent.*;
  import java.util.concurrent.atomic.*;
+ import java.util.zip.*;
  
  import static java.lang.System.*;
  import static org.apache.ignite.configuration.IgfsConfiguration.*;


Mime
View raw message