ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [37/37] ignite git commit: Merge branch 'master' into ignite-2.0
Date Thu, 05 Jan 2017 09:24:10 GMT
Merge branch 'master' into ignite-2.0


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

Branch: refs/heads/ignite-2.0
Commit: 6090ebdfcd0ea3840b0d32cb10197b43615e1e89
Parents: 1f74346 beb242b
Author: devozerov <vozerov@gridgain.com>
Authored: Thu Jan 5 12:23:06 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Thu Jan 5 12:23:06 2017 +0300

----------------------------------------------------------------------
 modules/cloud/pom.xml                           |   6 +-
 .../java/org/apache/ignite/IgniteLogger.java    |   4 +-
 .../apache/ignite/IgniteSystemProperties.java   |  13 +
 .../ignite/cache/affinity/AffinityKey.java      |   4 +-
 .../org/apache/ignite/events/CacheEvent.java    |   6 +-
 .../ignite/events/CacheQueryReadEvent.java      |   8 +-
 .../ignite/internal/binary/BinaryContext.java   |   4 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |  10 +-
 .../ignite/internal/binary/BinaryMetadata.java  |   5 +-
 .../internal/binary/BinaryObjectExImpl.java     |   8 +-
 .../ignite/internal/binary/BinaryTypeProxy.java |  15 +-
 .../ignite/internal/binary/BinaryUtils.java     |   4 +-
 .../cache/CacheInvokeDirectResult.java          |   2 +-
 .../processors/cache/CacheInvokeResult.java     |   2 +-
 .../processors/cache/CacheLazyEntry.java        |   4 +-
 .../processors/cache/CacheObjectAdapter.java    |   7 +-
 .../processors/cache/GridCacheAdapter.java      |   5 +-
 .../cache/GridCacheMvccCandidate.java           |   9 +-
 .../processors/cache/GridCacheReturn.java       |   2 +-
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   2 +-
 .../distributed/near/GridNearLockFuture.java    |   2 +-
 .../cache/query/GridCacheQueryAdapter.java      |   4 +-
 .../cache/query/GridCacheQueryManager.java      |  13 +-
 .../cache/query/GridCacheQueryRequest.java      |   2 +
 .../cache/query/GridCacheSqlQuery.java          |   4 +-
 .../continuous/CacheContinuousQueryEvent.java   |   8 +-
 .../continuous/CacheContinuousQueryManager.java |   4 +-
 .../store/GridCacheStoreManagerAdapter.java     |  30 +-
 .../cache/store/GridCacheWriteBehindStore.java  |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |  11 +-
 .../GridCacheVersionConflictContext.java        |   2 +-
 .../closure/GridClosureProcessor.java           |   4 +-
 .../continuous/GridContinuousMessage.java       |   2 +-
 .../datastructures/CollocatedSetItemKey.java    |   2 +-
 .../GridCacheAtomicLongValue.java               |   2 +
 .../GridCacheAtomicSequenceImpl.java            |   2 +
 .../GridCacheAtomicSequenceValue.java           |   2 +
 .../GridCacheCountDownLatchValue.java           |   3 +
 .../datastructures/GridCacheSetItemKey.java     |   2 +-
 .../processors/hadoop/HadoopJobProperty.java    |   7 +
 .../shuffle/HadoopDirectShuffleMessage.java     |  34 +-
 .../internal/processors/job/GridJobWorker.java  |   7 +-
 .../odbc/OdbcQueryExecuteRequest.java           |   6 +-
 .../platform/PlatformNativeException.java       |   3 +-
 .../processors/query/GridQueryProcessor.java    |  35 +-
 .../processors/rest/GridRestResponse.java       |   2 +-
 .../internal/util/future/GridFutureAdapter.java |   2 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   2 +-
 .../ignite/internal/util/nio/GridNioServer.java | 159 ++++-
 .../util/tostring/GridToStringBuilder.java      | 656 +++++++++++++++++--
 .../util/tostring/GridToStringInclude.java      |  12 +-
 .../util/tostring/GridToStringThreadLocal.java  |  12 +-
 .../query/VisorQueryScanSubstringFilter.java    |   5 +-
 .../internal/visor/query/VisorQueryUtils.java   |  60 ++
 .../communication/tcp/TcpCommunicationSpi.java  |  20 +-
 .../tcp/TcpCommunicationSpiMBean.java           |   5 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |   3 +
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  16 +-
 .../resources/META-INF/classnames.properties    |   1 +
 .../internal/binary/BinaryEnumsSelfTest.java    |  18 +
 ...mmunicationBalancePairedConnectionsTest.java |  28 +
 .../IgniteCommunicationBalanceTest.java         |  25 +-
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   7 +-
 ...cMessageRecoveryNoPairedConnectionsTest.java |  47 --
 ...micMessageRecoveryPairedConnectionsTest.java |  47 ++
 .../cache/query/IndexingSpiQuerySelfTest.java   | 199 +++++-
 .../tostring/GridToStringBuilderSelfTest.java   |  33 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   6 +-
 modules/gce/pom.xml                             |   4 +-
 .../hadoop/impl/igfs/HadoopIgfsJclLogger.java   |   9 +-
 .../hadoop/shuffle/HadoopShuffleJob.java        |  57 +-
 .../shuffle/direct/HadoopDirectDataOutput.java  |  14 +
 .../direct/HadoopDirectDataOutputContext.java   |  48 +-
 .../direct/HadoopDirectDataOutputState.java     |  14 +-
 .../hadoop/impl/HadoopTeraSortTest.java         |  32 +-
 .../org/apache/ignite/logger/jcl/JclLogger.java |   9 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.Core.Tests.csproj             |   1 +
 .../Cache/CacheAbstractTest.cs                  | 625 ------------------
 .../Cache/CacheAbstractTransactionalTest.cs     | 565 ++++++++++++++++
 .../Cache/CacheLocalAtomicTest.cs               |   5 -
 .../Cache/CacheLocalTest.cs                     |   6 +-
 .../CachePartitionedAtomicNearEnabledTest.cs    |   5 -
 .../Cache/CachePartitionedAtomicTest.cs         |   5 -
 .../Cache/CachePartitionedNearEnabledTest.cs    |   7 +-
 .../Cache/CachePartitionedTest.cs               |   7 +-
 .../Cache/CacheReplicatedAtomicTest.cs          |   5 -
 .../Cache/CacheReplicatedTest.cs                |   7 +-
 .../Query/CacheQueriesCodeConfigurationTest.cs  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Impl/Transactions/TransactionsImpl.cs       |  18 +
 .../Transactions/ITransactions.cs               |  19 +-
 .../apache/ignite/logger/slf4j/Slf4jLogger.java |  11 +-
 modules/web-console/backend/app/mongo.js        |  19 +
 .../generator/AbstractTransformer.js            |   5 +
 .../modules/configuration/generator/Beans.js    |   4 +
 .../generator/ConfigurationGenerator.js         |  36 +
 .../states/configuration/caches/affinity.jade   |  82 +++
 .../states/configuration/caches/memory.jade     |   4 +-
 .../frontend/views/configuration/caches.jade    |   1 +
 .../yardstick/cache/IgniteIoTestBenchmark.java  |  73 ---
 parent/pom.xml                                  |   2 +-
 104 files changed, 2351 insertions(+), 1038 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6090ebdf/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6090ebdf/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
index a3115bf,4dd3bf5..60992d5
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java
@@@ -103,9 -103,16 +103,16 @@@ public enum HadoopJobProperty 
      SHUFFLE_MSG_SIZE("ignite.shuffle.message.size"),
  
      /**
+      * Whether shuffle message should be compressed with GZIP.
+      * <p>
+      * Defaults to {@code false}.
+      */
+     SHUFFLE_MSG_GZIP("ignite.shuffle.message.gzip"),
+ 
+     /**
       * Whether to stripe mapper output for remote reducers.
       * <p>
 -     * Defaults to {@code false}.
 +     * Defaults to {@code true}.
       */
      SHUFFLE_MAPPER_STRIPED_OUTPUT("ignite.shuffle.mapper.striped.output"),
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/6090ebdf/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
----------------------------------------------------------------------


Mime
View raw message