Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B10AA200CC9 for ; Mon, 17 Jul 2017 10:22:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AFD34163B4A; Mon, 17 Jul 2017 08:22:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD090163B43 for ; Mon, 17 Jul 2017 10:22:40 +0200 (CEST) Received: (qmail 14870 invoked by uid 500); 17 Jul 2017 08:22:40 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 14395 invoked by uid 99); 17 Jul 2017 08:22:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2017 08:22:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88CDCF554E; Mon, 17 Jul 2017 08:22:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 17 Jul 2017 08:22:58 -0000 Message-Id: <264410ed0a64444b8c9b65b962251646@git.apache.org> In-Reply-To: <2c36f93bf80245a3b7eb404a5571b72e@git.apache.org> References: <2c36f93bf80245a3b7eb404a5571b72e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/21] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin archived-at: Mon, 17 Jul 2017 08:22:41 -0000 Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin # 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/5307bcb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5307bcb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5307bcb5 Branch: refs/heads/ignite-5578-locJoin Commit: 5307bcb52f32a84a0b89a21c714fe2996f426bc2 Parents: 73add31 621b0ed Author: sboikov Authored: Mon Jul 17 11:22:24 2017 +0300 Committer: sboikov Committed: Mon Jul 17 11:22:24 2017 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 33 +++ examples/config/example-default.xml | 7 - .../store/auto/CacheBinaryAutoStoreExample.java | 170 ----------- .../datagrid/store/auto/package-info.java | 22 -- .../jmh/cache/JmhCacheLocksBenchmark.java | 119 ++++++++ .../JettyRestProcessorAbstractSelfTest.java | 50 +++- .../apache/ignite/IgniteSystemProperties.java | 8 + .../org/apache/ignite/cache/CacheManager.java | 10 + .../apache/ignite/cache/affinity/Affinity.java | 16 +- .../rendezvous/RendezvousAffinityFunction.java | 4 +- .../ignite/compute/ComputeJobAdapter.java | 2 +- .../configuration/MemoryConfiguration.java | 4 +- .../MemoryPolicyConfiguration.java | 4 +- .../PersistentStoreConfiguration.java | 61 ++-- .../apache/ignite/internal/IgniteKernal.java | 71 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../ignite/internal/binary/BinaryContext.java | 1 + .../ignite/internal/binary/BinaryUtils.java | 19 +- .../internal/binary/GridBinaryMarshaller.java | 3 + .../client/router/impl/GridTcpRouterImpl.java | 57 ++-- .../ignite/internal/pagemem/FullPageId.java | 6 +- .../ignite/internal/pagemem/PageIdUtils.java | 14 +- .../pagemem/store/IgnitePageStoreManager.java | 1 + .../internal/pagemem/store/PageStore.java | 2 + .../delta/MetaPageUpdateLastAllocatedIndex.java | 2 +- .../processors/cache/CacheObjectUtils.java | 4 +- .../processors/cache/GridCacheProcessor.java | 17 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 8 + .../cache/persistence/DbCheckpointListener.java | 7 +- .../FullPageIdIterableComparator.java | 51 ---- .../GridCacheDatabaseSharedManager.java | 114 +++++--- .../persistence/GridCacheOffheapManager.java | 56 ++-- .../IgniteCacheDatabaseSharedManager.java | 65 +++-- .../cache/persistence/file/FilePageStore.java | 2 +- .../persistence/file/FilePageStoreManager.java | 1 + .../cache/persistence/pagemem/PageMemoryEx.java | 8 +- .../persistence/pagemem/PageMemoryImpl.java | 38 ++- .../persistence/partstate/GroupPartitionId.java | 145 +++++++++ .../partstate/PagesAllocationRange.java | 68 +++++ .../partstate/PartitionAllocationMap.java | 113 +++++++ .../snapshot/IgniteCacheSnapshotManager.java | 17 +- .../cache/persistence/tree/io/PageMetaIO.java | 27 +- .../persistence/tree/io/TrackingPageIO.java | 8 +- .../persistence/tree/util/PageHandler.java | 3 +- .../wal/FileWriteAheadLogManager.java | 6 +- .../cache/query/GridCacheQueryManager.java | 17 +- .../store/GridCacheStoreManagerAdapter.java | 7 +- .../utils/PlatformConfigurationUtils.java | 4 +- .../platform/utils/PlatformUtils.java | 3 +- .../processors/rest/GridRestProcessor.java | 45 +-- .../handlers/cache/GridCacheCommandHandler.java | 82 ++++-- .../timeout/GridTimeoutProcessor.java | 18 +- .../ignite/internal/util/IgniteUtils.java | 34 ++- .../internal/util/MutableSingletonList.java | 53 ++++ .../node/VisorPersistentStoreConfiguration.java | 36 +-- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 2 +- .../cache/CacheConnectionLeakStoreTxTest.java | 291 +++++++++++++++++++ .../GridCacheBinaryObjectsAbstractSelfTest.java | 28 ++ .../IgniteTxRemoveTimeoutObjectsTest.java | 194 +++++++++++++ .../persistence/db/wal/IgnitePdsWalTlbTest.java | 2 +- .../ScanQueryOffheapExpiryPolicySelfTest.java | 114 ++++++++ .../timeout/GridTimeoutProcessorSelfTest.java | 68 ++++- .../testsuites/IgniteCacheTestSuite3.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../util/mbeans/GridMBeanDisableSelfTest.java | 121 ++++++++ .../IgniteCacheQuerySelfTestSuite2.java | 3 + .../core/include/ignite/cache/query/query_sql.h | 4 + .../ignite/cache/query/query_sql_fields.h | 4 + .../Cache/PersistentStoreTest.cs | 8 +- .../Config/spring-test.xml | 4 + .../IgniteConfigurationTest.cs | 8 +- .../PersistentStoreConfiguration.cs | 31 +- modules/web-console/backend/app/mongo.js | 2 +- .../generator/ConfigurationGenerator.js | 8 +- .../generator/defaults/Cluster.service.js | 2 +- .../configuration/clusters/persistence.pug | 2 +- .../web-console/frontend/views/sql/sql.tpl.pug | 4 +- .../yardstick/IgniteBenchmarkArguments.java | 33 +++ .../cache/IgniteCacheLockBenchmark.java | 57 ++++ .../yardstick/cache/IgniteLockBenchmark.java | 47 +++ .../cache/IgnitePutTxLoadBenchmark.java | 119 ++++++++ 84 files changed, 2290 insertions(+), 640 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5307bcb5/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 6b6ee88,ea34f75..fa30fa2 --- 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 @@@ -894,7 -889,10 +894,9 @@@ public class GridDhtPartitionsExchangeF */ private void tryToPerformLocalSnapshotOperation() { try { + long start = U.currentTimeMillis(); + - IgniteInternalFuture fut = cctx.snapshot() - .tryStartLocalSnapshotOperation(discoEvt); + IgniteInternalFuture fut = cctx.snapshot().tryStartLocalSnapshotOperation(discoEvt); if (fut != null) fut.get(); http://git-wip-us.apache.org/repos/asf/ignite/blob/5307bcb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ----------------------------------------------------------------------