ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject [50/50] ignite git commit: ignite-1272: merge from master
Date Wed, 07 Oct 2015 12:54:12 GMT
ignite-1272: merge from master


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

Branch: refs/heads/ignite-1272
Commit: ece9b5ad8771534ef6778216aff9a0dfff42e4b1
Parents: 8635693 f60cba7
Author: Denis Magda <dmagda@gridgain.com>
Authored: Wed Oct 7 15:52:48 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Wed Oct 7 15:52:48 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |   2 +
 assembly/dependencies-fabric.xml                |   2 +-
 assembly/release-fabric.xml                     |  10 +-
 bin/igniterouter.bat                            |   2 +-
 bin/igniterouter.sh                             |   2 +-
 examples/pom.xml                                |   2 +-
 examples/schema-import/pom-standalone.xml       |  90 +++
 examples/schema-import/pom.xml                  |  23 +-
 .../computegrid/ComputeClosureExample.java      |   2 +-
 .../socket/WordsSocketStreamerServer.java       |   5 +-
 modules/aop/pom.xml                             |   2 +-
 modules/apache-license-gen/README.txt           |  33 +
 modules/apache-license-gen/pom.xml              |   2 +-
 modules/aws/pom.xml                             |   2 +-
 modules/clients/pom.xml                         |   2 +-
 modules/cloud/pom.xml                           |   2 +-
 .../TcpDiscoveryCloudIpFinderSelfTest.java      |   2 +
 modules/codegen/pom.xml                         |   2 +-
 modules/core/pom.xml                            |   2 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |  15 +-
 .../apache/ignite/IgniteAtomicReference.java    |   9 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |   9 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |  13 +-
 .../org/apache/ignite/IgniteFileSystem.java     |   4 +-
 .../configuration/CacheConfiguration.java       |   2 +-
 .../ignite/configuration/TopologyValidator.java |  38 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    |  70 +--
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/GridDiscoveryManager.java         |  28 +-
 .../cache/DynamicCacheChangeRequest.java        |  19 +
 .../cache/DynamicCacheDescriptor.java           |  36 ++
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../processors/cache/GridCacheEventManager.java |  12 +-
 .../cache/GridCacheExplicitLockSpan.java        |  13 +-
 .../processors/cache/GridCacheIoManager.java    |  76 +--
 .../processors/cache/GridCacheMessage.java      |   7 -
 .../cache/GridCacheMvccCandidate.java           |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  67 +-
 .../GridCachePartitionExchangeManager.java      |  92 +--
 .../processors/cache/GridCacheProcessor.java    | 109 ++--
 .../cache/GridCacheSharedContext.java           |  32 -
 .../processors/cache/GridCacheSwapManager.java  |   4 +-
 .../processors/cache/GridCacheUtils.java        |   8 -
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   5 -
 .../dht/GridDhtAffinityAssignmentResponse.java  |   5 -
 .../cache/distributed/dht/GridDhtGetFuture.java |   4 +-
 .../distributed/dht/GridDhtLockRequest.java     |  10 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   5 -
 .../distributed/dht/GridDhtTxPrepareFuture.java |   6 +-
 .../dht/GridDhtTxPrepareRequest.java            |   7 +-
 .../dht/GridPartitionedGetFuture.java           |   5 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   5 +
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   9 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   5 -
 .../dht/preloader/GridDhtForceKeysResponse.java |   5 -
 .../GridDhtPartitionDemandMessage.java          |   5 -
 .../GridDhtPartitionSupplyMessage.java          |   5 -
 .../GridDhtPartitionsAbstractMessage.java       |   5 -
 .../dht/preloader/GridDhtPreloader.java         |   8 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +
 .../near/GridNearTxFinishFuture.java            |   4 +-
 .../cache/distributed/near/GridNearTxLocal.java |  21 +-
 .../cache/local/GridLocalCacheEntry.java        |   2 +-
 .../continuous/CacheContinuousQueryHandler.java |   7 +-
 .../transactions/IgniteTxLocalAdapter.java      |  35 +-
 .../continuous/GridContinuousProcessor.java     |  17 +-
 .../datastructures/DataStructuresProcessor.java |   6 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |  15 +-
 .../internal/processors/igfs/IgfsImpl.java      | 208 +------
 .../processors/igfs/IgfsMetaManager.java        | 594 ++++++++++++++++--
 .../ignite/internal/util/GridArgumentCheck.java |   5 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |   4 +-
 .../org/apache/ignite/stream/StreamAdapter.java | 104 +++-
 .../stream/StreamMultipleTupleExtractor.java    |  38 ++
 .../stream/StreamSingleTupleExtractor.java      |  40 ++
 .../ignite/stream/StreamTupleExtractor.java     |  20 +-
 .../ignite/stream/socket/SocketStreamer.java    |   3 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   2 +-
 .../internal/GridUpdateNotifierSelfTest.java    |   1 +
 .../IgniteClientReconnectAbstractTest.java      |  35 +-
 .../IgniteClientReconnectCacheTest.java         | 154 +++++
 .../GridDiscoveryManagerAliveCacheSelfTest.java |   2 +
 .../processors/cache/CrossCacheLockTest.java    | 142 +++++
 .../GridCacheAbstractFailoverSelfTest.java      |   3 +
 .../GridCacheAbstractRemoveFailureTest.java     |   3 +
 .../GridCacheDeploymentOffHeapSelfTest.java     |  15 +
 .../GridCacheFinishPartitionsSelfTest.java      |   5 +-
 .../GridCacheVariableTopologySelfTest.java      |   3 +-
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |   4 +
 .../cache/IgniteCacheCreateRestartSelfTest.java |   3 +
 .../cache/IgniteCacheEntryListenerTxTest.java   |   4 +
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   7 +
 ...CacheP2pUnmarshallingRebalanceErrorTest.java |  12 +-
 .../cache/IgniteCachePutAllRestartTest.java     |   4 +-
 .../cache/IgniteDynamicCacheFilterTest.java     | 150 +++++
 .../IgniteTxExceptionAbstractSelfTest.java      |   3 +
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |   5 -
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |   9 +-
 ...artitionedOffHeapValuesQueueApiSelfTest.java |   4 +
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  16 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |   5 -
 ...GridCachePartitionedSetFailoverSelfTest.java |   4 +
 ...acheAsyncOperationsFailoverAbstractTest.java |  11 +
 .../CacheGetFutureHangsSelfTest.java            | 156 +++--
 .../CachePutAllFailoverAbstractTest.java        |  11 +
 .../IgniteCacheAtomicNodeRestartTest.java       |   8 +
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  | 151 +++++
 .../distributed/IgniteCacheCreatePutTest.java   | 125 ++++
 .../IgniteCachePutGetRestartAbstractTest.java   |   3 +
 .../IgniteCacheSizeFailoverTest.java            |   3 +
 .../IgniteTxPreloadAbstractTest.java            |  43 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |   5 -
 .../dht/GridNearCacheTxNodeFailureSelfTest.java |   4 +
 ...gniteAtomicLongChangingTopologySelfTest.java |  29 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   3 +
 .../IgniteCrossCacheTxNearEnabledSelfTest.java  |  28 +
 .../dht/IgniteCrossCacheTxSelfTest.java         | 213 +++++++
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   4 +
 .../near/GridCacheNearTxExceptionSelfTest.java  |   9 +-
 .../near/NearCacheMultithreadedUpdateTest.java  | 217 +++++++
 .../GridCacheReplicatedInvalidateSelfTest.java  | 249 --------
 .../GridCacheReplicatedTxExceptionSelfTest.java |   5 -
 .../replicated/GridReplicatedTxPreloadTest.java |   2 -
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |   5 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |   5 -
 ...bledFairAffinityMultiJvmFullApiSelfTest.java |   5 +
 ...tomicNearEnabledMultiJvmFullApiSelfTest.java |   5 +
 .../DataStreamerMultiThreadedSelfTest.java      |   4 +-
 .../DataStreamerMultinodeCreateCacheTest.java   |   2 +
 .../processors/igfs/IgfsAbstractSelfTest.java   | 378 +++++++++---
 .../igfs/IgfsClientCacheSelfTest.java           |  15 +-
 .../igfs/IgfsMetaManagerSelfTest.java           | 100 ++-
 .../processors/igfs/IgfsMetricsSelfTest.java    |   2 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  29 +-
 .../igfs/UniversalFileSystemAdapter.java        |   1 -
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   2 +
 .../stream/socket/SocketStreamerSelfTest.java   | 112 +++-
 .../multijvm/IgniteCacheProcessProxy.java       |   3 +-
 .../IgniteCacheFailoverTestSuite.java           |   4 -
 .../IgniteCacheFailoverTestSuite3.java          |  28 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   2 -
 .../testsuites/IgniteCacheTestSuite4.java       |  22 +
 modules/extdata/p2p/pom.xml                     |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml                     |   2 +-
 modules/gce/pom.xml                             |   2 +-
 modules/geospatial/pom.xml                      |   2 +-
 modules/hadoop/pom.xml                          |   2 +-
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |  36 ++
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |   5 +
 ...oopFileSystemUniversalFileSystemAdapter.java |   4 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   7 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   5 +-
 .../testsuites/IgniteHadoopTestSuite.java       |  19 +-
 modules/hibernate/pom.xml                       |   2 +-
 modules/indexing/pom.xml                        |   2 +-
 .../processors/query/h2/sql/GridSqlArray.java   |  52 ++
 .../processors/query/h2/sql/GridSqlElement.java |   2 +-
 .../query/h2/sql/GridSqlFunction.java           |  60 +-
 .../query/h2/sql/GridSqlFunctionType.java       |   3 +
 .../query/h2/sql/GridSqlPlaceholder.java        |   7 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  84 +--
 .../processors/query/h2/sql/GridSqlType.java    |  29 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  27 +
 modules/jcl/pom.xml                             |   2 +-
 modules/jms11/pom.xml                           |   2 +-
 modules/jta/pom.xml                             |   2 +-
 modules/kafka/pom.xml                           |   2 +-
 modules/log4j/pom.xml                           |   2 +-
 modules/log4j2/pom.xml                          |   2 +-
 modules/mesos/pom.xml                           |   2 +-
 modules/mqtt/pom.xml                            | 114 ++++
 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++++++++++++++++++
 .../stream/mqtt/IgniteMqttStreamerTest.java     | 553 +++++++++++++++++
 .../mqtt/IgniteMqttStreamerTestSuite.java       |  34 ++
 modules/platform/pom.xml                        |   2 +-
 .../platform/src/main/cpp/common/configure.ac   |   2 +-
 .../src/main/cpp/core-test/configure.ac         |   2 +-
 modules/platform/src/main/cpp/core/configure.ac |   2 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 modules/rest-http/pom.xml                       |   2 +-
 modules/scalar-2.10/pom.xml                     |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 modules/schedule/pom.xml                        |   2 +-
 modules/schema-import/pom.xml                   |   2 +-
 modules/slf4j/pom.xml                           |   2 +-
 modules/spark-2.10/pom.xml                      |   2 +-
 modules/spark/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |   2 +-
 modules/ssh/pom.xml                             |   2 +-
 modules/tools/pom.xml                           |   2 +-
 modules/urideploy/pom.xml                       |   2 +-
 modules/visor-console-2.10/pom.xml              |   2 +-
 modules/visor-console/pom.xml                   |   2 +-
 modules/visor-plugins/pom.xml                   |   2 +-
 modules/web/pom.xml                             |   2 +-
 .../config/benchmark-put-indexed-val.properties |   2 +-
 modules/yardstick/pom.xml                       |  12 +-
 modules/yarn/pom.xml                            |   2 +-
 modules/zookeeper/pom.xml                       |   2 +-
 pom.xml                                         |  39 +-
 209 files changed, 4963 insertions(+), 1546 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 4f395e0,be59a95..5e9b2f1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@@ -159,14 -157,8 +159,9 @@@ public class GridDhtTxFinishRequest ext
          this.sysInvalidate = sysInvalidate;
          this.subjId = subjId;
          this.taskNameHash = taskNameHash;
 +        this.depEnabled = depEnabled;
      }
  
-     /** {@inheritDoc} */
-     @Override public boolean allowForStartup() {
-         return true;
-     }
- 
      /**
       * @return Mini ID.
       */

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 61f13a9,1990e18..e517c70
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@@ -234,12 -233,12 +233,10 @@@ class CacheContinuousQueryHandler<K, V
                          locLsnr.onUpdated(F.<CacheEntryEvent<? extends K, ? extends
V>>asList(evt));
                      else {
                          try {
-                             ClusterNode node = ctx.discovery().node(nodeId);
- 
-                             if (cctx.deploymentEnabled() && node != null) {
 -                            if (ctx.config().isPeerClassLoadingEnabled() && ctx.discovery().node(nodeId)
!= null) {
++                            if (cctx.deploymentEnabled() && ctx.discovery().node(nodeId)
!= null) {
                                  evt.entry().prepareMarshal(cctx);
  
 -                                GridCacheDeploymentManager depMgr = cctx.deploy();
 -
 -                                depMgr.prepare(evt.entry());
 +                                cctx.deploy().prepare(evt.entry());
                              }
                              else
                                  evt.entry().prepareMarshal(cctx);

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece9b5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------


Mime
View raw message