ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/25] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-2.1.2' into ignite-2.1.2-exchange
Date Mon, 26 Jun 2017 06:49:19 GMT
Merge remote-tracking branch 'remotes/community/ignite-2.1.2' into ignite-2.1.2-exchange

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java


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

Branch: refs/heads/ignite-2.1.2-exchange
Commit: ccb790f75c5a4c3e20f94afb8031a54261f4061b
Parents: 323ab3a e35358c
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jun 26 09:48:31 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jun 26 09:48:31 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCache.java     |   3 +-
 .../ignite/internal/GridJobSiblingImpl.java     |  34 +-
 .../internal/IgniteDiagnosticMessage.java       |  19 +-
 .../ignite/internal/MarshallerContextImpl.java  |  11 +
 .../managers/communication/GridIoManager.java   | 116 ++---
 .../deployment/GridDeploymentCommunication.java |   6 +
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../eventstorage/GridEventStorageManager.java   |   5 +
 .../processors/cache/GridCacheIoManager.java    | 135 +----
 .../GridCachePartitionExchangeManager.java      |   6 +-
 .../processors/cache/GridCachePreloader.java    |   4 +-
 .../cache/GridCachePreloaderAdapter.java        |   4 +-
 .../processors/cache/GridCacheProcessor.java    |  10 +-
 .../cache/binary/BinaryMetadataFileStore.java   | 114 ++++
 .../cache/binary/BinaryMetadataTransport.java   |  20 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  14 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  17 +-
 .../GridDhtPartitionsExchangeFuture.java        |  24 +-
 .../dht/preloader/GridDhtPreloader.java         |   2 +-
 .../distributed/near/GridNearGetRequest.java    |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   5 +-
 .../query/GridCacheDistributedQueryFuture.java  |  19 +-
 .../query/GridCacheDistributedQueryManager.java |  18 +-
 .../cache/transactions/IgniteTxManager.java     |   8 +
 .../continuous/GridContinuousProcessor.java     |   2 +-
 .../datastreamer/DataStreamerImpl.java          |   5 +
 .../internal/processors/igfs/IgfsContext.java   |  15 -
 .../processors/job/GridJobProcessor.java        |   3 +-
 .../internal/processors/job/GridJobWorker.java  |   2 +-
 .../GridMarshallerMappingProcessor.java         |   5 +
 .../processors/odbc/SqlListenerNioListener.java |   4 +-
 .../odbc/odbc/OdbcQueryFetchResult.java         |   4 +-
 .../odbc/odbc/OdbcRequestHandler.java           |  66 ++-
 .../processors/task/GridTaskProcessor.java      |   3 +-
 .../processors/task/GridTaskWorker.java         |   6 +-
 .../ignite/marshaller/MarshallerContext.java    |  27 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  47 +-
 ...GridBinaryMarshallerCtxDisabledSelfTest.java |   5 +
 .../managers/IgniteDiagnosticMessagesTest.java  | 289 ++++++++++-
 .../communication/GridIoManagerSelfTest.java    |   2 +-
 ...cTransactionsWithFilterSingleServerTest.java |  28 +
 ...cheOptimisticTransactionsWithFilterTest.java | 493 ++++++++++++++++++
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   4 +
 .../IgniteRejectConnectOnNodeStopTest.java      | 188 +++++++
 .../rebalancing/CacheManualRebalancingTest.java | 178 +++++++
 ...tePdsBinaryMetadataOnClusterRestartTest.java | 514 +++++++++++++++++++
 .../IgnitePdsCacheRebalancingAbstractTest.java  |  13 +-
 .../IgniteStandByClusterTest.java               |  51 ++
 .../ignite/testframework/GridStringLogger.java  |  35 +-
 .../testframework/junits/GridAbstractTest.java  |   1 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 .../testsuites/IgniteCacheTestSuite2.java       |   5 +
 .../testsuites/IgniteCacheTestSuite5.java       |   2 +
 .../query/h2/twostep/GridMapQueryExecutor.java  |   2 +-
 .../IgnitePdsWithIndexingCoreTestSuite.java     |   3 +
 .../compute-example/src/compute_example.cpp     |   2 +
 .../src/continuous_query_example.cpp            |   2 +
 .../examples/odbc-example/src/odbc_example.cpp  |   5 +-
 .../put-get-example/src/put_get_example.cpp     |   5 +-
 .../query-example/src/query_example.cpp         |   5 +-
 .../cpp/odbc-test/src/configuration_test.cpp    |  56 +-
 .../include/ignite/odbc/config/configuration.h  |  52 ++
 .../cpp/odbc/include/ignite/odbc/connection.h   |   2 +-
 .../cpp/odbc/include/ignite/odbc/message.h      |  11 +-
 .../odbc/system/ui/dsn_configuration_window.h   |   8 +
 .../src/system/ui/dsn_configuration_window.cpp  |  34 +-
 .../cpp/odbc/src/config/configuration.cpp       |   4 +
 modules/platforms/cpp/odbc/src/connection.cpp   |  14 +-
 modules/platforms/cpp/odbc/src/dsn_config.cpp   |   6 +
 modules/platforms/cpp/odbc/src/message.cpp      |   9 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |   5 +-
 modules/platforms/cpp/odbc/src/result_page.cpp  |   2 +-
 .../Cache/Query/CacheLinqTest.cs                |  32 +-
 .../Impl/CacheQueryExpressionVisitor.cs         |   5 +
 modules/web-console/backend/.gitignore          |   1 +
 modules/web-console/backend/app/mongo.js        |   2 +-
 modules/web-console/frontend/.gitignore         |   1 +
 .../input-dialog/input-dialog.tpl.pug           |  32 +-
 .../list-of-registered-users.tpl.pug            |   2 +-
 .../helpers/jade/form/form-field-checkbox.pug   |  15 +-
 .../frontend/app/helpers/jade/mixins.pug        |   3 +-
 .../app/modules/agent/AgentManager.service.js   |   5 +-
 .../modules/configuration/generator/Beans.js    |   8 +
 .../generator/ConfigurationGenerator.js         |  12 +-
 .../generator/JavaTransformer.service.js        |   4 +-
 .../states/configuration/clusters/memory.pug    |   7 +-
 .../configuration/clusters/persistence.pug      |   2 +-
 .../app/primitives/datepicker/index.pug         |  11 +-
 .../app/primitives/datepicker/index.scss        |  34 +-
 .../frontend/app/primitives/dropdown/index.scss |  98 +++-
 .../frontend/app/primitives/file/index.pug      |  37 ++
 .../frontend/app/primitives/file/index.scss     |  60 +++
 .../app/primitives/form-field/index.scss        |  76 +++
 .../frontend/app/primitives/grid/index.scss     |  42 ++
 .../frontend/app/primitives/index.js            |   6 +-
 .../frontend/app/primitives/modal/index.scss    |  42 +-
 .../frontend/app/primitives/panel/index.scss    |   1 +
 .../frontend/app/primitives/switcher/index.pug  |  20 +
 .../frontend/app/primitives/switcher/index.scss |  80 +++
 .../app/primitives/timepicker/index.pug         |  59 +++
 .../app/primitives/timepicker/index.scss        | 137 +++++
 .../app/primitives/typography/index.scss        |  36 ++
 .../app/primitives/ui-grid-header/index.scss    |   2 +-
 .../app/primitives/ui-grid-settings/index.scss  | 163 ++++--
 .../frontend/app/primitives/ui-grid/index.scss  | 159 +++++-
 .../frontend/public/images/icons/filter.svg     |   1 +
 .../frontend/public/images/icons/index.js       |   2 +
 .../frontend/public/images/icons/search.svg     |   1 +
 .../frontend/public/stylesheets/style.scss      |  24 -
 .../views/templates/agent-download.tpl.pug      |  23 +-
 .../frontend/views/templates/confirm.tpl.pug    |  17 +-
 111 files changed, 3555 insertions(+), 532 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ccb790f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 0e05aea,fe250bd..3a1b311
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -79,7 -75,7 +79,8 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
  import org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor;
  import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
 +import org.apache.ignite.internal.util.GridAtomicLong;
+ import org.apache.ignite.internal.util.future.GridCompoundFuture;
  import org.apache.ignite.internal.util.future.GridFutureAdapter;
  import org.apache.ignite.internal.util.tostring.GridToStringExclude;
  import org.apache.ignite.internal.util.tostring.GridToStringInclude;
@@@ -1540,17 -1457,9 +1553,18 @@@ public class GridDhtPartitionsExchangeF
  
          if (updateSingleMap) {
              try {
 -                // Do not update partition map, in case cluster transitioning to inactive
state.
 +                cnt.incrementAndGet();
 +
 +                long start = U.currentTimeMillis();
 +
-                 updatePartitionSingleMap(node, msg);
+                 if (!exchangeOnChangeGlobalState || exchActions.newClusterState() != ClusterState.INACTIVE)
+                     updatePartitionSingleMap(node, msg);
 +
 +                long time = U.currentTimeMillis() - start;
 +
 +                minTime.setIfLess(time);
 +                maxTime.setIfGreater(time);
 +                totTime.addAndGet(time);
              }
              finally {
                  synchronized (this) {

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


Mime
View raw message