Skip to content

Commit

Permalink
fix failed tests #3
Browse files Browse the repository at this point in the history
  • Loading branch information
@korlov42
korlov42 committed Oct 19, 2022
1 parent 4bda1dc commit c371553
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 22 deletions.
32 changes: 16 additions & 16 deletions ...table/src/integrationTest/java/org/apache/ignite/distributed/ItInternalTableScanTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Flow;
import java.util.concurrent.Flow.Subscriber;
Expand All @@ -45,15 +44,16 @@
import org.apache.ignite.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.ByteBufferRow;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.NativeTypes;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.row.RowAssembler;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.PartitionTimestampCursor;
import org.apache.ignite.internal.storage.ReadResult;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.table.InternalTable;
import org.apache.ignite.internal.table.impl.DummyInternalTableImpl;
import org.apache.ignite.internal.util.ByteUtils;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
Expand Down Expand Up @@ -349,18 +349,18 @@ public void testNullPointerExceptionIsThrownInCaseOfNullSubscription() {
* @param entryKey Key.
* @param entryVal Value
* @return {@link BinaryRow} based on given key and value.
* @throws java.io.IOException If failed to close output stream that was used to convertation.
*/
private static @NotNull BinaryRow prepareRow(@NotNull String entryKey,
@NotNull String entryVal) throws IOException {
byte[] keyBytes = ByteUtils.toBytes(entryKey);

try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
outputStream.write(keyBytes);
outputStream.write(ByteUtils.toBytes(entryVal));

return new ByteBufferRow(keyBytes);
}
private static BinaryRow prepareRow(String entryKey, String entryVal) {
return new RowAssembler(
new SchemaDescriptor(
1,
new Column[]{new Column("key", NativeTypes.stringOf(100), false)},
new Column[]{new Column("val", NativeTypes.stringOf(100), false)}
), 1, 1
)
.appendString(Objects.requireNonNull(entryKey, "entryKey"))
.appendString(Objects.requireNonNull(entryVal, "entryVal"))
.build();
}

/**
Expand Down
17 changes: 11 additions & 6 deletions ...src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import static org.junit.jupiter.api.Assertions.fail;

import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -33,7 +32,6 @@
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand All @@ -51,10 +49,14 @@
import org.apache.ignite.internal.raft.server.impl.JraftServerImpl;
import org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.schema.NativeTypes;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage;
import org.apache.ignite.internal.storage.index.HashIndexDescriptor;
import org.apache.ignite.internal.storage.index.HashIndexDescriptor.HashIndexColumnDescriptor;
import org.apache.ignite.internal.storage.index.HashIndexStorage;
import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.TxAbstractTest;
import org.apache.ignite.internal.table.distributed.TableMessageGroup;
Expand Down Expand Up @@ -380,7 +382,10 @@ protected Int2ObjectOpenHashMap<RaftGroupService> startTable(String name, UUID t

int partId = p;

ConcurrentHashMap<ByteBuffer, RowId> primaryIndex = new ConcurrentHashMap<>();
HashIndexStorage pkStorage = new TestHashIndexStorage(new HashIndexDescriptor(
UUID.randomUUID(),
List.of(new HashIndexColumnDescriptor("__rawKey", NativeTypes.BYTES, false))
));

CompletableFuture<Void> partitionReadyFuture = raftServers.get(node).prepareRaftGroup(
grpId,
Expand All @@ -391,7 +396,7 @@ protected Int2ObjectOpenHashMap<RaftGroupService> startTable(String name, UUID t
txSateStorage,
txManagers.get(node),
List::of,
null
pkStorage
);
},
RaftGroupOptions.defaults()
Expand All @@ -409,7 +414,7 @@ protected Int2ObjectOpenHashMap<RaftGroupService> startTable(String name, UUID t
grpId,
tblId,
List::of,
null,
pkStorage,
clocks.get(node),
txSateStorage,
topologyServices.get(node),
Expand Down

0 comments on commit c371553

Please sign in to comment.