You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vv...@apache.org on 2022/06/10 13:33:40 UTC
[ignite-3] branch main updated: IGNITE-17124 Better support of storages in Storage API tests (#861)
This is an automated email from the ASF dual-hosted git repository.
vveider 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 56c217334 IGNITE-17124 Better support of storages in Storage API tests (#861)
56c217334 is described below
commit 56c217334884aac2ff4da6ca8023fa0d20a0028a
Author: Timur Magomedov <ti...@yandex.ru>
AuthorDate: Fri Jun 10 16:33:36 2022 +0300
IGNITE-17124 Better support of storages in Storage API tests (#861)
---
.../ExtendedDiscoveryConfigurationSchema.java | 32 ++++++++++++++++++++++
.../testframework/ConfigurationExtension.java | 6 +++-
.../testframework/ConfigurationExtensionTest.java | 15 +++++++++-
.../storage/AbstractPartitionStorageTest.java | 18 +++++++++---
4 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/ExtendedDiscoveryConfigurationSchema.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/ExtendedDiscoveryConfigurationSchema.java
new file mode 100644
index 000000000..5402897e2
--- /dev/null
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/ExtendedDiscoveryConfigurationSchema.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.configuration.sample;
+
+import java.util.UUID;
+import org.apache.ignite.configuration.annotation.InternalConfiguration;
+import org.apache.ignite.configuration.annotation.InternalId;
+
+/**
+ * Internal extension of {@link DiscoveryConfigurationSchema}.
+ */
+@InternalConfiguration
+public class ExtendedDiscoveryConfigurationSchema extends DiscoveryConfigurationSchema {
+ /** ID. */
+ @InternalId
+ public UUID id;
+}
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtension.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtension.java
index 312b6bbc8..ad95f1b70 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtension.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtension.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicLong;
@@ -227,7 +228,10 @@ public class ConfigurationExtension implements BeforeEachCallback, AfterEachCall
ConfigurationUtil.addDefaults(superRoot);
if (!annotation.name().isEmpty()) {
- superRoot.getRoot(rootKey).setInjectedNameFieldValue(annotation.name());
+ InnerNode root = superRoot.getRoot(rootKey);
+
+ root.internalId(UUID.randomUUID());
+ root.setInjectedNameFieldValue(annotation.name());
}
// Reference to the super root is required to make DynamicConfigurationChanger#change method atomic.
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
index 9578a3c5a..6b9a27ea5 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
@@ -32,6 +32,8 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.ignite.internal.configuration.notifications.ConfigurationStorageRevisionListenerHolder;
import org.apache.ignite.internal.configuration.sample.DiscoveryConfiguration;
+import org.apache.ignite.internal.configuration.sample.ExtendedDiscoveryConfiguration;
+import org.apache.ignite.internal.configuration.sample.ExtendedDiscoveryConfigurationSchema;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -41,7 +43,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ConfigurationExtension.class)
class ConfigurationExtensionTest {
/** Injected field. */
- @InjectConfiguration
+ @InjectConfiguration(internalExtensions = ExtendedDiscoveryConfigurationSchema.class)
private DiscoveryConfiguration fieldCfg;
@InjectRevisionListenerHolder
@@ -169,4 +171,15 @@ class ConfigurationExtensionTest {
assertTrue(revisions.get(0) < revisions.get(1), revisions::toString);
}
+
+ /** Test UUID generation in mocks. */
+ @Test
+ public void testInjectInternalId(
+ @InjectConfiguration(
+ internalExtensions = ExtendedDiscoveryConfigurationSchema.class,
+ name = "test"
+ ) DiscoveryConfiguration discoveryConfig
+ ) {
+ assertNotNull(((ExtendedDiscoveryConfiguration) discoveryConfig).id().value());
+ }
}
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractPartitionStorageTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractPartitionStorageTest.java
index 990832cfa..daa624ab8 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractPartitionStorageTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/AbstractPartitionStorageTest.java
@@ -168,13 +168,13 @@ public abstract class AbstractPartitionStorageTest {
storage.write(dataRow1);
storage.write(dataRow2);
- List<DataRow> list = toList(storage.scan(key -> key.keyBytes()[3] == '1'));
+ List<DataRow> list = toList(storage.scan(key -> stringKey(key).charAt(3) == '1'));
assertThat(list, hasSize(1));
assertArrayEquals(dataRow1.value().array(), list.get(0).value().array());
- list = toList(storage.scan(key -> key.keyBytes()[3] == '2'));
+ list = toList(storage.scan(key -> stringKey(key).charAt(3) == '2'));
assertThat(list, hasSize(1));
@@ -668,7 +668,7 @@ public abstract class AbstractPartitionStorageTest {
* @param key String key.
* @return Search row.
*/
- protected static SearchRow searchRow(String key) {
+ protected SearchRow searchRow(String key) {
return new SearchRow() {
@Override
public byte[] keyBytes() {
@@ -682,6 +682,16 @@ public abstract class AbstractPartitionStorageTest {
};
}
+ /**
+ * Get key as a string.
+ *
+ * @param searchRow Search row.
+ * @return String key.
+ */
+ protected String stringKey(SearchRow searchRow) {
+ return new String(searchRow.keyBytes(), StandardCharsets.UTF_8);
+ }
+
/**
* Wraps string key/value pair into a data row.
*
@@ -689,7 +699,7 @@ public abstract class AbstractPartitionStorageTest {
* @param value String value.
* @return Data row.
*/
- protected static DataRow dataRow(String key, String value) {
+ protected DataRow dataRow(String key, String value) {
return new SimpleDataRow(
key.getBytes(StandardCharsets.UTF_8),
value.getBytes(StandardCharsets.UTF_8)