Skip to content

Cover more Struct MetaData name tests #3750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Cover more Struct MetaData name tests #3750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83078c9
Add continuations to struct type name tests
arnaud-lacurie Nov 13, 2025
64d5a83
Add more tests
arnaud-lacurie Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 128 additions & 17 deletions ...e/src/test/java/com/apple/foundationdb/relational/recordlayer/StructDataMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@

package com.apple.foundationdb.relational.recordlayer;

import com.apple.foundationdb.relational.api.Continuation;
import com.apple.foundationdb.relational.api.EmbeddedRelationalArray;
import com.apple.foundationdb.relational.api.EmbeddedRelationalStruct;
import com.apple.foundationdb.relational.api.KeySet;
import com.apple.foundationdb.relational.api.Options;
import com.apple.foundationdb.relational.api.RelationalArray;
import com.apple.foundationdb.relational.api.RelationalResultSet;
import com.apple.foundationdb.relational.api.RelationalStruct;
import com.apple.foundationdb.relational.utils.SimpleDatabaseRule;
Expand All @@ -32,9 +34,12 @@
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.function.ThrowingConsumer;

import java.nio.charset.StandardCharsets;
import java.sql.Array;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Set;

Expand Down Expand Up @@ -77,37 +82,68 @@

@BeforeEach
void setUp() throws SQLException {
var m = EmbeddedRelationalStruct.newBuilder()
.addString("NAME", "test_record_1")
.addStruct("ST1", EmbeddedRelationalStruct.newBuilder().addString("A", "Hello").build())
.build();
statement.executeInsert("T", m);
m = EmbeddedRelationalStruct.newBuilder()
.addString("NAME", "test_record_2")
.addStruct("ST1", EmbeddedRelationalStruct.newBuilder().addString("A", "World").build())
.build();
statement.executeInsert("T", m);

m = EmbeddedRelationalStruct.newBuilder()
.addString("T_NAME", "nt_record")
.addStruct("ST1", EmbeddedRelationalStruct.newBuilder()
.addLong("C", 1234L)
.addStruct("D", EmbeddedRelationalStruct.newBuilder()
.addString("A", "Goodbye")
.build())
.build())
.build();
statement.executeInsert("NT", m);

final var atBuilder = EmbeddedRelationalStruct.newBuilder();
m = EmbeddedRelationalStruct.newBuilder()
.addString("T_NAME", "nt_record2")
.addStruct("ST1", EmbeddedRelationalStruct.newBuilder()
.addLong("C", 5678L)
.addStruct("D", EmbeddedRelationalStruct.newBuilder()
.addString("A", "Ciao")
.build())
.build())
.build();
statement.executeInsert("NT", m);

var atBuilder = EmbeddedRelationalStruct.newBuilder();
m = atBuilder.addString("A_NAME", "a_test_rec")
.addArray("ST2", EmbeddedRelationalArray.newBuilder()
.addStruct(EmbeddedRelationalStruct.newBuilder()
.addBytes("C", "Hello".getBytes(StandardCharsets.UTF_8))
.addBoolean("D", true)
.build())
.addStruct(EmbeddedRelationalStruct.newBuilder()
.addBytes("C", "Bonjour".getBytes(StandardCharsets.UTF_8))
.addBoolean("D", false)
.build())
.build())
.build();
statement.executeInsert("AT", m);

atBuilder = EmbeddedRelationalStruct.newBuilder();
m = atBuilder.addString("A_NAME", "another_test_rec")
.addArray("ST2", EmbeddedRelationalArray.newBuilder()
.addStruct(EmbeddedRelationalStruct.newBuilder()
.addBytes("C", "今日は".getBytes(StandardCharsets.UTF_8))
.addBoolean("D", true)
.build())
.addStruct(EmbeddedRelationalStruct.newBuilder()
.addBytes("C", "مرحبًا".getBytes(StandardCharsets.UTF_8))
.addBoolean("D", false)
.build())
.build())
.build();
statement.executeInsert("AT", m);

Check warning on line 146 in fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/StructDataMetadataTest.java

View check run for this annotation

fdb.teamscale.io / Teamscale | Findings

fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/StructDataMetadataTest.java#L85-L146 

[New] This method is a bit lengthy [0]. Consider shortening it, e.g. by extracting code blocks into separate methods.

[0] https://fdb.teamscale.io/findings/details/foundationdb-fdb-record-layer?t=FORK_MR%2F3750%2Farnaud-lacurie%2Fadd_cont_to_test%3AHEAD&id=43EF03FED62CE485A537B9853DA3D3AB
}

@Test
Expand All @@ -125,35 +161,110 @@
}
}

@Test
void canReadProjectedStructTypeNameInNestedStar() throws Exception {
try (final RelationalResultSet resultSet = statement.executeQuery("SELECT (*) FROM T")) {
private void canReadStructTypeName(String query, ThrowingConsumer<RelationalResultSet> assertOnMetaData) throws Throwable {
Continuation continuation;
statement.setMaxRows(1);
try (final RelationalResultSet resultSet = statement.executeQuery(query)) {
Assertions.assertTrue(resultSet.next(), "Did not find a record!");
assertOnMetaData.accept(resultSet);
continuation = resultSet.getContinuation();
}
try (final PreparedStatement ps = connection.prepareStatement("EXECUTE CONTINUATION ?")) {
ps.setBytes(1, continuation.serialize());
try (final ResultSet resultSet = ps.executeQuery()) {
Assertions.assertTrue(resultSet.next(), "Did not find a record!");
assertOnMetaData.accept(resultSet.unwrap(RelationalResultSet.class));
}
}
}

@Test
void canReadProjectedStructTypeNameInNestedStar() throws Throwable {
canReadStructTypeName("SELECT (*) FROM T", resultSet -> {
RelationalStruct struct = resultSet.getStruct(1).getStruct("ST1");
Assertions.assertEquals("STRUCT_1", struct.getMetaData().getTypeName());
}
});
}

// When projecting *, the underlying struct types are lost and replaced with a generic UUID type.
// This test should be replaced with the correct expected behavior once this is fixed.
// When projecting (*), everything works as expected, see `canReadProjectedStructTypeNameInNestedStar`.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
@Test
void cannotReadProjectedStructTypeNameInUnnestedStar() throws Exception {
try (final RelationalResultSet resultSet = statement.executeQuery("SELECT * FROM T")) {
Assertions.assertTrue(resultSet.next(), "Did not find a record!");
void canReadProjectedNestedStructTypeNameInNestedStar() throws Throwable {
canReadStructTypeName("SELECT (*) FROM NT", resultSet -> {
RelationalStruct struct = resultSet.getStruct(1).getStruct("ST1").getStruct("D");
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_1", struct.getMetaData().getTypeName());
});
}

@Test
void canReadProjectedStructInArrayTypeNameInNestedStar() throws Throwable {
canReadStructTypeName("SELECT (*) FROM AT", resultSet -> {
RelationalArray array = resultSet.getStruct(1).getArray("ST2");
Assertions.assertEquals("STRUCT", array.getMetaData().getElementTypeName());
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_3", array.getMetaData().getElementStructMetaData().getTypeName());
});
}

@Test
void canReadProjectedStructTypeNameInUnnestedStar() throws Throwable {
canReadStructTypeName("SELECT * FROM T", resultSet -> {
RelationalStruct struct = resultSet.getStruct("ST1");
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_1", struct.getMetaData().getTypeName());
}
});
}

@Test
void canReadProjectedStructTypeNameDirectlyProjected() throws Exception {
try (final RelationalResultSet resultSet = statement.executeQuery("SELECT ST1 FROM T")) {
Assertions.assertTrue(resultSet.next(), "Did not find a record!");
void canReadProjectedNestedStructTypeNameInUnnestedStar() throws Throwable {
canReadStructTypeName("SELECT * FROM NT", resultSet -> {
RelationalStruct struct = resultSet.getStruct("ST1").getStruct("D");
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_1", struct.getMetaData().getTypeName());
});
}

@Test
void canReadProjectedStructInArrayTypeNameInUnnestedStar() throws Throwable {
canReadStructTypeName("SELECT * FROM AT", resultSet -> {
RelationalArray array = resultSet.getArray("ST2");
Assertions.assertEquals("STRUCT", array.getMetaData().getElementTypeName());
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_3", array.getMetaData().getElementStructMetaData().getTypeName());
});
}

@Test
void canReadProjectedStructTypeNameDirectlyProjected() throws Throwable {
canReadStructTypeName("SELECT ST1 FROM T", resultSet -> {
RelationalStruct struct = resultSet.getStruct("ST1");
Assertions.assertEquals("STRUCT_1", struct.getMetaData().getTypeName());
}
});
}

@Test
void canReadProjectedNestedStructTypeNameDirectlyProjected() throws Throwable {
canReadStructTypeName("SELECT ST1 FROM NT", resultSet -> {
RelationalStruct struct = resultSet.getStruct("ST1").getStruct("D");
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_1", struct.getMetaData().getTypeName());
});
}

@Test
void canReadProjectedStructInArrayTypeNameDirectlyProjected() throws Throwable {
canReadStructTypeName("SELECT * FROM AT", resultSet -> {
RelationalArray array = resultSet.getArray("ST2");
Assertions.assertEquals("STRUCT", array.getMetaData().getElementTypeName());
// Replace following assert with AssertEquals once fixed.
// See https://github.com/FoundationDB/fdb-record-layer/issues/3743
Assertions.assertNotEquals("STRUCT_3", array.getMetaData().getElementStructMetaData().getTypeName());
});
}

@Test
Expand Down
Loading