forked from trinodb/trino
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix flat write for MAP and ARRAY type
The previous code was adjusting the variable offset by the written fixed size for each value
- Loading branch information
Showing
8 changed files
with
203 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
core/trino-main/src/test/java/io/trino/type/TestVarcharArrayType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Licensed 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 io.trino.type; | ||
|
|
||
| import io.trino.spi.block.Block; | ||
| import io.trino.spi.block.BlockBuilder; | ||
| import io.trino.spi.type.Type; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static io.airlift.slice.Slices.utf8Slice; | ||
| import static io.trino.spi.type.TypeSignature.arrayType; | ||
| import static io.trino.spi.type.VarcharType.VARCHAR; | ||
| import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER; | ||
| import static io.trino.util.StructuralTestUtil.arrayBlockOf; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class TestVarcharArrayType | ||
| extends AbstractTestType | ||
| { | ||
| public TestVarcharArrayType() | ||
| { | ||
| super(TESTING_TYPE_MANAGER.getType(arrayType(VARCHAR.getTypeSignature())), List.class, createTestBlock(TESTING_TYPE_MANAGER.getType(arrayType(VARCHAR.getTypeSignature())))); | ||
| } | ||
|
|
||
| public static Block createTestBlock(Type arrayType) | ||
| { | ||
| BlockBuilder blockBuilder = arrayType.createBlockBuilder(null, 4); | ||
| arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "1", "2")); | ||
| arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "the", "quick", "brown", "fox")); | ||
| arrayType.writeObject(blockBuilder, arrayBlockOf(VARCHAR, "one-two-three-four-five", "123456789012345", "the quick brown fox", "hello-world-hello-world-hello-world")); | ||
| return blockBuilder.build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Object getGreaterValue(Object value) | ||
| { | ||
| Block block = (Block) value; | ||
| BlockBuilder blockBuilder = VARCHAR.createBlockBuilder(null, block.getPositionCount() + 1); | ||
| for (int i = 0; i < block.getPositionCount(); i++) { | ||
| VARCHAR.appendTo(block, i, blockBuilder); | ||
| } | ||
| VARCHAR.writeSlice(blockBuilder, utf8Slice("_")); | ||
|
|
||
| return blockBuilder.build(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRange() | ||
| { | ||
| assertThat(type.getRange()) | ||
| .isEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPreviousValue() | ||
| { | ||
| assertThat(type.getPreviousValue(getSampleValue())) | ||
| .isEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNextValue() | ||
| { | ||
| assertThat(type.getNextValue(getSampleValue())) | ||
| .isEmpty(); | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
core/trino-main/src/test/java/io/trino/type/TestVarcharVarcharMapType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Licensed 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 io.trino.type; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import io.trino.spi.block.Block; | ||
| import io.trino.spi.block.BlockBuilder; | ||
| import io.trino.spi.type.Type; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import static io.trino.spi.type.VarcharType.VARCHAR; | ||
| import static io.trino.util.StructuralTestUtil.mapBlockOf; | ||
| import static io.trino.util.StructuralTestUtil.mapType; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| public class TestVarcharVarcharMapType | ||
| extends AbstractTestType | ||
| { | ||
| public TestVarcharVarcharMapType() | ||
| { | ||
| super(mapType(VARCHAR, VARCHAR), Map.class, createTestBlock(mapType(VARCHAR, VARCHAR))); | ||
| } | ||
|
|
||
| public static Block createTestBlock(Type mapType) | ||
| { | ||
| BlockBuilder blockBuilder = mapType.createBlockBuilder(null, 2); | ||
| mapType.writeObject(blockBuilder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("hi", "there"))); | ||
| mapType.writeObject(blockBuilder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("one", "1", "hello", "world"))); | ||
| mapType.writeObject(blockBuilder, mapBlockOf(VARCHAR, VARCHAR, ImmutableMap.of("one-two-three-four-five", "123456789012345", "the quick brown fox", "hello-world-hello-world-hello-world"))); | ||
| return blockBuilder.build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Object getGreaterValue(Object value) | ||
| { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRange() | ||
| { | ||
| assertThat(type.getRange()) | ||
| .isEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPreviousValue() | ||
| { | ||
| Object sampleValue = getSampleValue(); | ||
| if (!type.isOrderable()) { | ||
| assertThatThrownBy(() -> type.getPreviousValue(sampleValue)) | ||
| .isInstanceOf(IllegalStateException.class) | ||
| .hasMessage("Type is not orderable: " + type); | ||
| return; | ||
| } | ||
| assertThat(type.getPreviousValue(sampleValue)) | ||
| .isEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNextValue() | ||
| { | ||
| Object sampleValue = getSampleValue(); | ||
| if (!type.isOrderable()) { | ||
| assertThatThrownBy(() -> type.getNextValue(sampleValue)) | ||
| .isInstanceOf(IllegalStateException.class) | ||
| .hasMessage("Type is not orderable: " + type); | ||
| return; | ||
| } | ||
| assertThat(type.getNextValue(sampleValue)) | ||
| .isEmpty(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters