ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-5272' into ignite-5272
Date Tue, 13 Jun 2017 18:18:32 GMT
Merge remote-tracking branch 'origin/ignite-5272' into ignite-5272


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

Branch: refs/heads/ignite-5272
Commit: 3b2cd87ed800f3067f7a52b184d8abfad830d174
Parents: 4b0c61c 84bcfa1
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jun 13 21:18:22 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jun 13 21:18:22 2017 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   6 +-
 config/ignite-log4j2.xml                        |   6 +-
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |   6 +-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../thin/JdbcThinAutoCloseServerCursorTest.java | 359 ++++++++++++++
 .../jdbc/thin/JdbcThinConnectionSelfTest.java   |  36 ++
 modules/clients/src/test/resources/log4j.xml    |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   |   6 +
 .../configuration/CacheConfiguration.java       |  24 +
 .../configuration/IgniteConfiguration.java      |   6 +
 .../org/apache/ignite/internal/GridTopic.java   |   6 +-
 .../ignite/internal/IgniteDiagnosticAware.java  |  28 ++
 .../ignite/internal/IgniteDiagnosticInfo.java   |  45 ++
 .../internal/IgniteDiagnosticMessage.java       | 467 +++++++++++++++++++
 .../IgniteDiagnosticPrepareContext.java         | 279 +++++++++++
 .../apache/ignite/internal/IgniteKernal.java    |   7 +-
 .../internal/binary/BinaryClassDescriptor.java  |   1 -
 .../ignite/internal/binary/BinaryContext.java   |   1 -
 .../ignite/internal/binary/BinaryFieldEx.java   |   5 +
 .../ignite/internal/binary/BinaryFieldImpl.java |   5 +
 .../ignite/internal/client/GridClientNode.java  |   9 +-
 .../client/impl/GridClientNodeImpl.java         |  22 +-
 .../connection/GridClientNioTcpConnection.java  |   3 +-
 .../internal/jdbc/thin/JdbcThinConnection.java  |   4 +-
 .../internal/jdbc/thin/JdbcThinResultSet.java   |  18 +-
 .../internal/jdbc/thin/JdbcThinStatement.java   |   2 +-
 .../internal/jdbc/thin/JdbcThinTcpIo.java       |  17 +-
 .../internal/jdbc/thin/JdbcThinUtils.java       |   7 +-
 .../managers/communication/GridIoManager.java   |   2 +-
 .../communication/GridIoMessageFactory.java     |   8 +-
 .../internal/managers/discovery/DiscoCache.java |  17 -
 .../discovery/GridDiscoveryManager.java         |  19 +-
 .../processors/GridProcessorAdapter.java        |  10 +
 .../cache/CacheAffinitySharedManager.java       |  38 +-
 .../ClientCacheChangeDummyDiscoveryMessage.java |   3 +-
 .../processors/cache/ClusterCachesInfo.java     |  30 +-
 .../processors/cache/GridCacheAttributes.java   |  17 +-
 .../processors/cache/GridCacheIoManager.java    | 248 ++++++++--
 .../GridCachePartitionExchangeManager.java      | 136 ++++--
 .../processors/cache/GridCacheProcessor.java    |  73 +--
 .../cache/GridCacheSharedManagerAdapter.java    |   9 +
 .../GridDistributedTxPrepareRequest.java        |  14 +-
 .../GridDistributedTxPrepareResponse.java       |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   1 +
 .../distributed/dht/GridDhtCacheEntry.java      |  30 +-
 .../dht/GridDhtPartitionTopology.java           |   2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   3 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   7 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  42 +-
 .../dht/GridDhtTxPrepareRequest.java            |  43 +-
 .../dht/GridDhtTxPrepareResponse.java           |   6 +-
 .../dht/GridPartitionedSingleGetFuture.java     |  37 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |  76 ++-
 .../GridDhtAtomicAbstractUpdateRequest.java     |  22 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  57 +--
 .../atomic/GridDhtAtomicSingleUpdateFuture.java |   6 +-
 .../GridDhtAtomicSingleUpdateRequest.java       |  14 +
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  11 +-
 ...idNearAtomicAbstractSingleUpdateRequest.java |  21 +-
 .../GridNearAtomicAbstractUpdateFuture.java     | 200 ++++++--
 .../GridNearAtomicAbstractUpdateRequest.java    |  81 +++-
 .../atomic/GridNearAtomicFullUpdateRequest.java |  26 +-
 ...GridNearAtomicSingleUpdateFilterRequest.java |  25 +-
 .../GridNearAtomicSingleUpdateFuture.java       |  46 +-
 ...GridNearAtomicSingleUpdateInvokeRequest.java |  25 +-
 .../GridNearAtomicSingleUpdateRequest.java      |  22 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  48 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |  24 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  88 +++-
 .../GridDhtPartitionsExchangeFuture.java        |  48 +-
 .../distributed/near/GridNearGetRequest.java    |   1 -
 .../distributed/near/GridNearLockFuture.java    |   1 +
 .../distributed/near/GridNearLockRequest.java   |  13 +-
 .../near/GridNearTxFinishFuture.java            |  11 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |   5 +-
 .../near/GridNearTxPrepareResponse.java         |  14 +
 .../cache/query/GridCacheQueryAdapter.java      |   9 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   6 +-
 .../cache/transactions/IgniteTxEntry.java       |  15 +
 .../cache/transactions/IgniteTxHandler.java     |  15 +-
 .../IgniteTxImplicitSingleStateImpl.java        |  11 -
 .../cache/transactions/IgniteTxLocalState.java  |  10 -
 .../cache/transactions/IgniteTxManager.java     |  27 ++
 .../IgniteTxRemoteStateAdapter.java             |   7 -
 .../cache/transactions/IgniteTxState.java       |   6 -
 .../cache/transactions/IgniteTxStateImpl.java   |  32 --
 .../processors/cluster/ClusterProcessor.java    | 305 +++++++++++-
 .../processors/odbc/SqlListenerNioListener.java |   3 +-
 .../processors/odbc/jdbc/JdbcQueryCursor.java   |   9 +-
 .../odbc/jdbc/JdbcRequestHandler.java           |  21 +-
 .../PlatformDotNetConfigurationClosure.java     |   8 +-
 .../utils/PlatformConfigurationUtils.java       |  94 ++++
 .../query/DynamicTableAffinityKeyMapper.java    |  92 ++++
 .../processors/query/GridQueryProcessor.java    |  61 ++-
 .../internal/processors/query/QueryUtils.java   |  51 +-
 .../rest/client/message/GridClientNodeBean.java |  25 +
 .../top/GridTopologyCommandHandler.java         |   1 +
 .../ignite/internal/util/nio/GridNioServer.java | 212 ++++++---
 .../visor/cache/VisorCacheConfiguration.java    |  13 +
 .../compute/VisorComputeCancelSessionsTask.java |   6 +-
 .../VisorComputeCancelSessionsTaskArg.java      |  10 +-
 .../visor/query/VisorQueryIndexField.java       |  32 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 185 +++++---
 modules/core/src/test/config/log4j-test.xml     |   6 +-
 modules/core/src/test/config/log4j2-test.xml    |   6 +-
 .../src/test/config/log4j2-verbose-test.xml     |   4 +-
 .../managers/IgniteDiagnosticMessagesTest.java  | 255 ++++++++++
 .../processors/cache/IgniteCacheGroupsTest.java |  98 ++--
 ...IgniteClientCacheInitializationFailTest.java |   6 +-
 .../IgniteDynamicClientCacheStartSelfTest.java  |  49 ++
 .../cache/IgniteNearClientCacheCloseTest.java   | 262 +++++++++++
 .../cache/IgniteNearClientCacheTest.java        |  87 ----
 .../IgniteOnePhaseCommitNearReadersTest.java    | 270 +++++++++++
 .../CacheLateAffinityAssignmentTest.java        |   8 +-
 .../atomic/IgniteCacheAtomicProtocolTest.java   | 128 +++++
 .../loadtest/GridSingleExecutionTest.java       |   4 +-
 .../cache/GridCacheAbstractLoadTest.java        |   4 +-
 .../platform/PlatformComputeEchoTask.java       |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   4 +-
 .../junits/logger/GridTestLog4jLogger.java      |   4 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   6 +-
 .../testsuites/IgniteCacheTestSuite2.java       |   5 +
 .../testsuites/IgniteCacheTestSuite3.java       |   4 +-
 .../query/h2/ddl/DdlStatementsProcessor.java    |  28 +-
 .../processors/query/h2/opt/GridH2Table.java    |   5 +-
 .../query/h2/sql/GridSqlCreateTable.java        |  37 +-
 .../processors/query/h2/sql/GridSqlJoin.java    |   7 +
 .../query/h2/sql/GridSqlQueryParser.java        |  54 +++
 .../query/h2/sql/GridSqlQuerySplitter.java      | 147 +++++-
 .../h2/twostep/msg/GridH2IndexRangeRequest.java |   2 +
 .../cache/CacheIteratorScanQueryTest.java       | 110 +++++
 .../cache/IgniteCacheNoClassQuerySelfTest.java  |   6 +-
 .../cache/index/H2DynamicTableSelfTest.java     | 249 ++++++++--
 .../query/IgniteSqlSplitterSelfTest.java        |  97 ++++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../apache/ignite/logger/log4j/Log4JLogger.java |   4 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |   2 +-
 .../ignite/logger/log4j2/Log4J2Logger.java      |   2 +-
 .../impls/matrix/SparseDistributedMatrix.java   |   9 -
 .../matrix/SparseDistributedMatrixTest.java     |   9 -
 .../Binary/BinaryCompactFooterInteropTest.cs    |   8 +-
 .../Binary/BinaryDynamicRegistrationTest.cs     |   7 +-
 .../Cache/CacheConfigurationTest.cs             |  10 +
 .../Cache/Query/CacheDmlQueriesTest.cs          | 197 +++++++-
 .../Compute/ComputeApiTest.cs                   |  25 +-
 .../Config/Log/dotnet-log4j.xml                 |   2 +-
 .../IgniteConfigurationSerializerTest.cs        |  37 +-
 .../IgniteConfigurationTest.cs                  |  60 +++
 .../ProjectFilesTest.cs                         |   7 +-
 .../Apache.Ignite.Core.csproj                   |   2 +
 .../Cache/Configuration/CacheConfiguration.cs   |  23 +
 .../Configuration/Package-Info.cs               |  26 ++
 .../Configuration/SqlConnectorConfiguration.cs  | 159 +++++++
 .../Datastream/IDataStreamer.cs                 |   8 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   | 184 ++++++++
 .../IgniteConfigurationSection.xsd              | 104 +++++
 .../Impl/Binary/BinaryArrayEqualityComparer.cs  |   6 +-
 .../Impl/Binary/BinaryObjectHeader.cs           |   8 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |  10 +
 .../commands/cache/VisorCacheCommand.scala      |   1 +
 .../src/main/java/log4j.properties              |   2 +-
 modules/web-console/backend/.gitignore          |   1 +
 modules/web-console/backend/app/mongo.js        |   1 +
 modules/web-console/frontend/.gitignore         |   1 +
 .../frontend/app/helpers/jade/mixins.pug        |   1 +
 .../generator/ConfigurationGenerator.js         |   8 +-
 .../states/configuration/caches/general.pug     |   4 +
 .../frontend/app/primitives/index.js            |   1 +
 .../frontend/app/primitives/switch/index.pug    |  34 ++
 .../frontend/app/primitives/switch/index.scss   |  87 ++++
 .../frontend/controllers/domains-controller.js  | 169 +++----
 .../views/configuration/domains-import.tpl.pug  |   4 +-
 .../apache/ignite/console/agent/AgentUtils.java |  24 +-
 .../ignite/console/agent/db/DbColumn.java       |  17 +-
 .../ignite/console/agent/db/DbSchema.java       |  60 +++
 .../apache/ignite/console/agent/db/DbTable.java |  21 +-
 .../db/dialect/DatabaseMetadataDialect.java     |  27 +-
 .../agent/db/dialect/JdbcMetadataDialect.java   |  42 +-
 .../agent/db/dialect/OracleMetadataDialect.java | 116 ++++-
 .../console/agent/handlers/ClusterListener.java |  28 +-
 .../agent/handlers/DatabaseListener.java        |  18 +-
 .../ignite/console/demo/AgentClusterDemo.java   |   3 +
 .../demo/service/DemoComputeLoadService.java    |  79 ++++
 .../console/demo/task/DemoCancellableTask.java  |  92 ++++
 .../console/demo/task/DemoComputeTask.java      | 105 +++++
 .../src/main/resources/log4j.properties         |   6 +-
 .../yardstick/cache/load/model/ModelUtil.java   |   1 +
 188 files changed, 6869 insertions(+), 1282 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3b2cd87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
index 54e23ae,c33ee67..878be94
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
@@@ -28,11 -28,9 +28,12 @@@ import org.jetbrains.annotations.Nullab
  /**
   * Dummy discovery message which is not really sent via ring, it is just added in local
discovery worker queue.
   */
- public class ClientCacheChangeDummyDiscoveryMessage implements DiscoveryCustomMessage, CachePartitionExchangeWorkerTask
{
+ public class ClientCacheChangeDummyDiscoveryMessage implements DiscoveryCustomMessage,
+     CachePartitionExchangeWorkerTask {
      /** */
 +    private static final long serialVersionUID = 0L;
 +
 +    /** */
      private final UUID reqId;
  
      /** */


Mime
View raw message