You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2022/03/17 07:58:06 UTC
[ignite] 01/01: Merge remote-tracking branch 'remotes/upstream/master' into sql-calcite
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch sql-calcite
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 4837ab9c966536dfe1200410b95b12df18a2504b
Merge: 6a43fdf 8fa8d92
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Thu Mar 17 10:48:51 2022 +0300
Merge remote-tracking branch 'remotes/upstream/master' into sql-calcite
# Conflicts:
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
.gitignore | 5 +-
.mvn/wrapper/MavenWrapperDownloader.java | 117 ++++++
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes
.mvn/wrapper/maven-wrapper.properties | 19 +
CONTRIBUTING.md | 2 +-
DEVNOTES.txt | 50 ++-
bin/control.bat | 31 +-
bin/control.sh | 30 +-
bin/ignite.bat | 31 +-
bin/ignite.sh | 31 +-
bin/ignitevisorcmd.bat | 31 +-
bin/ignitevisorcmd.sh | 30 +-
bin/include/jvmdefaults.bat | 73 ++++
bin/include/jvmdefaults.sh | 72 ++++
bin/index-reader.bat | 24 +-
bin/index-reader.sh | 24 +-
deliveries/docker/apache-ignite/s390x/Dockerfile | 10 +-
docs/_data/toc.yaml | 2 +
.../change-data-capture-extensions.adoc | 193 ++++++++++
docs/_docs/logging.adoc | 8 +
docs/_docs/machine-learning/machine-learning.adoc | 2 +-
.../yardstick-benchmarking.adoc | 2 +-
docs/_docs/persistence/change-data-capture.adoc | 19 +-
docs/_docs/setup.adoc | 2 +-
.../images/integrations/CDC-ignite2ignite.svg | 4 +
.../images/integrations/CDC-ignite2kafka.svg | 4 +
examples/DEVNOTES.txt | 2 +-
examples/README.txt | 4 +-
.../testsuites/IgniteControlUtilityTestSuite.java | 2 +
...ridCommandHandlerConsistencySensitiveTest.java} | 12 +-
.../util/GridCommandHandlerConsistencyTest.java | 53 +++
.../util/GridCommandHandlerPropertiesTest.java | 23 ++
.../apache/ignite/util/GridCommandHandlerTest.java | 41 ++
.../ignite/configuration/ClientConfiguration.java | 70 ++++
.../configuration/DataRegionConfiguration.java | 29 ++
.../configuration/DataStorageConfiguration.java | 28 --
.../configuration/ThinClientConfiguration.java | 5 +-
.../events/CacheConsistencyViolationEvent.java | 26 +-
.../ignite/internal/GridEventConsumeHandler.java | 21 +-
.../DurableBackgroundCleanupIndexTreeTaskV2.java | 33 ++
.../query/index/sorted/inline/InlineIndexImpl.java | 31 +-
.../query/index/sorted/inline/InlineIndexTree.java | 34 +-
.../maintenance/MaintenanceRebuildIndexTarget.java | 74 ++++
.../maintenance/MaintenanceRebuildIndexUtils.java | 122 ++++++
.../ignite/internal/cdc/CdcConsumerState.java | 25 +-
.../org/apache/ignite/internal/cdc/CdcMain.java | 63 ++-
.../ignite/internal/cdc/WalRecordsConsumer.java | 171 ++++++---
.../client/thin/ClientChannelConfiguration.java | 22 ++
.../internal/client/thin/ClientOperation.java | 6 +
.../client/thin/ProtocolBitmaskFeature.java | 5 +-
.../internal/client/thin/TcpClientChannel.java | 82 ++++
.../internal/maintenance/MaintenanceProcessor.java | 74 +++-
.../deployment/GridDeploymentClassLoader.java | 10 +-
.../managers/deployment/P2PClassLoadingIssues.java | 56 +++
.../deployment/P2PClassNotFoundException.java} | 22 +-
.../managers/encryption/GridEncryptionManager.java | 5 +-
.../cache/CacheAffinitySharedManager.java | 28 +-
.../processors/cache/CacheGroupContext.java | 31 +-
.../processors/cache/ClusterCachesInfo.java | 108 +++---
.../cache/DynamicCacheChangeRequest.java | 19 +
.../processors/cache/GridCacheMapEntry.java | 48 +--
.../processors/cache/GridCacheProcessor.java | 49 ++-
.../processors/cache/GridCacheSharedContext.java | 22 +-
.../internal/processors/cache/GridCacheUtils.java | 49 +++
.../internal/processors/cache/StoredCacheData.java | 25 ++
.../internal/processors/cache/WalStateManager.java | 4 +-
.../cache/binary/BinaryMetadataFileStore.java | 30 +-
.../GridDistributedTxRemoteAdapter.java | 8 +-
.../distributed/dht/GridPartitionedGetFuture.java | 2 +-
.../distributed/dht/atomic/GridDhtAtomicCache.java | 2 +
.../dht/colocated/GridDhtColocatedCache.java | 2 +
.../dht/preloader/GridDhtPartitionDemander.java | 12 +-
.../dht/topology/GridDhtLocalPartition.java | 4 +-
.../cache/distributed/near/GridNearTxLocal.java | 3 +-
.../GridNearReadRepairAbstractFuture.java | 301 +++++++++------
.../GridNearReadRepairCheckOnlyFuture.java | 76 +++-
.../near/consistency/GridNearReadRepairFuture.java | 66 ++--
.../IgniteConsistencyViolationException.java | 3 +-
...teIrreparableConsistencyViolationException.java | 5 +-
.../GridCacheDatabaseSharedManager.java | 39 +-
.../cache/persistence/GridCacheOffheapManager.java | 4 +-
.../IgniteCacheDatabaseSharedManager.java | 58 ++-
.../checkpoint/LightweightCheckpointManager.java | 3 +-
.../persistence/file/FilePageStoreManager.java | 60 ++-
.../persistence/filename/PdsFolderResolver.java | 2 +-
.../snapshot/IgniteSnapshotManager.java | 167 +++++++-
.../persistence/snapshot/SnapshotMetadata.java | 22 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 94 ++++-
.../persistence/wal/FileWriteAheadLogManager.java | 19 +-
.../wal/filehandle/FileWriteHandleImpl.java | 174 +++++++--
.../wal/reader/IgniteWalIteratorFactory.java | 2 +-
...StandaloneIgniteCacheDatabaseSharedManager.java | 6 +
.../continuous/CacheContinuousQueryHandler.java | 7 +
.../cache/transactions/IgniteTxLocalAdapter.java | 7 +-
.../datastreamer/DataStreamerUpdateJob.java | 4 +
.../processors/odbc/ClientListenerProcessor.java | 2 -
.../platform/client/ClientRequestHandler.java | 3 +-
.../platform/client/compute/ClientComputeTask.java | 11 +-
.../platform/utils/PlatformConfigurationUtils.java | 2 +
.../processors/platform/utils/PlatformUtils.java | 22 ++
.../processors/query/GridQueryProcessor.java | 7 +
.../query/aware/IndexBuildStatusStorage.java | 2 +-
.../processors/service/IgniteServiceProcessor.java | 14 +-
.../service/ServiceDeploymentActions.java | 37 +-
.../processors/service/ServiceDeploymentTask.java | 2 +-
.../ignite/internal/util/BasicRateLimiter.java | 11 +-
.../ignite/internal/util/FeatureChecker.java | 13 +
.../ignite/internal/util/io/GridFileUtils.java | 28 ++
.../consistency/VisorConsistencyRepairTask.java | 57 ++-
.../consistency/VisorConsistencyRepairTaskArg.java | 19 -
.../consistency/VisorConsistencyStatusTask.java | 12 +-
.../visor/persistence/PersistenceTask.java | 9 +-
.../ignite/maintenance/MaintenanceRegistry.java | 26 +-
.../tcp/internal/TcpHandshakeExecutor.java | 22 +-
.../org/apache/ignite/cdc/AbstractCdcTest.java | 41 +-
.../org/apache/ignite/cdc/CdcCacheVersionTest.java | 37 +-
.../java/org/apache/ignite/cdc/CdcSelfTest.java | 261 +++++++++++--
.../java/org/apache/ignite/cdc/WalForCdcTest.java | 257 +++++++++++++
.../ignite/client/ClientConfigurationTest.java | 15 +-
.../org/apache/ignite/client/ReliabilityTest.java | 26 +-
.../encryption/AbstractEncryptionTest.java | 2 +-
.../deployment/P2PClassLoadingIssuesTest.java | 69 ++++
.../consistency/AbstractFullSetReadRepairTest.java | 8 +-
.../cache/consistency/AbstractReadRepairTest.java | 15 +-
.../IgnitePdsNodeJoinWithCachesStopping.java | 94 +++++
.../MaintenancePersistenceTaskTest.java | 178 +++++++++
.../persistence/MaintenanceRegistrySimpleTest.java | 42 ++
.../db/checkpoint/LightweightCheckpointTest.java | 2 +-
.../db/wal/IgniteWalIteratorSwitchSegmentTest.java | 23 +-
.../db/wal/WriteAheadLogManagerSelfTest.java | 4 +-
.../pagemem/BPlusTreePageMemoryImplTest.java | 5 +-
.../BPlusTreeReuseListPageMemoryImplTest.java | 5 +-
.../pagemem/IndexStoragePageMemoryImplTest.java | 5 +-
.../pagemem/PageMemoryImplNoLoadTest.java | 5 +-
.../persistence/pagemem/PageMemoryImplTest.java | 6 +-
.../snapshot/AbstractSnapshotSelfTest.java | 16 +-
.../snapshot/EncryptedSnapshotTest.java | 282 +++++++++++---
.../snapshot/IgniteClusterSnapshotCheckTest.java | 91 +----
.../IgniteClusterSnapshotRestoreBaseTest.java | 7 -
.../snapshot/IgniteClusterSnapshotSelfTest.java | 19 -
.../snapshot/IgniteSnapshotManagerSelfTest.java | 18 +-
.../persistence/snapshot/PlainSnapshotTest.java | 150 ++++++++
.../ignite/internal/util/io/GridFileUtilsTest.java | 52 +++
.../loadtests/hashmap/GridCacheTestContext.java | 2 +-
.../p2p/P2PClassLoadingFailureHandlingTest.java | 295 ++++++++++++++
.../platform/PlatformServiceCallPureJavaTask.java | 81 ++++
.../junits/common/GridCommonAbstractTest.java | 23 +-
.../common/GridCommonAbstractTestSelfTest.java | 188 +++++++++
.../ignite/testsuites/IgniteBasicTestSuite.java | 195 +---------
...icTestSuite.java => IgniteBasicTestSuite2.java} | 120 +-----
.../IgniteCacheFullApiMultiJvmSelfTestSuite.java | 30 +-
... IgniteCacheFullApiMultiJvmSelfTestSuite2.java} | 29 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 184 ---------
...eTestSuite.java => IgniteCacheTestSuite10.java} | 177 +--------
.../ignite/testsuites/IgniteCacheTestSuite11.java | 95 +++++
...TestSuite7.java => IgniteCacheTestSuite12.java} | 58 +--
.../ignite/testsuites/IgniteCacheTestSuite13.java | 100 +++++
.../ignite/testsuites/IgniteCacheTestSuite5.java | 47 ---
.../ignite/testsuites/IgniteCacheTestSuite7.java | 63 ---
.../ignite/testsuites/IgniteCacheTestSuite9.java | 52 ---
.../ignite/testsuites/IgniteP2PSelfTestSuite.java | 6 +-
.../ignite/testsuites/IgnitePdsTestSuite.java | 78 ----
.../ignite/testsuites/IgnitePdsTestSuite2.java | 75 +---
.../ignite/testsuites/IgnitePdsTestSuite3.java | 17 +-
.../ignite/testsuites/IgnitePdsTestSuite4.java | 58 ---
...ePdsTestSuite.java => IgnitePdsTestSuite5.java} | 104 +----
.../ignite/testsuites/IgnitePdsTestSuite6.java | 116 ++++++
...lApiTestSuite.java => IgnitePdsTestSuite7.java} | 34 +-
...PdsTestSuite4.java => IgnitePdsTestSuite8.java} | 59 +--
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 6 +-
.../ignite/testsuites/IgniteSpiTestSuite.java | 3 -
...ariationsFullApiPeerClassLoadingTestSuite.java} | 9 +-
...eptorCacheConfigVariationsFullApiTestSuite.java | 8 +
modules/ducktests/tests/docker/run_tests.sh | 2 +-
.../utils/ignite_configuration/__init__.py | 2 +-
.../utils/ignite_configuration/event_type.py | 44 +++
.../utils/ssl/client_connector_configuration.py | 10 +-
.../services/utils/templates/ignite.xml.j2 | 16 +-
.../services/utils/templates/misc_macro.j2 | 10 +
.../tests/ignitetest/services/zk/zookeeper.py | 9 +
.../ignitetest/tests/cellular_affinity_test.py | 2 +-
.../tests/control_utility/consistency_test.py | 11 +-
.../tests/ignitetest/tests/discovery_test.py | 2 +-
.../ignitetest/tests/persistence_upgrade_test.py | 7 +-
.../tests/ignitetest/tests/pme_free_switch_test.py | 2 +-
.../tests/ignitetest/tests/rebalance/util.py | 2 +-
.../tests/ignitetest/tests/snapshot_test.py | 5 +-
modules/ducktests/tests/ignitetest/utils/_mark.py | 15 +-
.../tests/ignitetest/utils/ignite_test.py | 38 +-
...heEntryProcessorCausingP2PClassLoadProblem.java | 45 +++
.../ComputeTaskCausingP2PClassLoadProblem.java | 69 ++++
.../classloadproblem/P2PClassLoadingProblems.java | 92 +++++
...emoteEventFilterCausingP2PClassLoadProblem.java | 42 ++
...oteFilterFactoryCausingP2PClassLoadProblem.java | 53 +++
...essagingListenerCausingP2PClassLoadProblem.java | 42 ++
...ansformerFactoryCausingP2PClassLoadProblem.java | 52 +++
.../ServiceCausingP2PClassLoadProblem.java} | 23 +-
.../tests/p2p/classloadproblem/SomeP2PClass.java} | 8 +-
.../StreamReceiverCausingP2PClassLoadProblem.java | 46 +++
modules/geospatial/README.txt | 2 +-
modules/hibernate-4.2/README.txt | 2 +-
modules/hibernate-5.1/README.txt | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 13 +
.../processors/query/h2/SchemaManager.java | 39 ++
.../processors/query/h2/database/H2TreeIndex.java | 40 ++
.../query/h2/maintenance/RebuildIndexAction.java | 335 ++++++++++++++++
.../maintenance/RebuildIndexWorkflowCallback.java | 69 ++++
.../query/h2/twostep/AbstractReducer.java | 8 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 22 +-
.../query/h2/twostep/GridReduceQueryExecutor.java | 68 +++-
.../processors/query/h2/twostep/Reducer.java | 7 +-
.../processors/query/h2/twostep/SortedReducer.java | 20 +-
.../query/h2/twostep/UnsortedBaseReducer.java | 12 +-
.../visor/verify/ValidateIndexesClosure.java | 2 +-
.../org/apache/ignite/internal/cdc/SqlCdcTest.java | 18 +-
.../cache/index/IndexCorruptionRebuildTest.java | 426 +++++++++++++++++++++
.../cache/index/RenameIndexTreeTest.java | 44 +++
.../IgnitePdsIndexingDefragmentationTest.java | 2 +-
.../IgniteClusterSnapshotCheckWithIndexesTest.java | 8 -
.../IgniteClusterSnapshotRestoreMetricsTest.java | 1 +
...niteSqlSinglePartitionMultiParallelismTest.java | 26 +-
.../MaintenanceRebuildIndexUtilsSelfTest.java | 120 ++++++
.../query/stat/StatisticsStorageRestartTest.java | 7 +-
.../query/stat/StatisticsStorageUnitTest.java | 7 +-
.../IgniteBinaryCacheQueryTestSuite.java | 350 -----------------
.../IgniteBinaryCacheQueryTestSuite2.java | 69 ----
....java => IgniteBinaryCacheQueryTestSuite3.java} | 316 +--------------
.../IgniteBinaryCacheQueryTestSuite4.java | 100 +++++
.../IgniteCacheWithIndexingTestSuite.java | 5 +-
.../testsuites/IgnitePdsWithIndexingTestSuite.java | 4 +-
.../IgniteBinaryCacheQueryLazyTestSuite3.java} | 33 +-
.../IgniteBinaryCacheQueryLazyTestSuite4.java} | 33 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 20 +
modules/ml/README.txt | 4 +-
modules/platforms/cpp/examples/README.txt | 2 +-
.../cpp/odbc-test/config/queries-default.xml | 2 +
.../cpp/odbc-test/include/odbc_test_suite.h | 10 +
.../cpp/odbc-test/src/odbc_test_suite.cpp | 28 +-
.../platforms/cpp/odbc-test/src/queries_test.cpp | 21 +
.../cpp/odbc/include/ignite/odbc/connection.h | 2 +-
.../platforms/cpp/odbc/src/query/batch_query.cpp | 15 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 23 +-
.../Binary/BinarySchemaChangeTest.cs | 135 +++++++
.../Client/ClientConnectionTest.cs | 31 ++
.../Services/CallPlatformServiceTest.cs | 56 ++-
.../Configuration/ClientConnectorConfiguration.cs | 10 +-
.../Configuration/ThinClientConfiguration.cs | 15 +
.../IgniteConfigurationSection.xsd | 5 +
.../Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs | 6 +-
.../Impl/Binary/Structure/BinaryStructure.cs | 23 +-
.../Binary/Structure/BinaryStructureTracker.cs | 8 +-
modules/schedule/README.txt | 2 +-
.../scala/org/apache/ignite/spark/IgniteRDD.scala | 4 +-
.../apache/ignite/spark/impl/IgniteSqlRDD.scala | 4 +-
.../src/test/config/cdc/correct-cdc-config.xml | 2 +-
.../SpringEncryptedCacheRestartTest.java | 8 +-
modules/sqlline/bin/sqlline.bat | 31 +-
modules/sqlline/bin/sqlline.sh | 31 +-
modules/tools/pom.xml | 12 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 85 ++++
modules/web/ignite-websphere-test/pom.xml | 5 +
modules/yardstick/DEVNOTES.txt | 2 +-
mvnw | 310 +++++++++++++++
mvnw.cmd | 182 +++++++++
parent/pom.xml | 65 +++-
265 files changed, 8403 insertions(+), 3493 deletions(-)
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index c52b0f6,adc2e2e..c54e19f
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@@ -667,11 -683,26 +684,34 @@@ public class H2TreeIndex extends H2Tree
return queryIndex.totalCount();
}
+ /**
+ * Creates a new index that is an exact copy of this index.
+ *
+ * @return New index.
+ */
+ public H2TreeIndex createCopy(InlineIndexImpl inlineIndex, SortedIndexDefinition idxDef) throws IgniteCheckedException {
+ return new H2TreeIndex(inlineIndex, tbl, indexColumns, idxDef.primary(), log);
+ }
+
+ /**
+ * @return Index's id.
+ */
+ public UUID indexId() {
+ return queryIndex.id();
+ }
+
+ /**
+ * @return Index.
+ */
+ public InlineIndexImpl index() {
+ return queryIndex;
+ }
++
+ /** {@inheritDoc} */
+ @Override public <T extends Index> T unwrap(Class<T> clazz) {
+ if (clazz.isInstance(queryIndex))
+ return clazz.cast(queryIndex);
+
+ return super.unwrap(clazz);
+ }
}