ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [04/50] [abbrv] ignite git commit: Merge branches 'ignite-1.8.4' and 'web-console-production' of https://github.com/gridgain/apache-ignite into web-console-production
Date Mon, 03 Apr 2017 08:31:04 GMT
Merge branches 'ignite-1.8.4' and 'web-console-production' of https://github.com/gridgain/apache-ignite
into web-console-production


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

Branch: refs/heads/master
Commit: 1b935be6fa461c9c5faea4e8b44e2abf2e173ab4
Parents: 231984d 2263283
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Mar 21 09:36:12 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Mar 21 09:36:12 2017 +0700

----------------------------------------------------------------------
 NOTICE                                          |   2 +-
 assembly/NOTICE_FABRIC                          |   2 +-
 assembly/NOTICE_HADOOP                          |   2 +-
 modules/core/src/main/java/META-INF/NOTICE      |   2 +-
 .../affinity/fair/FairAffinityFunction.java     |  33 +--
 .../ignite/internal/IgniteVersionUtils.java     |   2 +-
 .../internal/managers/GridManagerAdapter.java   |   4 +
 .../processors/cache/EntryGetResult.java        |  40 +++-
 .../processors/cache/EntryGetWithTtlResult.java |  58 ++++++
 .../processors/cache/GridCacheAdapter.java      | 104 +++++-----
 .../processors/cache/GridCacheContext.java      | 122 +++++++++--
 .../processors/cache/GridCacheEntryEx.java      |   6 +-
 .../processors/cache/GridCacheMapEntry.java     |  46 +++-
 .../GridDistributedCacheAdapter.java            |   6 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  29 ++-
 .../cache/distributed/dht/GridDhtGetFuture.java |  24 ++-
 .../distributed/dht/GridDhtGetSingleFuture.java |  24 ++-
 .../distributed/dht/GridDhtLockFuture.java      |  21 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   7 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   8 +-
 .../dht/GridPartitionedGetFuture.java           |  20 +-
 .../dht/GridPartitionedSingleGetFuture.java     |   9 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  15 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  25 ++-
 .../colocated/GridDhtColocatedLockFuture.java   |  10 +-
 .../distributed/near/GridNearAtomicCache.java   |   1 +
 .../distributed/near/GridNearGetFuture.java     |  10 +-
 .../distributed/near/GridNearGetRequest.java    |  77 ++++---
 .../distributed/near/GridNearLockFuture.java    |   7 +
 .../distributed/near/GridNearLockRequest.java   |  81 +++++---
 .../near/GridNearSingleGetRequest.java          |  57 +++--
 .../near/GridNearTransactionalCache.java        |   2 +
 .../cache/distributed/near/GridNearTxLocal.java |  25 ++-
 .../processors/cache/local/GridLocalCache.java  |   1 +
 .../local/atomic/GridLocalAtomicCache.java      |  14 +-
 .../cache/query/GridCacheQueryManager.java      |  97 ++++-----
 .../transactions/IgniteTxLocalAdapter.java      | 102 ++++++---
 .../cache/transactions/IgniteTxLocalEx.java     |   3 +
 .../processors/query/GridQueryIndexing.java     |  17 +-
 .../processors/query/GridQueryProcessor.java    |  32 ++-
 .../processors/query/GridRunningQueryInfo.java  | 132 ++++++++++++
 .../internal/visor/VisorMultiNodeTask.java      |   2 +-
 .../visor/cache/VisorCacheClearTask.java        |  47 +++--
 .../visor/cache/VisorCacheTypeMetadata.java     |   6 +
 .../visor/compute/VisorGatewayTask.java         |  30 ++-
 .../visor/node/VisorIgfsConfiguration.java      |   1 -
 .../visor/query/VisorCancelQueriesTask.java     |  72 +++++++
 .../query/VisorCollectRunningQueriesTask.java   |  96 +++++++++
 .../internal/visor/query/VisorQueryArgV3.java   |  51 +++++
 .../internal/visor/query/VisorQueryJob.java     |   6 +-
 .../internal/visor/query/VisorRunningQuery.java | 132 ++++++++++++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   5 +
 .../org/apache/ignite/spi/IgniteSpiContext.java |   6 +
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  32 ++-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  19 ++
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   5 +
 .../tcp/internal/TcpDiscoveryNode.java          |   6 +-
 .../resources/META-INF/classnames.properties    |   1 +
 .../affinity/fair/FairAffinityNodesRestart.java | 130 ++++++++++++
 .../cache/GridCacheAbstractFullApiSelfTest.java |  20 +-
 .../processors/cache/GridCacheTestEntryEx.java  | 107 +++++-----
 .../CacheLockReleaseNodeLeaveTest.java          |  65 +++++-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  44 +++-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java | 102 +++++++++
 .../IgniteCacheTxExpiryPolicyWithStoreTest.java |  21 ++
 ...veryNodeAttributesUpdateOnReconnectTest.java | 110 ++++++++++
 .../TcpDiscoverySslSecuredUnsecuredTest.java    | 185 +++++++++++++++++
 .../tcp/TestReconnectPluginProvider.java        | 111 ++++++++++
 .../discovery/tcp/TestReconnectProcessor.java   |  93 +++++++++
 .../startup/GridRandomCommandLineLoader.java    |   2 +-
 .../testframework/GridSpiTestContext.java       |   5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |   5 +
 .../org.apache.ignite.plugin.PluginProvider     |   1 +
 .../cache/query/GridCacheTwoStepQuery.java      |  18 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  86 +++++++-
 .../query/h2/sql/GridSqlQuerySplitter.java      |   4 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  60 +++++-
 .../cache/CacheSqlQueryValueCopySelfTest.java   | 208 +++++++++++++++++--
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   2 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |   7 +
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.AspNet.nuspec                 |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.Core.Schema.nuspec            |   2 +-
 .../Apache.Ignite.Core.nuspec                   |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.Linq.nuspec                   |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.Log4Net.nuspec                |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite.NLog.nuspec                   |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 modules/scalar-2.10/pom.xml                     |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 .../app/modules/branding/branding.provider.js   |   2 +-
 parent/pom.xml                                  |   3 +-
 104 files changed, 2738 insertions(+), 493 deletions(-)
----------------------------------------------------------------------



Mime
View raw message