ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [21/26] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Date Sun, 17 May 2015 19:37:43 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2


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

Branch: refs/heads/ignite-709_2
Commit: 79f21aa049d6a260571c661a6a721312803919a0
Parents: aaa7425 da5a228
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Fri May 15 23:25:57 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Fri May 15 23:25:57 2015 +0300

----------------------------------------------------------------------
 .../streaming/StreamTransformerExample.java     |   4 +-
 .../streaming/StreamVisitorExample.java         |   4 +-
 .../ignite/examples/streaming/package-info.java |   1 -
 .../streaming/wordcount/CacheConfig.java        |   2 +-
 .../streaming/wordcount/QueryWords.java         |  12 +-
 .../streaming/wordcount/StreamWords.java        |  12 +-
 .../streaming/wordcount/package-info.java       |   1 -
 .../socket/WordsSocketStreamerClient.java       |  82 +++++
 .../socket/WordsSocketStreamerServer.java       | 124 ++++++++
 .../wordcount/socket/package-info.java          |  21 ++
 .../org/apache/ignite/internal/IgnitionEx.java  | 136 +++-----
 .../internal/interop/InteropBootstrap.java      |  34 ++
 .../interop/InteropBootstrapFactory.java        |  39 +++
 .../internal/interop/InteropIgnition.java       | 103 ++++++
 .../internal/interop/InteropProcessor.java      |  25 ++
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheMapEntry.java     |  35 +--
 .../distributed/GridDistributedLockRequest.java | 111 ++-----
 .../GridDistributedTxFinishRequest.java         |  70 +----
 .../GridDistributedTxPrepareRequest.java        | 112 ++-----
 .../GridDistributedTxRemoteAdapter.java         |  20 +-
 .../distributed/dht/GridDhtLockFuture.java      |   2 -
 .../distributed/dht/GridDhtLockRequest.java     |  45 ++-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   6 -
 .../distributed/dht/GridDhtTxFinishFuture.java  |   3 -
 .../distributed/dht/GridDhtTxFinishRequest.java |  43 ++-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   6 -
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  68 +---
 .../distributed/dht/GridDhtTxPrepareFuture.java |  18 +-
 .../dht/GridDhtTxPrepareRequest.java            |  60 ++--
 .../cache/distributed/dht/GridDhtTxRemote.java  |   8 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   6 -
 .../distributed/near/GridNearLockFuture.java    |   6 -
 .../distributed/near/GridNearLockRequest.java   |  61 ++--
 .../near/GridNearOptimisticTxPrepareFuture.java |  15 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 -
 .../near/GridNearTransactionalCache.java        |   4 -
 .../near/GridNearTxFinishRequest.java           |  28 +-
 .../cache/distributed/near/GridNearTxLocal.java |  20 +-
 .../near/GridNearTxPrepareRequest.java          |  52 ++-
 .../distributed/near/GridNearTxRemote.java      |  24 +-
 .../cache/transactions/IgniteInternalTx.java    |  10 -
 .../transactions/IgniteTransactionsImpl.java    |   4 +-
 .../cache/transactions/IgniteTxAdapter.java     |  72 +----
 .../cache/transactions/IgniteTxEntry.java       |  48 +--
 .../cache/transactions/IgniteTxHandler.java     |   6 -
 .../transactions/IgniteTxLocalAdapter.java      | 165 +---------
 .../cache/transactions/IgniteTxLocalEx.java     |  21 +-
 .../cache/transactions/IgniteTxManager.java     |  62 +---
 .../internal/util/nio/GridBufferedParser.java   |   4 -
 .../internal/util/nio/GridDelimitedParser.java  |  91 ++++++
 .../util/nio/GridNioDelimitedBuffer.java        | 106 +++++++
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  26 --
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   8 +-
 .../org/apache/ignite/stream/StreamAdapter.java | 111 +++++++
 .../ignite/stream/StreamTupleExtractor.java     |  33 ++
 .../stream/socket/SocketMessageConverter.java   |  31 ++
 .../ignite/stream/socket/SocketStreamer.java    | 218 +++++++++++++
 .../ignite/stream/socket/package-info.java      |  21 ++
 .../util/nio/GridNioDelimitedBufferTest.java    | 112 +++++++
 .../stream/socket/SocketStreamerSelfTest.java   | 315 +++++++++++++++++++
 .../ignite/stream/socket/package-info.java      |  21 ++
 .../testsuites/IgniteStreamTestSuite.java       |  39 +++
 .../testsuites/IgniteUtilSelfTestSuite.java     |   1 +
 .../processors/cache/jta/CacheJtaManager.java   |   4 +-
 pom.xml                                         |   2 +
 67 files changed, 1831 insertions(+), 1135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79f21aa0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79f21aa0/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79f21aa0/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79f21aa0/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 1b22aaa,b7e3cd5..ffc0112
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@@ -52,15 -54,12 +52,15 @@@ abstract class TcpDiscoverySpiAdapter e
      /** Default socket operations timeout in milliseconds (value is <tt>200ms</tt>).
*/
      public static final long DFLT_SOCK_TIMEOUT = 200;
  
-     /** Default timeout for receiving message acknowledgement in milliseconds (value is
<tt>5,000ms</tt>). */
-     public static final long DFLT_ACK_TIMEOUT = 5000;
+     /** Default timeout for receiving message acknowledgement in milliseconds (value is
<tt>200ms</tt>). */
+     public static final long DFLT_ACK_TIMEOUT = 200;
  
-     /** Default network timeout in milliseconds (value is <tt>5,000ms</tt>).
*/
-     public static final long DFLT_NETWORK_TIMEOUT = 5000;
+     /** Default network timeout in milliseconds (value is <tt>200ms</tt>). */
+     public static final long DFLT_NETWORK_TIMEOUT = 200;
  
 +    /** Default timeout for joining topology (value is <tt>0</tt>). */
 +    public static final long DFLT_JOIN_TIMEOUT = 0;
 +
      /** Default value for thread priority (value is <tt>10</tt>). */
      public static final int DFLT_THREAD_PRI = 10;
  


Mime
View raw message