[ignite-3] branch ignite-20015 updated (f38a1ad7f8 -> a5a62c9502)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20015 in repository https://gitbox.apache.org/repos/asf/ignite-3.git from f38a1ad7f8 Styles. add a5a62c9502 Styles. No new revisions were added by this update. Summary of changes: .../org/apache/ignite/internal/sql/engine/util/QueryChecker.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[ignite-3] branch ignite-20015 updated (a990e309f4 -> f38a1ad7f8)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20015 in repository https://gitbox.apache.org/repos/asf/ignite-3.git from a990e309f4 Styles. add f38a1ad7f8 Styles. No new revisions were added by this update. Summary of changes: .../internal/sql/engine/exec/LogicalRelImplementor.java | 2 +- .../internal/sql/engine/trait/DistributionFunction.java | 10 +- .../internal/sql/engine/trait/IgniteDistributions.java | 2 +- .../engine/exec/IdentityDistributionExecutionTest.java | 17 - .../ignite/internal/sql/engine/util/CursorUtils.java| 17 - .../ignite/internal/sql/engine/util/QueryChecker.java | 17 - 6 files changed, 7 insertions(+), 58 deletions(-)
[ignite-3] branch ignite-20015 updated (52ee3ec773 -> a990e309f4)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20015 in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 52ee3ec773 Fix tests. add a990e309f4 Styles. No new revisions were added by this update. Summary of changes: .../ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java | 1 - 1 file changed, 1 deletion(-)
[ignite-3] branch ignite-20015 updated: Fix tests.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-20015
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-20015 by this push:
new 52ee3ec773 Fix tests.
52ee3ec773 is described below
commit 52ee3ec7737244d2d2e79032988b011644482c0e
Author: amashenkov
AuthorDate: Thu Aug 17 18:11:50 2023 +0300
Fix tests.
---
.../internal/sql/engine/IdentityDistributionFunctionSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java
index 48b210013b..369af65b15 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java
@@ -85,7 +85,7 @@ public class IdentityDistributionFunctionSelfTest {
// Valid row.
assertThat(destination.targets(row).size(), equalTo(1));
-assertThat(destination.targets(row), Matchers.contains(NODE_2));
+assertThat(destination.targets(row), Matchers.contains(NODE_1));
// Invalid row.
assertThat(destination.targets(otherRow), empty());
@@ -109,7 +109,7 @@ public class IdentityDistributionFunctionSelfTest {
// Valid row.
assertThat(destination.targets(row).size(), equalTo(1));
-assertThat(destination.targets(row), Matchers.contains(NODE_2));
+assertThat(destination.targets(row), Matchers.contains(NODE_1));
// Invalid row.
assertThat(destination.targets(otherRow), empty());
[ignite-3] 01/01: Merge branch 'catalog-feature' into ignite-19497
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-19497 in repository https://gitbox.apache.org/repos/asf/ignite-3.git commit 9fe9d49d312d1c2f4d4db8cdc1b2ce1daefbd5bc Merge: 9c71741302 9457551dc5 Author: amashenkov AuthorDate: Thu Aug 17 17:41:14 2023 +0300 Merge branch 'catalog-feature' into ignite-19497 # Conflicts: # modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTableImpl.java .../configuration/ItConfigCommandTest.java | 9 +- .../handler/IgniteCliApiExceptionHandler.java | 18 +- .../handler/IgniteCliApiExceptionHandlerTest.java | 86 ++ .../apache/ignite/internal/util/IgniteUtils.java | 36 +++- modules/distribution-zones/build.gradle| 2 +- .../distributionzones/DistributionZoneManager.java | 29 +--- .../distributionzones/DistributionZonesUtil.java | 2 +- .../CausalityDataNodesEngine.java | 2 +- .../DistributionZoneConfigurationSchema.java | 10 +- .../DistributionZonesConfigurationSchema.java | 12 +- .../DistributionZoneFiltersTest.java | 2 +- .../DistributionZoneManagerAlterFilterTest.java| 6 +- .../DistributionZoneManagerFilterTest.java | 2 +- .../DistributionZoneManagerScaleUpTest.java| 6 +- .../DistributionZoneManagerTest.java | 2 +- .../DistributionZoneManagerWatchListenerTest.java | 6 +- .../DistributionZoneCausalityDataNodesTest.java| 6 +- .../DistributionZonesTestUtil.java | 4 +- modules/placement-driver/build.gradle | 1 + .../internal/placementdriver/ActiveActorTest.java | 14 +- .../placementdriver/BasePlacementDriverTest.java | 75 + .../MultiActorPlacementDriverTest.java | 70 +--- .../PlacementDriverManagerTest.java| 69 +--- .../internal/placementdriver/LeaseUpdater.java | 106 +--- .../placementdriver/PlacementDriverManager.java| 104 +--- .../internal/placementdriver/TopologyTracker.java | 3 +- .../placementdriver/leases/LeaseTracker.java | 168 +-- .../internal/placementdriver/leases/Leases.java} | 34 ++-- .../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +- .../Table/SchemaSynchronizationTest.cs | 186 - .../Table/SchemaValidationTest.cs | 6 +- .../Apache.Ignite/Internal/Compute/Compute.cs | 17 +- .../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +- .../Apache.Ignite/Internal/Table/RecordView.cs | 92 -- .../Internal/Table/Serialization/KvPair.cs | 2 + .../Table/Serialization/ObjectSerializerHandler.cs | 8 +- .../Serialization/SerializerExceptionExtensions.cs | 50 ++ .../Serialization/TuplePairSerializerHandler.cs| 6 +- .../Table/Serialization/TupleSerializerHandler.cs | 6 +- .../dotnet/Apache.Ignite/Internal/Table/Table.cs | 19 ++- .../storage/ItRebalanceDistributedTest.java| 5 +- .../zones/ItDistributionZonesFilterTest.java | 2 +- ...niteDistributionZoneManagerNodeRestartTest.java | 6 +- .../runner/app/ItIgniteNodeRestartTest.java| 1 - .../runner/app/ItTableApiContractTest.java | 2 +- .../internal/runner/app/ItTablesApiTest.java | 2 +- .../runner/app/PlatformTestNodeRunner.java | 2 +- .../org/apache/ignite/internal/app/IgniteImpl.java | 4 +- .../configuration/storage/ExistingDataStorage.java | 32 .../sql/engine/exec/ddl/DdlCommandHandler.java | 2 +- .../sql/engine/prepare/PrepareServiceImpl.java | 2 +- .../internal/storage/DataStorageManager.java | 56 +-- .../ExistingDataStorageValidator.java | 63 --- ...torageEngineDistributedConfigurationModule.java | 44 - .../internal/storage/DataStorageManagerTest.java | 25 --- .../TestMvPartitionStorageConcurrencyTest.java | 2 +- .../storage/TestMvPartitionStorageGcTest.java | 2 +- .../storage/TestMvPartitionStorageTest.java| 2 +- .../internal/storage/TestMvTableStorageTest.java | 2 +- .../ExistingDataStorageValidatorTest.java | 75 - .../PersistentPageMemoryMvTableStorageTest.java| 2 +- .../VolatilePageMemoryMvTableStorageTest.java | 2 +- .../PersistentPageMemoryHashIndexStorageTest.java | 2 +- ...PersistentPageMemorySortedIndexStorageTest.java | 2 +- .../VolatilePageMemoryHashIndexStorageTest.java| 2 +- .../VolatilePageMemorySortedIndexStorageTest.java | 2 +- ...ageMemoryMvPartitionStorageConcurrencyTest.java | 2 +- ...rsistentPageMemoryMvPartitionStorageGcTest.java | 2 +- ...PersistentPageMemoryMvPartitionStorageTest.java | 2 +- ...ageMemoryMvPartitionStorageConcurrencyTest.java | 2 +- ...VolatilePageMemoryMvPartitionStorageGcTest.java | 2 +-
[ignite-3] branch ignite-19497 updated (9c71741302 -> 9fe9d49d31)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
from 9c71741302 minor.
add f9b5c45658 IGNITE-20236 Get rid of
DistributionZonesConfigurationSchema#defaultDataStorage (#2456)
add 19bc621eaf IGNITE-20171 Handle case when there is no Problem json in
response (#2418)
add 730d214f92 IGNITE-19840 .NET: Reload schema when unmapped columns are
detected (#2454)
add 1e9fe13003 IGNITE-20229 Get rid of configurations in
PlacementDriverManager (#2453)
add 6c9fd45c96 Merge branch 'ai-main' into catalog-feature
add 9457551dc5 IGNITE-20244 Replace the use of constants from the
DistributionZoneManager with constants from CatalogUtils and CatalogService
(#2459)
new 9fe9d49d31 Merge branch 'catalog-feature' into ignite-19497
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../configuration/ItConfigCommandTest.java | 9 +-
.../handler/IgniteCliApiExceptionHandler.java | 18 +-
.../handler/IgniteCliApiExceptionHandlerTest.java | 86 ++
.../apache/ignite/internal/util/IgniteUtils.java | 36 +++-
modules/distribution-zones/build.gradle| 2 +-
.../distributionzones/DistributionZoneManager.java | 29 +---
.../distributionzones/DistributionZonesUtil.java | 2 +-
.../CausalityDataNodesEngine.java | 2 +-
.../DistributionZoneConfigurationSchema.java | 10 +-
.../DistributionZonesConfigurationSchema.java | 12 +-
.../DistributionZoneFiltersTest.java | 2 +-
.../DistributionZoneManagerAlterFilterTest.java| 6 +-
.../DistributionZoneManagerFilterTest.java | 2 +-
.../DistributionZoneManagerScaleUpTest.java| 6 +-
.../DistributionZoneManagerTest.java | 2 +-
.../DistributionZoneManagerWatchListenerTest.java | 6 +-
.../DistributionZoneCausalityDataNodesTest.java| 6 +-
.../DistributionZonesTestUtil.java | 4 +-
modules/placement-driver/build.gradle | 1 +
.../internal/placementdriver/ActiveActorTest.java | 14 +-
.../placementdriver/BasePlacementDriverTest.java | 75 +
.../MultiActorPlacementDriverTest.java | 70 +---
.../PlacementDriverManagerTest.java| 69 +---
.../internal/placementdriver/LeaseUpdater.java | 106 +---
.../placementdriver/PlacementDriverManager.java| 104 +---
.../internal/placementdriver/TopologyTracker.java | 3 +-
.../placementdriver/leases/LeaseTracker.java | 168 +--
.../leases/{LeaseBatch.java => Leases.java}| 34 ++--
.../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +-
.../Table/SchemaSynchronizationTest.cs | 186 -
.../Table/SchemaValidationTest.cs | 6 +-
.../Apache.Ignite/Internal/Compute/Compute.cs | 17 +-
.../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +-
.../Apache.Ignite/Internal/Table/RecordView.cs | 92 --
.../Internal/Table/Serialization/KvPair.cs | 2 +
.../Table/Serialization/ObjectSerializerHandler.cs | 8 +-
.../Serialization/SerializerExceptionExtensions.cs | 50 ++
.../Serialization/TuplePairSerializerHandler.cs| 6 +-
.../Table/Serialization/TupleSerializerHandler.cs | 6 +-
.../dotnet/Apache.Ignite/Internal/Table/Table.cs | 19 ++-
.../storage/ItRebalanceDistributedTest.java| 5 +-
.../zones/ItDistributionZonesFilterTest.java | 2 +-
...niteDistributionZoneManagerNodeRestartTest.java | 6 +-
.../runner/app/ItIgniteNodeRestartTest.java| 1 -
.../runner/app/ItTableApiContractTest.java | 2 +-
.../internal/runner/app/ItTablesApiTest.java | 2 +-
.../runner/app/PlatformTestNodeRunner.java | 2 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 4 +-
.../configuration/storage/ExistingDataStorage.java | 32
.../sql/engine/exec/ddl/DdlCommandHandler.java | 2 +-
.../sql/engine/prepare/PrepareServiceImpl.java | 2 +-
.../internal/storage/DataStorageManager.java | 56 +--
.../ExistingDataStorageValidator.java | 63 ---
...torageEngineDistributedConfigurationModule.java | 44 -
.../internal/storage/DataStorageManagerTest.java | 25 ---
.../TestMvPartitionStorageConcurrencyTest.java | 2 +-
.../storage/TestMvPartitionStorageGcTest.java | 2 +-
.../storage/TestMvPartitionStorageTest.java| 2 +-
.../internal/storage/TestMvTableStorageTest.java | 2 +-
.../ExistingDataStorageValidatorTest.java | 75 -
.../PersistentPageMemoryMvTableStorageTest.java| 2 +-
[ignite-3] branch ignite-20015 updated (356a3389cb -> f3170d041a)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20015 in repository https://gitbox.apache.org/repos/asf/ignite-3.git discard 356a3389cb Add execution test. discard 3700e10a3a Add a test for joining tables with Identity distribution function. discard 9da2d9e880 Add a new distribution function. add 14574dd2fd Add a new distribution function. add 78a731c90b Add a test for joining tables with Identity distribution function. add f3170d041a Add execution test. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (356a3389cb) \ N -- N -- N refs/heads/ignite-20015 (f3170d041a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../sql/engine/exec/LogicalRelImplementor.java | 2 +- .../sql/engine/trait/DistributionFunction.java | 2 +- .../IdentityDistributionFunctionSelfTest.java | 123 + .../exec/IdentityDistributionExecutionTest.java| 6 +- 4 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/IdentityDistributionFunctionSelfTest.java
[ignite-3] branch catalog-feature updated (6c9fd45c96 -> 9457551dc5)
This is an automated email from the ASF dual-hosted git repository. tkalkirill pushed a change to branch catalog-feature in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 6c9fd45c96 Merge branch 'ai-main' into catalog-feature add 9457551dc5 IGNITE-20244 Replace the use of constants from the DistributionZoneManager with constants from CatalogUtils and CatalogService (#2459) No new revisions were added by this update. Summary of changes: modules/distribution-zones/build.gradle| 2 +- .../distributionzones/DistributionZoneManager.java | 26 ++ .../distributionzones/DistributionZonesUtil.java | 2 +- .../CausalityDataNodesEngine.java | 2 +- .../DistributionZoneConfigurationSchema.java | 10 - .../DistributionZonesConfigurationSchema.java | 2 +- .../DistributionZoneFiltersTest.java | 2 +- .../DistributionZoneManagerAlterFilterTest.java| 6 ++--- .../DistributionZoneManagerFilterTest.java | 2 +- .../DistributionZoneManagerScaleUpTest.java| 6 ++--- .../DistributionZoneManagerTest.java | 2 +- .../DistributionZoneManagerWatchListenerTest.java | 6 ++--- .../DistributionZoneCausalityDataNodesTest.java| 6 ++--- .../DistributionZonesTestUtil.java | 4 ++-- .../zones/ItDistributionZonesFilterTest.java | 2 +- ...niteDistributionZoneManagerNodeRestartTest.java | 6 ++--- .../runner/app/ItTableApiContractTest.java | 2 +- .../internal/runner/app/ItTablesApiTest.java | 2 +- .../runner/app/PlatformTestNodeRunner.java | 2 +- .../sql/engine/exec/ddl/DdlCommandHandler.java | 2 +- .../sql/engine/schema/IgniteTableImpl.java | 5 +++-- .../TestMvPartitionStorageConcurrencyTest.java | 2 +- .../storage/TestMvPartitionStorageGcTest.java | 2 +- .../storage/TestMvPartitionStorageTest.java| 2 +- .../internal/storage/TestMvTableStorageTest.java | 2 +- .../PersistentPageMemoryMvTableStorageTest.java| 2 +- .../VolatilePageMemoryMvTableStorageTest.java | 2 +- .../PersistentPageMemoryHashIndexStorageTest.java | 2 +- ...PersistentPageMemorySortedIndexStorageTest.java | 2 +- .../VolatilePageMemoryHashIndexStorageTest.java| 2 +- .../VolatilePageMemorySortedIndexStorageTest.java | 2 +- ...ageMemoryMvPartitionStorageConcurrencyTest.java | 2 +- ...rsistentPageMemoryMvPartitionStorageGcTest.java | 2 +- ...PersistentPageMemoryMvPartitionStorageTest.java | 2 +- ...ageMemoryMvPartitionStorageConcurrencyTest.java | 2 +- ...VolatilePageMemoryMvPartitionStorageGcTest.java | 2 +- .../VolatilePageMemoryMvPartitionStorageTest.java | 2 +- .../RocksDbMvPartitionStorageConcurrencyTest.java | 2 +- .../rocksdb/RocksDbMvPartitionStorageGcTest.java | 2 +- .../rocksdb/RocksDbMvPartitionStorageTest.java | 2 +- .../storage/rocksdb/RocksDbMvTableStorageTest.java | 2 +- .../storage/rocksdb/RocksDbStorageEngineTest.java | 2 +- .../rocksdb/index/RocksDbHashIndexStorageTest.java | 2 +- .../index/RocksDbSortedIndexStorageTest.java | 2 +- .../distributed/ItTxDistributedTestSingleNode.java | 2 +- .../table/distributed/TableManagerTest.java| 2 +- .../PersistentPageMemoryGcUpdateHandlerTest.java | 2 +- .../distributed/gc/RocksDbGcUpdateHandlerTest.java | 2 +- .../distributed/gc/TestGcUpdateHandlerTest.java| 2 +- .../gc/VolatilePageMemoryGcUpdateHandlerTest.java | 2 +- .../raft/snapshot/PartitionAccessImplTest.java | 2 +- .../incoming/IncomingSnapshotCopierTest.java | 2 +- .../PartitionReplicaListenerIndexLockingTest.java | 2 +- .../replication/PartitionReplicaListenerTest.java | 2 +- 54 files changed, 72 insertions(+), 93 deletions(-)
[ignite-3] branch ignite-20015 updated (4195503f16 -> 356a3389cb)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-20015
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
omit 4195503f16 wip. Add join test for Identity distribution function.
omit 2915001efb wip.
omit bfb43a6dd2 Add a new distribution function.
add 730d214f92 IGNITE-19840 .NET: Reload schema when unmapped columns are
detected (#2454)
add 1e9fe13003 IGNITE-20229 Get rid of configurations in
PlacementDriverManager (#2453)
add bb2c93aa6b IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
add 2c22342bb1 IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
add 9da2d9e880 Add a new distribution function.
add 3700e10a3a Add a test for joining tables with Identity distribution
function.
add 356a3389cb Add execution test.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4195503f16)
\
N -- N -- N refs/heads/ignite-20015 (356a3389cb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../apache/ignite/internal/util/IgniteUtils.java | 36 +++-
modules/placement-driver/build.gradle | 1 +
.../internal/placementdriver/ActiveActorTest.java | 14 +-
.../placementdriver/BasePlacementDriverTest.java | 75 +
.../MultiActorPlacementDriverTest.java | 70 +---
.../PlacementDriverManagerTest.java| 69 +---
.../internal/placementdriver/LeaseUpdater.java | 106 +---
.../placementdriver/PlacementDriverManager.java| 104 +---
.../internal/placementdriver/TopologyTracker.java | 3 +-
.../placementdriver/leases/LeaseTracker.java | 168 +--
.../leases/{LeaseBatch.java => Leases.java}| 34 ++--
modules/platforms/build.gradle | 3 +
.../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +-
.../Table/SchemaSynchronizationTest.cs | 186 -
.../Table/SchemaValidationTest.cs | 6 +-
.../Apache.Ignite/Internal/Compute/Compute.cs | 17 +-
.../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +-
.../Apache.Ignite/Internal/Table/RecordView.cs | 92 --
.../Internal/Table/Serialization/KvPair.cs | 2 +
.../Table/Serialization/ObjectSerializerHandler.cs | 8 +-
.../Serialization/SerializerExceptionExtensions.cs | 50 ++
.../Serialization/TuplePairSerializerHandler.cs| 6 +-
.../Table/Serialization/TupleSerializerHandler.cs | 6 +-
.../dotnet/Apache.Ignite/Internal/Table/Table.cs | 19 ++-
modules/runner/build.gradle| 1 +
.../ignite/internal/table/ItRoReadsTest.java | 44 ++---
.../org/apache/ignite/internal/app/IgniteImpl.java | 3 +-
modules/schema/build.gradle| 2 +
.../ignite/internal/schema/BinaryRowMatcher.java | 62 +++
modules/sql-engine/build.gradle| 2 +
.../exec/IdentityDistributionExecutionTest.java| 164 ++
.../internal/sql/engine/util/CursorUtils.java | 17 ++
.../internal/sql/engine/util/MetadataMatcher.java | 0
.../sql/engine/util/NativeTypeWrapper.java | 0
.../internal/sql/engine/util/QueryChecker.java | 22 ++-
.../AbstractMvPartitionStorageConcurrencyTest.java | 19 ++-
.../storage/AbstractMvPartitionStorageGcTest.java | 21 ++-
.../storage/AbstractMvPartitionStorageTest.java| 117 ++---
.../storage/AbstractMvTableStorageTest.java| 4 +-
.../internal/storage/BaseMvStoragesTest.java | 36 ++--
.../AbstractPageMemoryMvPartitionStorageTest.java | 11 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../internal/table/distributed/IndexBaseTest.java | 10 +-
.../replication/PartitionReplicaListenerTest.java | 41 ++---
packaging/odbc/build.gradle| 4 +-
45 files changed, 1069 insertions(+), 602 deletions(-)
create mode 100644
modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
copy
modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/{LeaseBatch.java
=> Leases.java} (56%)
create mode 100644
modules/platforms/dotnet/Apache.Ignite/Internal/Table/Serialization/SerializerExceptionExtensions.cs
create mode 100644
[ignite] branch master updated: IGNITE-20217 GridCacheFutureAdapter and descendants initial cleanup (#10896)
This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f4654f98607 IGNITE-20217 GridCacheFutureAdapter and descendants
initial cleanup (#10896)
f4654f98607 is described below
commit f4654f98607648252c5164c0fd1a81eff279ca26
Author: Anton Vinogradov
AuthorDate: Thu Aug 17 15:16:23 2023 +0300
IGNITE-20217 GridCacheFutureAdapter and descendants initial cleanup (#10896)
---
.../processors/cache/GridCacheFutureAdapter.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 24 ++
.../dht/GridDhtTxAbstractEnlistFuture.java | 48 +++
.../distributed/dht/GridDhtTxEnlistFuture.java | 14 ++
.../dht/GridDhtTxQueryAbstractEnlistFuture.java| 3 --
.../dht/GridDhtTxQueryEnlistFuture.java| 4 --
.../dht/GridDhtTxQueryResultsEnlistFuture.java | 10 ++--
.../dht/GridPartitionedSingleGetFuture.java| 22 -
.../atomic/GridDhtAtomicAbstractUpdateFuture.java | 56 --
.../atomic/GridNearAtomicAbstractUpdateFuture.java | 18 ---
.../atomic/GridNearAtomicSingleUpdateFuture.java | 33 ++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 45 +
.../cache/distributed/near/GridNearLockFuture.java | 2 +-
.../distributed/near/GridNearTxEnlistFuture.java | 1 -
.../near/GridNearTxQueryEnlistFuture.java | 1 -
.../near/GridNearTxQueryResultsEnlistFuture.java | 1 -
16 files changed, 75 insertions(+), 209 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
index 13030f971e1..c3e470e4cdb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFutureAdapter.java
@@ -34,7 +34,7 @@ public abstract class GridCacheFutureAdapter extends
GridFutureAdapter imp
/**
* Default constructor.
*/
-public GridCacheFutureAdapter() {
+protected GridCacheFutureAdapter() {
// No-op.
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 25d16805b67..86cf0850114 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -709,7 +709,6 @@ public abstract class GridDhtTransactionalCacheAdapter extends GridDhtCach
nodeId,
req.version(),
req.mvccSnapshot(),
-req.threadId(),
req.futureId(),
req.miniId(),
tx,
@@ -768,14 +767,14 @@ public abstract class GridDhtTransactionalCacheAdapter extends GridDhtCach
if (waitForExchangeFuture(nearNode, req))
return;
-f = lockAllAsync(ctx, nearNode, req, null);
+f = lockAllAsync(ctx, nearNode, req);
if (f != null)
break;
}
}
else
-f = lockAllAsync(ctx, nearNode, req, null);
+f = lockAllAsync(ctx, nearNode, req);
// Register listener just so we print out errors.
// Exclude lock timeout and rollback exceptions since it's not a fatal
exception.
@@ -839,7 +838,7 @@ public abstract class GridDhtTransactionalCacheAdapter extends GridDhtCach
private void processDhtLockResponse(UUID nodeId, GridDhtLockResponse res) {
assert nodeId != null;
assert res != null;
-GridDhtLockFuture fut =
(GridDhtLockFuture)ctx.mvcc().versionedFuture(res.version(),
res.futureId());
+GridDhtLockFuture fut =
(GridDhtLockFuture)ctx.mvcc().versionedFuture(res.version(), res.futureId());
if (fut == null) {
if (txLockMsgLog.isDebugEnabled())
@@ -988,18 +987,14 @@ public abstract class GridDhtTransactionalCacheAdapter extends GridDhtCach
* @param cacheCtx Cache context.
* @param nearNode Near node.
* @param req Request.
- * @param filter0 Filter.
* @return Future.
*/
public IgniteInternalFuture lockAllAsync(
final GridCacheContext cacheCtx,
final ClusterNode nearNode,
-final GridNearLockRequest req,
-@Nullable final CacheEntryPredicate[] filter0) {
+final GridNearLockRequest req) {
final List keys
[ignite-3] branch main updated: IGNITE-20183 Fix testNonNullTxDisablesPartitionAwareness flakiness (#2458)
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new bb382455ea IGNITE-20183 Fix testNonNullTxDisablesPartitionAwareness
flakiness (#2458)
bb382455ea is described below
commit bb382455eaafeac3eb022e649ebff3f41985a4ac
Author: Pavel Tupitsyn
AuthorDate: Thu Aug 17 15:05:56 2023 +0300
IGNITE-20183 Fix testNonNullTxDisablesPartitionAwareness flakiness (#2458)
Tx uses random connection, so don't use a hardcoded node name.
---
.../java/org/apache/ignite/client/PartitionAwarenessTest.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java
b/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java
index 2d89efb22d..5612a9384d 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/PartitionAwarenessTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.client.fakes.FakeIgnite;
import org.apache.ignite.client.fakes.FakeIgniteTables;
import org.apache.ignite.client.fakes.FakeInternalTable;
import org.apache.ignite.compute.IgniteCompute;
+import org.apache.ignite.internal.client.tx.ClientTransaction;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -152,11 +153,13 @@ public class PartitionAwarenessTest extends
AbstractClientTest {
@Test
public void testNonNullTxDisablesPartitionAwareness() {
RecordView recordView = defaultTable().recordView();
-var tx = client2.transactions().begin();
+var tx = (ClientTransaction) client2.transactions().begin();
-assertOpOnNode("server-1", "get", x -> recordView.get(tx,
Tuple.create().set("ID", 0L)));
-assertOpOnNode("server-1", "get", x -> recordView.get(tx,
Tuple.create().set("ID", 1L)));
-assertOpOnNode("server-1", "get", x -> recordView.get(tx,
Tuple.create().set("ID", 2L)));
+@SuppressWarnings("resource") String expectedNode =
tx.channel().protocolContext().clusterNode().name();
+
+assertOpOnNode(expectedNode, "get", x -> recordView.get(tx,
Tuple.create().set("ID", 0L)));
+assertOpOnNode(expectedNode, "get", x -> recordView.get(tx,
Tuple.create().set("ID", 1L)));
+assertOpOnNode(expectedNode, "get", x -> recordView.get(tx,
Tuple.create().set("ID", 2L)));
}
@ParameterizedTest
[ignite] branch master updated: IGNITE-15742 Specified time units for IgniteCluster.baselineAutoAdjustEnabled (#10723)
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 61a4a48e7b5 IGNITE-15742 Specified time units for
IgniteCluster.baselineAutoAdjustEnabled (#10723)
61a4a48e7b5 is described below
commit 61a4a48e7b521b22be31b32b308165fad7abe491
Author: Venkatesh Prasad Kannan
AuthorDate: Thu Aug 17 12:34:25 2023 +0100
IGNITE-15742 Specified time units for
IgniteCluster.baselineAutoAdjustEnabled (#10723)
---
modules/core/src/main/java/org/apache/ignite/IgniteCluster.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 26147cd02d4..eb1dd7bd74b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -627,14 +627,14 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
public void baselineAutoAdjustEnabled(boolean baselineAutoAdjustEnabled)
throws IgniteException;
/**
- * @return Value of time which we would wait before the actual topology
change since last server topology change
+ * @return Number of milliseconds to wait before the actual topology
change since last server topology change
* (node join/left/fail).
* @throws IgniteException If operation failed.
*/
public long baselineAutoAdjustTimeout();
/**
- * @param baselineAutoAdjustTimeout Value of time which we would wait
before the actual topology change since last
+ * @param baselineAutoAdjustTimeout Number of milliseconds to wait before
the actual topology change since last
* server topology change (node join/left/fail).
* @throws IgniteException If failed.
*/
[ignite-3] branch main updated: IGNITE-16700 Fix flaky ItTxDistributedTestThreeNodesThreeReplicas#testBalance (#2439)
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 641b340d76 IGNITE-16700 Fix flaky
ItTxDistributedTestThreeNodesThreeReplicas#testBalance (#2439)
641b340d76 is described below
commit 641b340d76270e8c9f7623a4a856d0933617fc11
Author: Denis Chudov
AuthorDate: Thu Aug 17 13:05:41 2023 +0300
IGNITE-16700 Fix flaky
ItTxDistributedTestThreeNodesThreeReplicas#testBalance (#2439)
---
.../distributed/ItTxDistributedTestSingleNode.java | 3 ++-
.../org/apache/ignite/internal/table/TxLocalTest.java | 6 ++
.../apache/ignite/internal/table/TxAbstractTest.java | 18 ++
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNode.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNode.java
index b45566ec17..2abef1ee43 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNode.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNode.java
@@ -138,7 +138,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(ConfigurationExtension.class)
public class ItTxDistributedTestSingleNode extends TxAbstractTest {
-@InjectConfiguration
+//TODO fsync can be turned on again after
https://issues.apache.org/jira/browse/IGNITE-20195
+@InjectConfiguration("mock: { fsync: false }")
private static RaftConfiguration raftConfiguration;
@InjectConfiguration
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/TxLocalTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/TxLocalTest.java
index 64cdcb87ab..39d5335f18 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/TxLocalTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/TxLocalTest.java
@@ -139,6 +139,12 @@ public class TxLocalTest extends TxAbstractTest {
// TODO asch IGNITE-15928 implement local scan
}
+@Disabled("https://issues.apache.org/jira/browse/IGNITE-20205;)
+@Override
+public void testBalance() throws InterruptedException {
+super.testBalance();
+}
+
@Override
protected TxManager clientTxManager() {
return txManager;
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
index c39638ebb0..44f1dea58a 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
@@ -1223,7 +1223,6 @@ public abstract class TxAbstractTest extends
IgniteAbstractTest {
}
@Test
-@Disabled("https://issues.apache.org/jira/browse/IGNITE-16700;)
public void testBalance() throws InterruptedException {
doTestSingleKeyMultithreaded(5_000, false);
}
@@ -1501,16 +1500,18 @@ public abstract class TxAbstractTest extends
IgniteAbstractTest {
Thread[] threads = new Thread[threadsCnt];
+final int accountsCount = threads.length * 10;
+
final double initial = 1000;
-final double total = threads.length * initial;
+final double total = accountsCount * initial;
-for (int i = 0; i < threads.length; i++) {
+for (int i = 0; i < accountsCount; i++) {
accounts.recordView().upsert(null, makeValue(i, 1000));
}
double total0 = 0;
-for (long i = 0; i < threads.length; i++) {
+for (long i = 0; i < accountsCount; i++) {
double balance = accounts.recordView().get(null,
makeKey(i)).doubleValue("balance");
total0 += balance;
@@ -1530,7 +1531,6 @@ public abstract class TxAbstractTest extends
IgniteAbstractTest {
AtomicReference firstErr = new AtomicReference<>();
for (int i = 0; i < threads.length; i++) {
-long finalI = i;
threads[i] = new Thread(new Runnable() {
@Override
public void run() {
@@ -1546,7 +1546,7 @@ public abstract class TxAbstractTest extends
IgniteAbstractTest {
var table = accounts.recordView();
try {
-long acc1 = finalI;
+long acc1 = r.nextInt(accountsCount);
double amount = 100 + r.nextInt(500);
@@ -1559,7 +1559,7 @@ public abstract class TxAbstractTest extends
IgniteAbstractTest {
long acc2 = acc1;
while
[ignite-3] branch main updated: IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 2c22342bb1 IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
2c22342bb1 is described below
commit 2c22342bb131a610af4c622c99127bf52aa102ea
Author: Mikhail
AuthorDate: Thu Aug 17 12:34:39 2023 +0300
IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
---
modules/platforms/build.gradle | 3 +++
packaging/odbc/build.gradle| 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/platforms/build.gradle b/modules/platforms/build.gradle
index a9e1db6e06..8481186642 100644
--- a/modules/platforms/build.gradle
+++ b/modules/platforms/build.gradle
@@ -155,4 +155,7 @@ artifacts {
odbc(file("$buildDir/cpp/lib/libignite3-odbc.so")) {
builtBy cmakeBuildOdbc
}
+odbc(file("$buildDir/cpp/lib/libignite3-odbc.so.3")) {
+builtBy cmakeBuildOdbc
+}
}
diff --git a/packaging/odbc/build.gradle b/packaging/odbc/build.gradle
index 0ad0e5826f..c188f201ab 100644
--- a/packaging/odbc/build.gradle
+++ b/packaging/odbc/build.gradle
@@ -73,6 +73,7 @@ distTar.dependsOn replacePackageScriptVars
buildRpm {
dependsOn replacePackageScriptVars
+requires("unixODBC")
preInstall file("$buildDir/scripts/preInstall.sh")
postInstall file("$buildDir/scripts/postInstall.sh")
@@ -82,6 +83,8 @@ buildRpm {
buildDeb {
dependsOn replacePackageScriptVars
+requires("unixodbc")
+requires("odbcinst")
preInstall file("$buildDir/scripts/preInstall.sh")
postInstall file("$buildDir/scripts/postInstall.sh")
@@ -96,7 +99,6 @@ ospackage {
url "https://ignite.apache.org;
packageDescription "This package will install Apache Ignite 3 ODBC driver"
os LINUX
-requires("unixODBC")
into(tokens.LIB_DIR) {
from configurations.odbc
[ignite-3] branch ignite-19497 updated: minor.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-19497 by this push:
new 9c71741302 minor.
9c71741302 is described below
commit 9c71741302510a6fcb280a546a4280064866e14c
Author: amashenkov
AuthorDate: Thu Aug 17 12:00:33 2023 +0300
minor.
---
.../sql/engine/exec/LogicalRelImplementor.java | 6 ++-
.../internal/sql/engine/schema/IgniteIndex.java| 55 --
2 files changed, 24 insertions(+), 37 deletions(-)
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/LogicalRelImplementor.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/LogicalRelImplementor.java
index 3135a26571..e01c07d422 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/LogicalRelImplementor.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/LogicalRelImplementor.java
@@ -344,7 +344,11 @@ public class LogicalRelImplementor implements
IgniteRelVisitor>
RangeIterable ranges = null;
if (searchBounds != null) {
-Comparator searchRowComparator =
IgniteIndex.createComparator(expressionFactory, idx);
+Comparator searchRowComparator = null;
+
+if (idx.type() == Type.SORTED) {
+searchRowComparator =
expressionFactory.comparator(IgniteIndex.createSearchRowCollation(idx.collation()));
+}
ranges = expressionFactory.ranges(searchBounds,
idx.rowType(typeFactory, tbl.descriptor()), searchRowComparator);
}
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java
index 1f95e927bc..9a6c88e27b 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.sql.engine.schema;
import static
org.apache.ignite.internal.sql.engine.util.TypeUtils.native2relationalType;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.List;
import org.apache.calcite.plan.Convention;
import org.apache.calcite.plan.RelOptCluster;
@@ -39,11 +38,9 @@ import
org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor
import
org.apache.ignite.internal.catalog.descriptors.CatalogIndexColumnDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import
org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescriptor;
-import org.apache.ignite.internal.sql.engine.exec.exp.ExpressionFactory;
import
org.apache.ignite.internal.sql.engine.rel.logical.IgniteLogicalIndexScan;
import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution;
import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory;
-import org.jetbrains.annotations.Nullable;
/**
* Schema object representing an Index.
@@ -72,10 +69,8 @@ public class IgniteIndex {
this.asc = asc;
this.nullsFirst = nullsFirst;
}
-
}
-
/**
* Type of the index.
*/
@@ -89,23 +84,19 @@ public class IgniteIndex {
private final IgniteDistribution tableDistribution;
-private final RelCollation outputCollation;
-
-private final RelCollation indexCollation;
+private final RelCollation collation;
private final Type type;
private RelDataType rowType;
/** Constructor. */
-public IgniteIndex(int id, String name, Type type, IgniteDistribution
tableDistribution, RelCollation outputCollation) {
+public IgniteIndex(int id, String name, Type type, IgniteDistribution
tableDistribution, RelCollation collation) {
this.id = id;
this.name = name;
this.type = type;
this.tableDistribution = tableDistribution;
-this.outputCollation = outputCollation;
-
-indexCollation = (type == Type.SORTED) ?
createIndexCollation(outputCollation.getFieldCollations()) : null;
+this.collation = collation;
}
/** Returns an id of the index. */
@@ -125,13 +116,13 @@ public class IgniteIndex {
/** Returns the collation of this index. */
public RelCollation collation() {
-return outputCollation;
+return collation;
}
/** Returns index row type. */
public RelDataType rowType(IgniteTypeFactory factory, TableDescriptor
tableDescriptor) {
if (rowType == null) {
-rowType = createRowType(factory, tableDescriptor, outputCollation);
+rowType = createRowType(factory, tableDescriptor, collation);
}
[ignite-3] branch main updated: IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new bb2c93aa6b IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
bb2c93aa6b is described below
commit bb2c93aa6b132beaa31934f5127fdab4295e6019
Author: Alexander Polovtcev
AuthorDate: Thu Aug 17 11:34:40 2023 +0300
IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
---
.../ignite/internal/table/ItRoReadsTest.java | 44 +++-
modules/schema/build.gradle| 2 +
.../ignite/internal/schema/BinaryRowMatcher.java | 62 +++
.../AbstractMvPartitionStorageConcurrencyTest.java | 19 ++--
.../storage/AbstractMvPartitionStorageGcTest.java | 21 ++--
.../storage/AbstractMvPartitionStorageTest.java| 117 +++--
.../storage/AbstractMvTableStorageTest.java| 4 +-
.../internal/storage/BaseMvStoragesTest.java | 36 +++
.../AbstractPageMemoryMvPartitionStorageTest.java | 11 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../internal/table/distributed/IndexBaseTest.java | 10 +-
.../replication/PartitionReplicaListenerTest.java | 41
12 files changed, 212 insertions(+), 158 deletions(-)
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
index 99ef4e29ab..8b89bf2a37 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
@@ -20,10 +20,12 @@ package org.apache.ignite.internal.table;
import static
org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_REPLICA_COUNT;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.createZone;
import static org.apache.ignite.internal.runner.app.ItTablesApiTest.SCHEMA;
+import static org.apache.ignite.internal.schema.BinaryRowMatcher.equalToRow;
import static
org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter.convert;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -34,7 +36,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Flow.Publisher;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.Flow.Subscription;
@@ -178,7 +179,7 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest {
res = internalTable.get(keyRow, node.clock().now(), node.node()).get();
-assertRowEquals(res, keyValueRow);
+assertThat(res, is(equalToRow(keyValueRow)));
}
@Test
@@ -210,7 +211,7 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest {
BinaryRow res = internalTable.get(keyRow, node.clock().now(),
node.node()).get();
-assertRowEquals(res, keyValueRow2);
+assertThat(res, is(equalToRow(keyValueRow2)));
}
@Test
@@ -269,9 +270,7 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest {
latch.await();
-assertEquals(1, list.size());
-
-assertRowEquals(list.get(0), keyValueRow2);
+assertThat(list, contains(equalToRow(keyValueRow2)));
}
@Test
@@ -300,13 +299,13 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest
{
BinaryRow res = internalTable.get(keyRow, node.clock().now(),
node.node()).get();
-assertRowEquals(res, keyValueRow);
+assertThat(res, is(equalToRow(keyValueRow)));
tx2.commit();
res = internalTable.get(keyRow, node.clock().now(), node.node()).get();
-assertRowEquals(res, keyValueRow2);
+assertThat(res, is(equalToRow(keyValueRow2)));
}
@Test
@@ -337,15 +336,11 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest
{
res = internalTable.getAll(keyRows, node.clock().now(),
node.node()).get();
-assertEquals(3, res.size());
-
-for (int i = 0; i < 3; i++) {
-assertRowEquals(res.get(i), keyValueRows.get(i));
-}
+assertThat(res, contains(equalToRow(keyValueRows.get(0)),
equalToRow(keyValueRows.get(1)), equalToRow(keyValueRows.get(2;
}
[ignite] branch master updated: IGNITE-20228 Fix connectable nodes list for control.sh (#10898)
This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 2ba290e701a IGNITE-20228 Fix connectable nodes list for control.sh
(#10898)
2ba290e701a is described below
commit 2ba290e701a3c12d7979a38bca8294f9aefdbe80
Author: Maksim Timonin
AuthorDate: Thu Aug 17 11:17:41 2023 +0300
IGNITE-20228 Fix connectable nodes list for control.sh (#10898)
---
.../java/org/apache/ignite/internal/management/api/CommandUtils.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java
index 8611d1bb8fc..f3a8a7e57ca 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java
@@ -707,7 +707,7 @@ public class CommandUtils {
.collect(Collectors.toList());
if (!connectable.isEmpty())
-compute = compute.projection(nodes);
+compute = compute.projection(connectable);
return compute.execute(
taskCls.getName(),
[ignite-3] 01/01: Merge branch 'ai-main' into catalog-feature
This is an automated email from the ASF dual-hosted git repository. tkalkirill pushed a commit to branch catalog-feature in repository https://gitbox.apache.org/repos/asf/ignite-3.git commit 6c9fd45c9633769bda1b53ec932b0876d9725b1e Merge: f9b5c45658 1e9fe13003 Author: Kirill Tkalenko AuthorDate: Thu Aug 17 10:55:53 2023 +0300 Merge branch 'ai-main' into catalog-feature .../handler/IgniteCliApiExceptionHandler.java | 18 +- .../handler/IgniteCliApiExceptionHandlerTest.java | 86 ++ .../apache/ignite/internal/util/IgniteUtils.java | 36 +++- modules/placement-driver/build.gradle | 1 + .../internal/placementdriver/ActiveActorTest.java | 14 +- .../placementdriver/BasePlacementDriverTest.java | 75 + .../MultiActorPlacementDriverTest.java | 70 +--- .../PlacementDriverManagerTest.java| 69 +--- .../internal/placementdriver/LeaseUpdater.java | 106 +--- .../placementdriver/PlacementDriverManager.java| 104 +--- .../internal/placementdriver/TopologyTracker.java | 3 +- .../placementdriver/leases/LeaseTracker.java | 168 +-- .../internal/placementdriver/leases/Leases.java} | 42 ++--- .../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +- .../Table/SchemaSynchronizationTest.cs | 186 - .../Table/SchemaValidationTest.cs | 6 +- .../Apache.Ignite/Internal/Compute/Compute.cs | 17 +- .../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +- .../Apache.Ignite/Internal/Table/RecordView.cs | 92 -- .../Internal/Table/Serialization/KvPair.cs | 2 + .../Table/Serialization/ObjectSerializerHandler.cs | 8 +- .../Serialization/SerializerExceptionExtensions.cs | 50 ++ .../Serialization/TuplePairSerializerHandler.cs| 6 +- .../Table/Serialization/TupleSerializerHandler.cs | 6 +- .../dotnet/Apache.Ignite/Internal/Table/Table.cs | 19 ++- .../org/apache/ignite/internal/app/IgniteImpl.java | 3 +- 26 files changed, 754 insertions(+), 446 deletions(-)
[ignite-3] branch catalog-feature updated (f9b5c45658 -> 6c9fd45c96)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a change to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
from f9b5c45658 IGNITE-20236 Get rid of
DistributionZonesConfigurationSchema#defaultDataStorage (#2456)
add 19bc621eaf IGNITE-20171 Handle case when there is no Problem json in
response (#2418)
add 730d214f92 IGNITE-19840 .NET: Reload schema when unmapped columns are
detected (#2454)
add 1e9fe13003 IGNITE-20229 Get rid of configurations in
PlacementDriverManager (#2453)
new 6c9fd45c96 Merge branch 'ai-main' into catalog-feature
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../handler/IgniteCliApiExceptionHandler.java | 18 +-
.../handler/IgniteCliApiExceptionHandlerTest.java | 86 ++
.../apache/ignite/internal/util/IgniteUtils.java | 36 +++-
modules/placement-driver/build.gradle | 1 +
.../internal/placementdriver/ActiveActorTest.java | 14 +-
.../placementdriver/BasePlacementDriverTest.java | 75 +
.../MultiActorPlacementDriverTest.java | 70 +---
.../PlacementDriverManagerTest.java| 69 +---
.../internal/placementdriver/LeaseUpdater.java | 106 +---
.../placementdriver/PlacementDriverManager.java| 104 +---
.../internal/placementdriver/TopologyTracker.java | 3 +-
.../placementdriver/leases/LeaseTracker.java | 168 +--
.../leases/{LeaseBatch.java => Leases.java}| 34 ++--
.../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +-
.../Table/SchemaSynchronizationTest.cs | 186 -
.../Table/SchemaValidationTest.cs | 6 +-
.../Apache.Ignite/Internal/Compute/Compute.cs | 17 +-
.../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +-
.../Apache.Ignite/Internal/Table/RecordView.cs | 92 --
.../Internal/Table/Serialization/KvPair.cs | 2 +
.../Table/Serialization/ObjectSerializerHandler.cs | 8 +-
.../Serialization/SerializerExceptionExtensions.cs | 50 ++
.../Serialization/TuplePairSerializerHandler.cs| 6 +-
.../Table/Serialization/TupleSerializerHandler.cs | 6 +-
.../dotnet/Apache.Ignite/Internal/Table/Table.cs | 19 ++-
.../org/apache/ignite/internal/app/IgniteImpl.java | 3 +-
26 files changed, 746 insertions(+), 446 deletions(-)
create mode 100644
modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java
create mode 100644
modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
copy
modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/{LeaseBatch.java
=> Leases.java} (56%)
create mode 100644
modules/platforms/dotnet/Apache.Ignite/Internal/Table/Serialization/SerializerExceptionExtensions.cs
[ignite-3] branch main updated: IGNITE-20229 Get rid of configurations in PlacementDriverManager (#2453)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 1e9fe13003 IGNITE-20229 Get rid of configurations in
PlacementDriverManager (#2453)
1e9fe13003 is described below
commit 1e9fe13003bda48caf5804657bfa7ca29b42eece
Author: Kirill Tkalenko
AuthorDate: Thu Aug 17 10:53:25 2023 +0300
IGNITE-20229 Get rid of configurations in PlacementDriverManager (#2453)
---
.../apache/ignite/internal/util/IgniteUtils.java | 36 -
modules/placement-driver/build.gradle | 1 +
.../internal/placementdriver/ActiveActorTest.java | 14 +-
.../placementdriver/BasePlacementDriverTest.java | 75 +
.../MultiActorPlacementDriverTest.java | 70 +
.../PlacementDriverManagerTest.java| 69 +
.../internal/placementdriver/LeaseUpdater.java | 106 +
.../placementdriver/PlacementDriverManager.java| 104 +
.../internal/placementdriver/TopologyTracker.java | 3 +-
.../placementdriver/leases/LeaseTracker.java | 168 ++---
.../internal/placementdriver/leases/Leases.java| 43 ++
.../org/apache/ignite/internal/app/IgniteImpl.java | 3 +-
12 files changed, 324 insertions(+), 368 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 3d2964b442..94fa38aba1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.util;
import static java.nio.file.StandardOpenOption.CREATE;
import static java.nio.file.StandardOpenOption.WRITE;
+import static java.util.concurrent.CompletableFuture.failedFuture;
import static org.apache.ignite.lang.ErrorGroups.Common.NODE_STOPPING_ERR;
import java.io.IOException;
@@ -880,10 +881,10 @@ public class IgniteUtils {
/**
* Method that runs the provided {@code fn} in {@code busyLock}.
*
- * @param busyLock Component's busy lock
- * @param fn Function to run
- * @param Type of returned value from {@code fn}
- * @return Result of the provided function
+ * @param busyLock Component's busy lock.
+ * @param fn Function to run.
+ * @param Type of returned value from {@code fn}.
+ * @return Result of the provided function.
*/
public static T inBusyLock(IgniteSpinBusyLock busyLock, Supplier
fn) {
if (!busyLock.enterBusy()) {
@@ -899,8 +900,8 @@ public class IgniteUtils {
/**
* Method that runs the provided {@code fn} in {@code busyLock}.
*
- * @param busyLock Component's busy lock
- * @param fn Runnable to run
+ * @param busyLock Component's busy lock.
+ * @param fn Runnable to run.
*/
public static void inBusyLock(IgniteSpinBusyLock busyLock, Runnable fn) {
if (!busyLock.enterBusy()) {
@@ -913,6 +914,29 @@ public class IgniteUtils {
}
}
+/**
+ * Method that runs the provided {@code fn} in {@code busyLock}.
+ *
+ * @param Type of returned value from {@code fn}.
+ * @param busyLock Component's busy lock.
+ * @param fn Function to run.
+ * @return Future returned from the {@code fn}, or future with the {@link
NodeStoppingException} if
+ * {@link IgniteSpinBusyLock#enterBusy()} failed or with runtime
exception/error while executing the {@code fn}.
+ */
+public static CompletableFuture inBusyLockAsync(IgniteSpinBusyLock
busyLock, Supplier> fn) {
+if (!busyLock.enterBusy()) {
+return failedFuture(new NodeStoppingException());
+}
+
+try {
+return fn.get();
+} catch (Throwable t) {
+return failedFuture(t);
+} finally {
+busyLock.leaveBusy();
+}
+}
+
/**
* Collects all the fields of given class which are defined as a public
static within the specified class.
*
diff --git a/modules/placement-driver/build.gradle
b/modules/placement-driver/build.gradle
index e939fe2bd3..4de8e53528 100644
--- a/modules/placement-driver/build.gradle
+++ b/modules/placement-driver/build.gradle
@@ -42,6 +42,7 @@ dependencies {
testFixturesImplementation project(':ignite-core')
+integrationTestImplementation libs.jetbrains.annotations
integrationTestImplementation project(':ignite-network')
integrationTestImplementation project(':ignite-raft')
integrationTestImplementation project(':ignite-raft-api')
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
[ignite-3] branch catalog-feature updated (ff97888bee -> f9b5c45658)
This is an automated email from the ASF dual-hosted git repository. tkalkirill pushed a change to branch catalog-feature in repository https://gitbox.apache.org/repos/asf/ignite-3.git from ff97888bee Merge branch 'ai-main' into catalog-feature add f9b5c45658 IGNITE-20236 Get rid of DistributionZonesConfigurationSchema#defaultDataStorage (#2456) No new revisions were added by this update. Summary of changes: .../configuration/ItConfigCommandTest.java | 9 ++- .../distributionzones/DistributionZoneManager.java | 3 +- .../DistributionZonesConfigurationSchema.java | 10 +-- .../storage/ItRebalanceDistributedTest.java| 5 +- .../runner/app/ItIgniteNodeRestartTest.java| 1 - .../org/apache/ignite/internal/app/IgniteImpl.java | 1 - .../configuration/storage/ExistingDataStorage.java | 32 - .../sql/engine/prepare/PrepareServiceImpl.java | 2 +- .../internal/storage/DataStorageManager.java | 56 +++- .../ExistingDataStorageValidator.java | 63 -- ...torageEngineDistributedConfigurationModule.java | 44 - .../internal/storage/DataStorageManagerTest.java | 25 .../ExistingDataStorageValidatorTest.java | 75 -- .../table/distributed/TableManagerTest.java| 1 - 14 files changed, 19 insertions(+), 308 deletions(-) delete mode 100644 modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/storage/ExistingDataStorage.java delete mode 100644 modules/storage-api/src/main/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidator.java delete mode 100644 modules/storage-api/src/main/java/org/apache/ignite/internal/storage/configuration/StorageEngineDistributedConfigurationModule.java delete mode 100644 modules/storage-api/src/test/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidatorTest.java
