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 4A305200C78 for ; Wed, 12 Apr 2017 09:33:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 48DDC160BA9; Wed, 12 Apr 2017 07:33:44 +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 545E7160BA8 for ; Wed, 12 Apr 2017 09:33:43 +0200 (CEST) Received: (qmail 78070 invoked by uid 500); 12 Apr 2017 07:33:42 -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 75868 invoked by uid 99); 12 Apr 2017 07:33:33 -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; Wed, 12 Apr 2017 07:33:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2329DED4A1; Wed, 12 Apr 2017 07:33:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Wed, 12 Apr 2017 07:34:09 -0000 Message-Id: In-Reply-To: <2769ac15f51146b08f1b0cfbfcde8d6c@git.apache.org> References: <2769ac15f51146b08f1b0cfbfcde8d6c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/57] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master archived-at: Wed, 12 Apr 2017 07:33:44 -0000 Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/085c612c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/085c612c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/085c612c Branch: refs/heads/ignite-3477-debug Commit: 085c612c66c2b568f9a658a06baa9907dddb9489 Parents: 8daada7 8122099 Author: Dmitriy Govorukhin Authored: Tue Apr 11 13:11:43 2017 +0300 Committer: Dmitriy Govorukhin Committed: Tue Apr 11 13:11:43 2017 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 3 - assembly/dependencies-fabric-lgpl.xml | 3 - assembly/dependencies-fabric.xml | 3 - assembly/dependencies-schema-import.xml | 57 - assembly/release-base.xml | 2 - assembly/release-fabric-base.xml | 9 - assembly/release-schema-import.xml | 50 - bin/ignite-schema-import.bat | 110 - bin/ignite-schema-import.sh | 87 - examples/README-LGPL.txt | 4 +- examples/README.txt | 2 - examples/pom-standalone-lgpl.xml | 1 - examples/pom-standalone.xml | 1 - examples/pom.xml | 1 - examples/schema-import/README.txt | 38 - examples/schema-import/bin/db-init.sql | 28 - examples/schema-import/bin/h2-server.bat | 80 - examples/schema-import/bin/h2-server.sh | 66 - .../schema-import/bin/schema-import.properties | 28 - examples/schema-import/pom-standalone.xml | 90 - examples/schema-import/pom.xml | 101 - .../org/apache/ignite/schema/CacheConfig.java | 36 - .../java/org/apache/ignite/schema/Demo.java | 134 -- .../java/org/apache/ignite/schema/DemoNode.java | 38 - .../ignite/schema/H2DataSourceFactory.java | 35 - .../java/org/apache/ignite/schema/Person.java | 44 - .../org/apache/ignite/schema/PersonKey.java | 37 - .../JettyRestProcessorAbstractSelfTest.java | 3 +- .../org/apache/ignite/IgniteFileSystem.java | 26 +- .../affinity/fair/FairAffinityFunction.java | 1159 ---------- .../cache/affinity/fair/package-info.java | 21 - .../configuration/DataPageEvictionMode.java | 32 + .../configuration/FileSystemConfiguration.java | 6 +- .../configuration/IgniteConfiguration.java | 4 +- .../MemoryPolicyConfiguration.java | 70 + .../configuration/NearCacheConfiguration.java | 56 +- .../ignite/internal/IgniteEventsImpl.java | 8 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../binary/builder/BinaryObjectBuilderImpl.java | 36 +- .../eventstorage/GridEventStorageManager.java | 12 +- .../ignite/internal/pagemem/PageSupport.java | 10 + .../pagemem/impl/PageMemoryNoStoreImpl.java | 8 + .../cache/CacheOffheapEvictionManager.java | 6 +- .../processors/cache/GridCacheAdapter.java | 2 + .../processors/cache/GridCacheAtomicFuture.java | 2 +- .../cache/GridCacheConcurrentMapImpl.java | 32 +- .../processors/cache/GridCacheEntryEx.java | 5 +- .../cache/GridCacheEvictionManager.java | 61 +- .../processors/cache/GridCacheMapEntry.java | 32 +- .../processors/cache/GridCacheMvccManager.java | 84 +- .../cache/GridDeferredAckMessageSender.java | 11 +- .../cache/IgniteCacheOffheapManagerImpl.java | 34 +- .../processors/cache/database/CacheDataRow.java | 5 + .../cache/database/CacheDataRowAdapter.java | 116 +- .../IgniteCacheDatabaseSharedManager.java | 126 +- .../processors/cache/database/MemoryPolicy.java | 19 +- .../evict/FairFifoPageEvictionTracker.java | 74 + .../database/evict/NoOpPageEvictionTracker.java | 50 + .../evict/PageAbstractEvictionTracker.java | 243 ++ .../database/evict/PageEvictionTracker.java | 52 + .../evict/Random2LruPageEvictionTracker.java | 180 ++ .../evict/RandomLruPageEvictionTracker.java | 157 ++ .../cache/database/freelist/FreeListImpl.java | 62 +- .../cache/database/tree/io/DataPageIO.java | 110 +- .../distributed/dht/GridDhtLocalPartition.java | 49 +- .../GridDhtAtomicAbstractUpdateFuture.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 2 + .../GridNearAtomicAbstractUpdateFuture.java | 2 +- .../GridNearAtomicSingleUpdateFuture.java | 21 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 23 +- .../cache/distributed/near/GridNearTxLocal.java | 2 + .../distributed/near/GridNearTxRemote.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 7 - .../IgniteCacheObjectProcessorImpl.java | 16 - .../internal/processors/igfs/IgfsAsyncImpl.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 20 +- .../utils/PlatformConfigurationUtils.java | 68 +- .../org/apache/ignite/internal/util/F0.java | 196 +- .../ignite/internal/util/lang/GridFunc.java | 620 +---- .../visor/igfs/VisorIgfsFormatTask.java | 2 +- .../visor/node/VisorIgfsConfiguration.java | 2 +- .../deployment/local/LocalDeploymentSpi.java | 5 +- .../spi/eventstorage/NoopEventStorageSpi.java | 53 + .../test/config/store/jdbc/ignite-jdbc-type.xml | 2 +- .../GridCacheAffinityBackupsSelfTest.java | 20 +- .../ignite/IgniteCacheAffinitySelfTest.java | 12 +- .../affinity/AffinityClientNodeSelfTest.java | 15 +- .../affinity/AffinityHistoryCleanupTest.java | 3 +- .../fair/FairAffinityDynamicCacheSelfTest.java | 86 - ...airAffinityFunctionBackupFilterSelfTest.java | 44 - ...ffinityFunctionExcludeNeighborsSelfTest.java | 31 - .../fair/FairAffinityFunctionNodesSelfTest.java | 247 -- .../fair/FairAffinityFunctionSelfTest.java | 31 - .../affinity/fair/FairAffinityNodesRestart.java | 130 -- .../local/LocalAffinityFunctionTest.java | 4 +- .../cache/store/jdbc/model/Organization.java | 2 - .../cache/store/jdbc/model/OrganizationKey.java | 2 - .../ignite/cache/store/jdbc/model/Person.java | 2 - .../store/jdbc/model/PersonComplexKey.java | 4 +- .../cache/store/jdbc/model/PersonKey.java | 2 - .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 2 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +- .../GridEventStorageDefaultExceptionTest.java | 94 + ...CacheExchangeMessageDuplicatedStateTest.java | 33 - .../cache/CrossCacheTxRandomOperationsTest.java | 36 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 1 + .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../GridCacheVersionTopologyChangeTest.java | 5 - .../IgniteClientAffinityAssignmentSelfTest.java | 20 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 3 - ...ObjectsAtomicNearDisabledOnheapSelfTest.java | 17 + ...dCacheBinaryObjectsAtomicOnheapSelfTest.java | 17 + ...tsPartitionedNearDisabledOnheapSelfTest.java | 17 + ...eBinaryObjectsPartitionedOnheapSelfTest.java | 17 + ...eLateAffinityAssignmentFairAffinityTest.java | 32 - ...teCacheClientNodePartitionsExchangeTest.java | 18 +- .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 - ...arDisabledFairAffinityPutGetRestartTest.java | 35 - .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 10 + ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 - .../AtomicPutAllChangingTopologyTest.java | 4 +- ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 - ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 - ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 - ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 - ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 - ...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 10 + ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 - ...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 - ...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 - .../paged/PageEvictionAbstractTest.java | 124 + .../paged/PageEvictionMultinodeTest.java | 110 + .../paged/PageEvictionReadThroughTest.java | 140 ++ .../paged/PageEvictionTouchOrderTest.java | 109 + .../paged/PageEvictionWithRebalanceTest.java | 81 + .../Random2LruPageEvictionMultinodeTest.java | 30 + ...Random2LruPageEvictionWithRebalanceTest.java | 30 + .../RandomLruPageEvictionMultinodeTest.java | 30 + .../RandomLruPageEvictionWithRebalanceTest.java | 30 + .../cache/eviction/paged/TestObject.java | 78 + ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 - ...omicFairAffinityMultiJvmFullApiSelfTest.java | 31 - ...bledFairAffinityMultiJvmFullApiSelfTest.java | 36 - ...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 - ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 - ...onedFairAffinityMultiJvmFullApiSelfTest.java | 31 - ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 - .../database/FreeListImplSelfTest.java | 13 +- ...faultIgfsSecondaryFileSystemTestAdapter.java | 2 +- .../igfs/IgfsAbstractBaseSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 4 +- ...sCachePerBlockLruEvictionPolicySelfTest.java | 2 +- .../igfs/IgfsMetaManagerSelfTest.java | 2 +- .../processors/igfs/IgfsMetricsSelfTest.java | 2 +- .../internal/processors/igfs/IgfsMock.java | 4 +- .../processors/igfs/IgfsProcessorSelfTest.java | 8 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../processors/igfs/IgfsTaskSelfTest.java | 2 +- .../IgfsAbstractRecordResolverSelfTest.java | 2 +- .../configvariations/ConfigVariations.java | 2 - .../testframework/junits/GridAbstractTest.java | 56 +- .../IgniteCacheEvictionSelfTestSuite.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 - ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 15 - .../IgniteCacheFullApiSelfTestSuite.java | 24 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 9 +- .../testsuites/IgniteCacheTestSuite2.java | 4 - .../testsuites/IgniteCacheTestSuite5.java | 10 - .../testsuites/IgniteComputeGridTestSuite.java | 2 + .../impl/HadoopTaskExecutionSelfTest.java | 2 +- ...opClientProtocolMultipleServersSelfTest.java | 2 +- .../client/HadoopClientProtocolSelfTest.java | 2 +- .../hadoop/impl/igfs/IgfsEventsTestSuite.java | 2 +- .../cache/hibernate/HibernateCacheProxy.java | 2 +- .../cache/hibernate/HibernateCacheProxy.java | 2 +- .../processors/query/h2/opt/GridH2Row.java | 5 + ...QueryNodeRestartDistributedJoinSelfTest.java | 50 +- modules/log4j2/pom.xml | 4 +- .../ignite/logger/log4j2/Log4J2Logger.java | 23 +- .../include/ignite/impl/binary/binary_utils.h | 1 - .../ignite/impl/binary/binary_writer_impl.h | 5 +- .../Apache.Ignite.Core.Tests/EventsTest.cs | 63 +- .../IgniteConfigurationSerializerTest.cs | 13 +- .../IgniteConfigurationTest.cs | 15 +- .../Apache.Ignite.Core.csproj | 3 + .../Events/IEventStorageSpi.cs | 33 + .../Events/MemoryEventStorageSpi.cs | 100 + .../Events/NoopEventStorageSpi.cs | 27 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 48 +- .../IgniteConfigurationSection.xsd | 22 + .../Plugin/IPluginConfiguration.cs | 4 +- .../Datagrid/MultiTieredCacheExample.cs | 2 - modules/schema-import-db/README.txt | 4 - modules/schema-import-db/pom.xml | 55 - .../apache/ignite/schema/parser/DbColumn.java | 88 - .../ignite/schema/parser/DbMetadataReader.java | 147 -- .../apache/ignite/schema/parser/DbTable.java | 82 - .../parser/dialect/DB2MetadataDialect.java | 33 - .../parser/dialect/DatabaseMetadataDialect.java | 102 - .../parser/dialect/JdbcMetadataDialect.java | 199 -- .../parser/dialect/MySQLMetadataDialect.java | 82 - .../parser/dialect/OracleMetadataDialect.java | 360 --- modules/schema-import/README.txt | 216 -- modules/schema-import/pom.xml | 119 - .../main/java/media/data_connection_48x48.png | Bin 4443 -> 0 bytes .../src/main/java/media/error_48x48.png | Bin 4349 -> 0 bytes .../src/main/java/media/ignite_128x128.png | Bin 4917 -> 0 bytes .../src/main/java/media/ignite_16x16.png | Bin 608 -> 0 bytes .../src/main/java/media/ignite_24x24.png | Bin 930 -> 0 bytes .../src/main/java/media/ignite_32x32.png | Bin 1203 -> 0 bytes .../src/main/java/media/ignite_48x48.png | Bin 1868 -> 0 bytes .../src/main/java/media/ignite_64x64.png | Bin 2453 -> 0 bytes .../src/main/java/media/information_48x48.png | Bin 4102 -> 0 bytes .../src/main/java/media/question_48x48.png | Bin 3857 -> 0 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 2988 -> 0 bytes .../schema-import/src/main/java/media/style.css | 134 -- .../src/main/java/media/text_tree_48x48.png | Bin 2567 -> 0 bytes .../ignite/schema/generator/CodeGenerator.java | 831 ------- .../ignite/schema/generator/GeneratorUtils.java | 70 - .../ignite/schema/generator/XmlGenerator.java | 446 ---- .../ignite/schema/model/PojoDescriptor.java | 497 ---- .../apache/ignite/schema/model/PojoField.java | 461 ---- .../ignite/schema/model/SchemaDescriptor.java | 62 - .../schema/parser/DatabaseMetadataParser.java | 115 - .../ignite/schema/ui/ConfirmCallable.java | 83 - .../org/apache/ignite/schema/ui/Controls.java | 697 ------ .../org/apache/ignite/schema/ui/GridPaneEx.java | 180 -- .../org/apache/ignite/schema/ui/MessageBox.java | 274 --- .../apache/ignite/schema/ui/ModalDialog.java | 50 - .../ignite/schema/ui/SchemaImportApp.java | 2115 ------------------ .../ignite/schema/ui/TextColumnValidator.java | 32 - .../schema/test/AbstractSchemaImportTest.java | 181 -- .../test/generator/CodeGeneratorTest.java | 81 - .../schema/test/generator/XmlGeneratorTest.java | 42 - .../ignite/schema/test/model/CacheConfig.txt | 409 ---- .../apache/ignite/schema/test/model/Objects.txt | 531 ----- .../ignite/schema/test/model/ObjectsKey.txt | 96 - .../ignite/schema/test/model/Primitives.txt | 535 ----- .../ignite/schema/test/model/PrimitivesKey.txt | 96 - .../org/apache/ignite/schema/test/model/Tst.txt | 535 ----- .../apache/ignite/schema/test/model/TstKey.txt | 96 - .../schema/test/model/ignite-type-metadata.xml | 666 ------ .../test/parser/DbMetadataParserTest.java | 134 -- .../testsuites/IgniteSchemaImportTestSuite.java | 42 - .../ignite/internal/GridFactorySelfTest.java | 3 + modules/web-console/web-agent/pom.xml | 12 - .../ignite/console/agent/db/DbColumn.java | 88 + .../console/agent/db/DbMetadataReader.java | 142 ++ .../apache/ignite/console/agent/db/DbTable.java | 82 + .../agent/db/dialect/DB2MetadataDialect.java | 33 + .../db/dialect/DatabaseMetadataDialect.java | 102 + .../agent/db/dialect/JdbcMetadataDialect.java | 199 ++ .../agent/db/dialect/MySQLMetadataDialect.java | 82 + .../agent/db/dialect/OracleMetadataDialect.java | 359 +++ .../agent/handlers/DatabaseListener.java | 20 +- .../dml/IgniteSqlDeleteFilteredBenchmark.java | 5 +- .../dml/IgniteSqlUpdateFilteredBenchmark.java | 5 +- pom.xml | 121 - 263 files changed, 4234 insertions(+), 16090 deletions(-) ----------------------------------------------------------------------