You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2020/09/04 09:32:55 UTC

[ignite] 01/01: Merge remote-tracking branch 'remotes/origin/master' into ignite-ducktape

This is an automated email from the ASF dual-hosted git repository.

av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit 4d0d349e19c238f3868cfabb1464122710c8f6cd
Merge: 793f056 04ae61f
Author: Anton Vinogradov <av...@apache.org>
AuthorDate: Fri Sep 4 12:12:01 2020 +0300

    Merge remote-tracking branch 'remotes/origin/master' into ignite-ducktape
    
    # Conflicts:
    #	.gitignore

 .gitignore                                         |   6 +
 assembly/libs/README.txt                           |   1 -
 bin/control.sh                                     |  59 +-
 .../thin/JdbcThinConnectionTimeoutSelfTest.java    |   4 +-
 .../jdbc/thin/JdbcThinDefaultTimeoutTest.java      |  55 +-
 .../thin/JdbcThinStatementTimeoutSelfTest.java     |  16 +-
 .../SystemViewRowAttributeWalkerGenerator.java     |   2 +-
 modules/control-utility/README.txt                 |   6 +
 .../meta/subcommands/MetadataRemoveCommand.java    |   7 +-
 .../util/GridCommandHandlerMetadataTest.java       | 105 +++
 .../org/apache/ignite/IgniteSystemProperties.java  |   7 +
 .../java/org/apache/ignite/cache/CacheMetrics.java |  15 +
 .../java/org/apache/ignite/cache/QueryEntity.java  |   3 +-
 .../configuration/DataRegionConfiguration.java     |  26 +
 .../configuration/DataStorageConfiguration.java    |  27 +
 .../configuration/LoadAllWarmUpConfiguration.java} |  19 +-
 .../configuration/NoOpWarmUpConfiguration.java}    |  23 +-
 .../ignite/configuration/SqlConfiguration.java     |   4 +
 .../ignite/configuration/WarmUpConfiguration.java} |  15 +-
 .../org/apache/ignite/internal/IgniteFeatures.java |   5 +-
 .../org/apache/ignite/internal/IgniteKernal.java   |   9 +-
 .../org/apache/ignite/internal/IgnitionEx.java     |  24 +-
 .../internal/binary/BinaryClassDescriptor.java     |  10 +-
 .../internal/client/impl/GridClientImpl.java       |  30 +-
 .../internal/client/thin/ClientServicesImpl.java   |   2 +-
 .../ignite/internal/client/thin/ClientUtils.java   |  25 +-
 .../client/thin/ProtocolBitmaskFeature.java        |   5 +-
 .../commandline/meta/tasks/MetadataRemoveTask.java |   3 +
 .../commandline/meta/tasks/MetadataTypeArgs.java   |   7 +-
 .../jdbc/thin/ConnectionPropertiesImpl.java        |   2 +-
 .../internal/jdbc/thin/JdbcThinConnection.java     |  40 +-
 .../internal/jdbc/thin/JdbcThinStatement.java      |  19 +-
 .../internal/managers/IgniteMBeansManager.java     |  23 +-
 .../managers/communication/GridIoManager.java      |   4 +-
 .../deployment/GridDeploymentLocalStore.java       |  67 +-
 .../cache/CacheClusterMetricsMXBeanImpl.java       |  12 +-
 .../cache/CacheLocalMetricsMXBeanImpl.java         |  12 +-
 .../processors/cache/CacheMetricsImpl.java         |  45 +-
 .../processors/cache/CacheMetricsSnapshot.java     |  19 +
 .../processors/cache/CacheMetricsSnapshotV2.java   |  19 +
 .../processors/cache/GridCacheAdapter.java         |   4 +-
 .../processors/cache/GridCacheEntryEx.java         |  11 +
 .../processors/cache/GridCacheMapEntry.java        |  57 +-
 .../cache/GridCachePreloaderAdapter.java           |   2 +-
 .../processors/cache/GridCacheProcessor.java       | 119 +++-
 .../internal/processors/cache/GridCacheUtils.java  |  42 ++
 .../distributed/GridDistributedCacheEntry.java     |   9 +-
 .../cache/distributed/dht/GridDhtCacheEntry.java   |  13 +-
 .../dht/colocated/GridDhtDetachedCacheEntry.java   |   9 +-
 .../dht/preloader/GridDhtPartitionDemander.java    | 226 ++++++-
 .../preloader/GridDhtPartitionsExchangeFuture.java |  83 ++-
 .../cache/distributed/near/GridNearCacheEntry.java |   9 +-
 .../cache/local/GridLocalCacheEntry.java           |   9 +-
 .../GridCacheDatabaseSharedManager.java            | 142 +++--
 .../IgniteCacheDatabaseSharedManager.java          | 105 ++-
 .../persistence/checkpoint/CheckpointHistory.java  |  20 +-
 .../checkpoint/CheckpointHistoryResult.java        |  66 ++
 .../cache/persistence/checkpoint/Checkpointer.java |   6 +-
 .../pagelocktracker/SharedPageLockTracker.java     |  37 +-
 .../pendingtask/DurableBackgroundTask.java         |  17 +
 .../cache/persistence/pagemem/PageMemoryImpl.java  |  16 +-
 .../cache/warmup/LoadAllWarmUpStrategy.java        | 259 ++++++++
 .../cache/warmup/NoOpWarmUpStrategy.java}          |  46 +-
 .../processors/cache/warmup/WarmUpMXBeanImpl.java  |  58 ++
 .../processors/cache/warmup/WarmUpStrategy.java    |  51 ++
 .../cache/warmup/WarmUpStrategySupplier.java}      |  23 +-
 .../localtask/DurableBackgroundTasksProcessor.java |  35 +-
 .../metric/PushMetricsExporterAdapter.java         |   4 +-
 .../odbc/jdbc/JdbcQueryExecuteRequest.java         |  24 +-
 .../processors/odbc/jdbc/JdbcRequestHandler.java   |   6 +-
 .../processors/odbc/jdbc/JdbcThinFeature.java      |   5 +-
 .../processors/odbc/odbc/OdbcRequestHandler.java   |   4 +-
 .../processors/platform/cache/PlatformCache.java   |   6 +-
 .../platform/client/ClientBitmaskFeature.java      |   5 +-
 .../platform/client/ClientMessageParser.java       |   2 +-
 .../cache/ClientCacheSqlFieldsQueryRequest.java    |  13 +-
 .../client/service/ClientServiceInvokeRequest.java |  24 +-
 .../platform/services/PlatformServices.java        |  48 +-
 .../processors/query/GridQueryTypeDescriptor.java  |  13 +
 .../processors/query/QueryTypeDescriptorImpl.java  |  14 +
 .../internal/processors/query/QueryUtils.java      |  30 +-
 .../schema/SchemaIndexCachePartitionWorker.java    |   2 +
 .../query/schema/SchemaIndexCacheVisitorImpl.java  |   1 +
 .../processors/resource/DependencyResolver.java}   |  24 +-
 .../processors/resource/GridResourceProcessor.java |  19 +
 .../resource/NoopDependencyResolver.java}          |  20 +-
 .../apache/ignite/internal/util/IgniteUtils.java   |  76 ++-
 .../internal/util/lang/GridIterableAdapter.java    |  10 +-
 .../ignite/internal/util/worker/CycleThread.java   |  62 ++
 .../apache/ignite/mxbean/CacheMetricsMXBean.java   |   9 +
 .../org/apache/ignite/mxbean/WarmUpMXBean.java}    |  22 +-
 .../spi/communication/tcp/TcpCommunicationSpi.java |  26 +-
 .../tcp/internal/ConnectionClientPool.java         |   3 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java       |  87 ++-
 .../main/resources/META-INF/classnames.properties  |  49 ++
 .../apache/ignite/cache/CircledRebalanceTest.java  |  15 +-
 .../RaceOnDeployClassesWithSameAliases.java        | 147 +++++
 .../ignite/internal/ThreadNameValidationTest.java  | 231 +++++++
 .../cache/CacheFutureExceptionSelfTest.java        |   9 +-
 .../cache/CacheGroupsMetricsRebalanceTest.java     |  72 ++-
 .../processors/cache/GridCacheTestEntryEx.java     |   5 +
 .../GridTransactionsSystemUserTimeMetricsTest.java |   3 +-
 .../cache/distributed/CacheExchangeMergeTest.java  |   4 +-
 ...CachePartitionLostAfterSupplierHasLeftTest.java |  11 +-
 .../HistoricalRebalanceHeuristicsTest.java         | 172 +++++
 .../rebalancing/RebalanceStatisticsTest.java       | 291 +++++++++
 ...itePdsAtomicCacheHistoricalRebalancingTest.java |   4 +-
 .../IgnitePdsTxHistoricalRebalancingTest.java      |   4 +-
 .../WALPreloadingWithCompactionTest.java           | 135 ++++
 .../db/FullHistRebalanceOnClientStopTest.java      |   3 +-
 .../db/wal/IgniteWalHistoryReservationsTest.java   |  38 +-
 .../db/wal/IgniteWalRebalanceLoggingTest.java      |   3 +-
 .../persistence/db/wal/IgniteWalRebalanceTest.java |  26 +-
 ...ounterStateConsistencyHistoryRebalanceTest.java |   4 +-
 .../TxDeadlockOnEntryToStringTest.java             | 246 +++++++
 ...ounterStateConsistencyHistoryRebalanceTest.java |   4 +-
 ...ateOnePrimaryOneBackupHistoryRebalanceTest.java |   4 +-
 ...imaryTwoBackupsFailAllHistoryRebalanceTest.java |   4 +-
 ...teOnePrimaryTwoBackupsHistoryRebalanceTest.java |   4 +-
 .../processors/cache/warmup/BlockedWarmUp.java     |  54 ++
 .../cache/warmup/BlockedWarmUpConfiguration.java}  |  15 +-
 .../warmup/LoadAllWarmUpConfigurationEx.java}      |  15 +-
 .../cache/warmup/LoadAllWarmUpStrategyEx.java      |  66 ++
 .../warmup/LoadAllWarmUpStrategySelfTest.java      | 273 ++++++++
 .../processors/cache/warmup/Organization.java      |  59 ++
 .../internal/processors/cache/warmup/Person.java   |  66 ++
 .../cache/warmup/SimpleObservableWarmUp.java       |  50 ++
 .../SimpleObservableWarmUpConfiguration.java}      |  15 +-
 .../processors/cache/warmup/WarmUpSelfTest.java    | 363 +++++++++++
 .../cache/warmup/WarmUpTestPluginProvider.java     |  58 ++
 .../DistributedMetaStoragePersistentTest.java      |   6 +-
 .../sandbox/DoPrivilegedOnRemoteNodeTest.java      |  31 +-
 .../ignite/internal/util/IgniteUtilsSelfTest.java  |  75 ++-
 .../util/future/GridFutureAdapterSelfTest.java     |   7 +-
 .../marshaller/GridMarshallerResourceBean.java     |   3 +-
 .../platform/PlatformCacheWriteMetricsTask.java    |  10 +
 .../ignite/platform/PlatformDeployServiceTask.java |  11 +
 ...unicationInverseConnectionEstablishingTest.java |   4 +-
 .../tcp/TcpDiscoveryClientSuspensionSelfTest.java  |   6 +-
 .../AbstractTestDependencyResolver.java            |  55 ++
 .../testframework/CallbackExecutorLogListener.java |  34 +-
 .../ignite/testframework/GridTestThread.java       |  10 +-
 .../apache/ignite/testframework/GridTestUtils.java |  18 +
 ...ogListener.java => TestDependencyResolver.java} |  43 +-
 .../testframework/junits/GridAbstractTest.java     |  39 ++
 .../ignite/testsuites/IgniteCacheTestSuite9.java   |   3 +
 .../testsuites/IgniteKernalSelfTestSuite.java      |   2 +
 .../ignite/testsuites/IgniteP2PSelfTestSuite.java  |   2 +
 .../ignite/testsuites/IgnitePdsTestSuite2.java     |   6 +
 .../ignite/testsuites/IgnitePdsTestSuite4.java     |   6 +
 .../testsuites/TxDeadlockDetectionTestSuite.java   |   4 +-
 .../GridThreadPoolExecutorServiceSelfTest.java     |   2 +-
 modules/gce/pom.xml                                |   2 +-
 .../query/h2/DistributedSqlConfiguration.java      |  43 +-
 .../h2/DurableBackgroundCleanupIndexTreeTask.java  |  19 +
 .../processors/query/h2/H2TableDescriptor.java     |  23 +-
 .../processors/query/h2/IgniteH2Indexing.java      |  18 +-
 .../processors/query/h2/QueryParameters.java       |   5 +-
 .../internal/processors/query/h2/QueryParser.java  |   8 +-
 .../query/h2/database/H2TreeIndexBase.java         |   2 +-
 .../processors/query/h2/opt/GridH2IndexBase.java   |   5 +-
 .../processors/query/h2/opt/GridH2ProxyIndex.java  |   8 +-
 .../processors/query/h2/opt/H2IndexCostedBase.java | 234 +++++++
 .../query/h2/twostep/GridMapQueryExecutor.java     |  12 +-
 .../query/h2/twostep/GridReduceQueryExecutor.java  |   2 +
 .../query/h2/twostep/msg/GridH2DmlRequest.java     |  70 +-
 .../query/h2/twostep/msg/GridH2QueryRequest.java   |  37 +-
 ...acheDistributedQueryDefaultTimeoutSelfTest.java |  90 +--
 .../processors/cache/index/BasicIndexTest.java     | 232 ++++++-
 .../ClientReconnectWithSqlTableConfiguredTest.java | 166 +++++
 .../processors/cache/index/IndexMetricsTest.java   | 196 +++++-
 .../db/LongDestroyDurableBackgroundTaskTest.java   | 105 ++-
 .../processors/query/SqlSystemViewsSelfTest.java   |   2 +-
 .../query/h2/IgniteSqlQueryMinMaxTest.java         |   5 +-
 .../timeout/AbstractDefaultQueryTimeoutTest.java   | 308 +++++++++
 .../DefaultQueryTimeoutConfigurationTest.java      | 207 ++++++
 .../timeout/DefaultQueryTimeoutTestSuite.java}     |  15 +-
 .../DefaultQueryTimeoutThickJavaLazyTest.java}     |  18 +-
 .../timeout/DefaultQueryTimeoutThickJavaTest.java  |  78 +++
 ...efaultQueryTimeoutThickJavaUpdateLazyTest.java} |  18 +-
 .../DefaultQueryTimeoutThickJavaUpdateTest.java}   |  18 +-
 .../timeout/DefaultQueryTimeoutThinJavaTest.java   |  58 ++
 .../timeout/DefaultQueryTimeoutThinJdbcTest.java   | 102 +++
 .../processors/query/timeout/TimedQueryHelper.java |  97 +++
 .../IgniteBinaryCacheQueryTestSuite2.java          |   3 +
 .../testsuites/IgnitePdsWithIndexingTestSuite.java |   4 +-
 modules/jms11/README.txt                           |  29 -
 modules/jms11/licenses/apache-2.0.txt              | 202 ------
 modules/jms11/pom.xml                              | 104 ---
 .../apache/ignite/stream/jms11/JmsStreamer.java    | 565 ----------------
 .../ignite/stream/jms11/MessageTransformer.java    |  41 --
 .../apache/ignite/stream/jms11/package-info.java   |  22 -
 .../ignite/stream/jms11/IgniteJmsStreamerTest.java | 708 ---------------------
 .../ignite/stream/jms11/TestTransformers.java      | 127 ----
 .../apache/ignite/stream/jms11/package-info.java   |  22 -
 .../monitoring/opencensus/AbstractTracingTest.java |  33 +
 .../opencensus/IgniteOpenCensusSuite.java          |   3 +-
 .../opencensus/OpenCensusDiscoveryTracingTest.java | 339 ++++++++++
 .../cpp/common/include/ignite/ignite_error.h       |   6 +
 .../cpp/core/src/transactions/transactions.cpp     |   1 +
 .../platforms/cpp/thin-client-test/CMakeLists.txt  |   4 +-
 .../config/ssl/generate_certificates.sh            |  18 +-
 .../project/vs/thin-client-test.vcxproj            |   1 +
 .../platforms/cpp/thin-client-test/src/tx_test.cpp | 400 ++++++++++++
 modules/platforms/cpp/thin-client/CMakeLists.txt   |   2 +
 .../impl/thin/transactions/transactions_proxy.h    | 145 +++++
 .../include/ignite/thin/ignite_client.h            |  12 +
 .../include/ignite/thin/transactions/transaction.h | 100 +++
 .../ignite/thin/transactions/transaction_consts.h  | 119 ++++
 .../ignite/thin/transactions/transactions.h        | 130 ++++
 .../cpp/thin-client/project/vs/thin-client.vcxproj |   7 +
 .../cpp/thin-client/src/ignite_client.cpp          |   5 +
 .../src/impl/cache/cache_client_impl.cpp           |  86 +++
 .../thin-client/src/impl/cache/cache_client_impl.h |   8 +
 .../src/impl/cache/cache_client_proxy.cpp          |   2 -
 .../thin-client/src/impl/ignite_client_impl.cpp    |  13 +-
 .../cpp/thin-client/src/impl/ignite_client_impl.h  |  11 +
 .../platforms/cpp/thin-client/src/impl/message.cpp |   9 +-
 .../platforms/cpp/thin-client/src/impl/message.h   | 201 +++++-
 .../src/impl/transactions/transaction_impl.h       | 183 ++++++
 .../src/impl/transactions/transactions_impl.cpp    | 214 +++++++
 .../src/impl/transactions/transactions_impl.h      | 129 ++++
 .../src/impl/transactions/transactions_proxy.cpp   |  82 +++
 .../Apache.Ignite.BenchmarkDotNet/Program.cs       |   2 +-
 .../Services/BenchService.cs}                      |  37 +-
 .../ThinClient/Services/IBenchService.cs}          |  25 +-
 .../ThinClient/ThinClientServicesBenchmark.cs      |  99 +++
 .../Apache.Ignite.Core.Tests.csproj                |  11 +
 .../Client/Compute/ComputeClientTests.cs           |   2 +
 .../Client/Services/ITestService.cs                |  66 ++
 .../Client/Services/ITestServiceClient.cs}         |  31 +-
 .../Client/Services/ITestServiceDataTypes.cs       | 133 ++++
 .../Client/Services/ITestServiceGenericMethods.cs} |  28 +-
 .../Client/Services/ITestServiceOverloads.cs}      |  49 +-
 .../Client/Services/ServicesClientTest.cs          | 588 +++++++++++++++++
 .../Client/Services/TestService.cs                 | 134 ++++
 .../Client/Services/TestServiceDataTypes.cs        | 258 ++++++++
 .../Client/Services/TestServiceGenericMethods.cs}  |  37 +-
 .../Client/Services/TestServiceOverloads.cs        | 106 +++
 .../IgniteStartStopTest.cs                         |   2 +-
 .../Apache.Ignite.Core.Tests/ProjectFilesTest.cs   |  66 +-
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs      |  37 ++
 .../Services/IJavaService.cs                       | 169 +++++
 .../Services/ServicesTest.cs                       | 165 +----
 .../dotnet/Apache.Ignite.Core.Tests/TestUtils.cs   |  17 +
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj   |   2 +
 .../Client/Compute/IComputeClient.cs               |  13 +-
 .../Client/IClientClusterGroup.cs                  |  17 +-
 .../Apache.Ignite.Core/Client/IIgniteClient.cs     |   8 +-
 .../Client/Services/IServicesClient.cs             |  55 ++
 .../Apache.Ignite.Core/Impl/Client/ClientOp.cs     |   5 +-
 .../Impl/Client/Cluster/ClientClusterGroup.cs      |  16 +-
 .../Impl/Client/Compute/ComputeClient.cs           |   6 +
 .../Apache.Ignite.Core/Impl/Client/IgniteClient.cs |  13 +
 .../Impl/Client/Services/ServicesClient.cs         | 157 +++++
 .../Impl/Cluster/ClusterGroupImpl.cs               |   9 +
 .../Impl/Common/DelegateConverter.cs               | 143 ++++-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs       |   8 +-
 .../Impl/Services/ServiceProxyTypeGenerator.cs     |  51 +-
 modules/platforms/python/pyignite/api/sql.py       |   5 +-
 .../python/pyignite/connection/__init__.py         |   4 +
 .../platforms/python/pyignite/connection/ssl.py    |  40 +-
 modules/platforms/python/tests/config/ssl.xml      |  58 ++
 .../platforms/python/tests/config/ssl/README.txt   |   3 +
 .../python/tests/config/ssl/client_full.pem        |  52 ++
 .../tests/config/ssl/client_with_pass_full.pem     |  54 ++
 .../platforms/python/tests/config/ssl/server.jks   | Bin 0 -> 2380 bytes
 .../platforms/python/tests/config/ssl/trust.jks    | Bin 0 -> 1346 bytes
 modules/platforms/python/tests/conftest.py         |  11 +-
 modules/platforms/python/tests/test_handshake.py   |   3 +-
 modules/platforms/python/tests/test_sql.py         |  30 +
 pom.xml                                            |   1 -
 272 files changed, 11790 insertions(+), 3043 deletions(-)

diff --cc .gitignore
index 151ad01,ef98e66..0029600
--- a/.gitignore
+++ b/.gitignore
@@@ -81,10 -81,8 +81,16 @@@ package
  #NodeJs files
  /modules/platforms/nodejs/node_modules
  
+ #Python temp files
+ **/.eggs
+ **/venv
+ **/.pytest_cache
+ **/pyignite.egg-info
++
 +#Ducktape
 +/results
 +.ducktape
 +*.pyc
 +/tests/venv
 +modules/ducktests/tests/docker/build/**
 +modules/ducktests/tests/.tox