Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
89 changes: 89 additions & 0 deletions be/test/format/jni/jni_data_bridge_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// 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.

#include "format/jni/jni_data_bridge.h"

#include <gtest/gtest.h>

#include <array>
#include <memory>

#include "core/column/column_nullable.h"
#include "core/column/variant_v2/column_variant_v2.h"
#include "core/data_type/data_type_nullable.h"
#include "core/data_type/data_type_variant_v2.h"

namespace doris {
namespace {

template <typename T>
long address_of(T* pointer) {
return reinterpret_cast<long>(pointer);
}

TEST(JniDataBridgeTest, VariantTypeUsesVariantJniName) {
auto variant_type = std::make_shared<DataTypeVariantV2>();
auto nullable_variant_type = make_nullable(variant_type);

EXPECT_EQ(JniDataBridge::get_jni_type(variant_type), "variant");
EXPECT_EQ(JniDataBridge::get_jni_type(nullable_variant_type), "variant");
EXPECT_EQ(JniDataBridge::get_jni_type_with_different_string(variant_type), "variant");
EXPECT_EQ(JniDataBridge::get_jni_type_with_different_string(nullable_variant_type), "variant");
}

TEST(JniDataBridgeTest, FillNullableVariantV2FromEncodedPaimonLayout) {
std::array<bool, 3> null_map {false, true, false};
// Paimon metadata contains an empty dictionary and a one-key dictionary for "a".
std::array<uint32_t, 3> metadata_offsets {0, 3, 8};
std::array<char, 8> metadata_bytes {char {0x01}, char {0x00}, char {0x00}, char {0x01},
char {0x01}, char {0x00}, char {0x01}, 'a'};
std::array<uint32_t, 3> metadata_ids {0, 0, 1};
// Primitive values are true, Variant null (the SQL NULL placeholder), and false.
std::array<uint32_t, 4> value_offsets {0, 1, 2, 3};
std::array<char, 3> value_bytes {char {0x04}, char {0x00}, char {0x08}};

std::array<long, 7> meta {
address_of(null_map.data()), 2,
address_of(metadata_offsets.data()), address_of(metadata_bytes.data()),
address_of(metadata_ids.data()), address_of(value_offsets.data()),
address_of(value_bytes.data()),
};
JniDataBridge::TableMetaAddress meta_address(address_of(meta.data()));

DataTypePtr data_type = make_nullable(std::make_shared<DataTypeVariantV2>());
ColumnPtr column = data_type->create_column();
const Status status = JniDataBridge::fill_column(meta_address, column, data_type, 3);
ASSERT_TRUE(status.ok()) << status;

const auto& nullable_column = assert_cast<const ColumnNullable&>(*column);
EXPECT_EQ(nullable_column.get_null_map_data(), NullMap({0, 1, 0}));

const auto& variant_column =
assert_cast<const ColumnVariantV2&>(nullable_column.get_nested_column());
ASSERT_EQ(variant_column.size(), 3);
ASSERT_FALSE(variant_column.is_typed());
const auto view = variant_column.read_view();
EXPECT_EQ(view.metadata_count(), 2);
EXPECT_EQ(view.metadata_id_at(0), view.metadata_id_at(1));
EXPECT_NE(view.metadata_id_at(0), view.metadata_id_at(2));
EXPECT_TRUE(variant_column.get_value_ref(0).get_bool());
EXPECT_TRUE(variant_column.get_value_ref(1).is_null());
EXPECT_FALSE(variant_column.get_value_ref(2).get_bool());
}

} // namespace
} // namespace doris
29 changes: 27 additions & 2 deletions be/test/format_v2/jni/paimon_jni_reader_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <utility>

#include "core/data_type/data_type_string.h"
#include "core/data_type/data_type_variant_v2.h"
#include "format_v2/table_reader.h"
#include "gen_cpp/PlanNodes_types.h"
#include "runtime/runtime_state.h"
Expand All @@ -50,9 +51,10 @@ TFileScanRangeParams make_scan_params() {
}

Status init_reader(PaimonJniReader* reader, TFileScanRangeParams* scan_params,
RuntimeState* runtime_state = nullptr) {
RuntimeState* runtime_state = nullptr,
std::vector<ColumnDefinition> projected_columns = {}) {
return reader->init({
.projected_columns = {},
.projected_columns = std::move(projected_columns),
.conjuncts = {},
.format = FileFormat::JNI,
.scan_params = scan_params,
Expand All @@ -68,6 +70,29 @@ Status build_params(PaimonJniReader* reader, const TFileRangeDesc& range,
return reader->build_scanner_params(params);
}

TEST(PaimonJniReaderTest, PublishesVariantAccessPathsByProjectedColumnPosition) {
auto range = make_paimon_jni_range();
range.table_format_params.paimon_params.__set_paimon_predicate("serialized-predicate");
auto scan_params = make_scan_params();

ColumnDefinition id;
id.name = "id";
id.type = std::make_shared<DataTypeString>();
ColumnDefinition payload;
payload.name = "payload";
payload.type = std::make_shared<DataTypeVariantV2>();
payload.variant_access_paths = {{"name"}, {"profile", "city"}};

PaimonJniReader reader;
ASSERT_TRUE(init_reader(&reader, &scan_params, nullptr, {id, payload}).ok());

std::map<std::string, std::string> params;
ASSERT_TRUE(build_params(&reader, range, &params).ok());
EXPECT_FALSE(params.contains("variant_access_path.0.0"));
EXPECT_EQ(params.at("variant_access_path.1.0"), "$bmFtZQ==");
EXPECT_EQ(params.at("variant_access_path.1.1"), "$cHJvZmlsZQ==,$Y2l0eQ==");
}

TEST(PaimonJniReaderTest, UsesScanLevelPredicateBeforeLegacySplitPredicate) {
auto range = make_paimon_jni_range();
range.table_format_params.paimon_params.__set_paimon_predicate("legacy-predicate");
Expand Down
36 changes: 24 additions & 12 deletions be/test/format_v2/parquet/parquet_schema_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,19 +291,31 @@ TEST(ParquetSchemaTest, AppliesTableFormatVariantOverrideToUnannotatedGroup) {
EXPECT_NE(fields[0]->variant_physical_type, nullptr);
}

TEST(ParquetSchemaTest, AppliesPaimonShreddedVariantOverrideWithOptionalMetadata) {
auto schema = shredded_object_variant_schema();
schema[1].__isset.logicalType = false;
schema[2].__set_repetition_type(tparquet::FieldRepetitionType::OPTIONAL);
NativeFieldDescriptor descriptor;
ASSERT_TRUE(descriptor.parse_from_thrift(schema).ok());
TEST(ParquetSchemaTest, AppliesPaimonShreddedVariantOverrideWithOptionalFields) {
const auto apply_override = [](std::vector<tparquet::SchemaElement> schema) {
NativeFieldDescriptor descriptor;
ASSERT_TRUE(descriptor.parse_from_thrift(schema).ok());

std::vector<std::unique_ptr<ParquetColumnSchema>> fields;
ASSERT_TRUE(build_parquet_column_schema(descriptor, &fields).ok());
const std::vector overrides {format::LocalColumnIndex::top_level(format::LocalColumnId(0))};
const auto status = apply_variant_schema_overrides(descriptor, overrides, &fields);
ASSERT_TRUE(status.ok()) << status;
EXPECT_EQ(fields[0]->kind, ParquetColumnSchemaKind::VARIANT);
std::vector<std::unique_ptr<ParquetColumnSchema>> fields;
ASSERT_TRUE(build_parquet_column_schema(descriptor, &fields).ok());
const std::vector overrides {format::LocalColumnIndex::top_level(format::LocalColumnId(0))};
const auto status = apply_variant_schema_overrides(descriptor, overrides, &fields);
ASSERT_TRUE(status.ok()) << status;
ASSERT_EQ(fields.size(), 1);
EXPECT_EQ(fields[0]->kind, ParquetColumnSchemaKind::VARIANT);
};

auto object_schema = shredded_object_variant_schema();
object_schema[1].__isset.logicalType = false;
object_schema[2].__set_repetition_type(tparquet::FieldRepetitionType::OPTIONAL);
object_schema[5].__set_repetition_type(tparquet::FieldRepetitionType::OPTIONAL);
apply_override(std::move(object_schema));

auto array_schema = shredded_array_variant_schema(true, true);
array_schema[1].__isset.logicalType = false;
array_schema[2].__set_repetition_type(tparquet::FieldRepetitionType::OPTIONAL);
array_schema[6].__set_repetition_type(tparquet::FieldRepetitionType::OPTIONAL);
apply_override(std::move(array_schema));
}

TEST(ParquetSchemaTest, AppliesPaimonFallbackOnlyArrayWithRequiredValue) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ create table variant_shredded (
partitioned by (event_date)
tblproperties (
'file.format' = 'parquet',
'parquet.variant.shreddingSchema' = '{"type":"ROW","fields":[{"name":"payload","type":{"type":"ROW","fields":[{"name":"name","type":"STRING"},{"name":"age","type":"INT"}]}}]}'
'parquet.variant.shreddingSchema' = '{"type":"ROW","fields":[{"name":"payload","type":{"type":"ROW","fields":[{"name":"name","type":"STRING"},{"name":"age","type":"INT"},{"name":"profile","type":{"type":"ROW","fields":[{"name":"city","type":"STRING"}]}}]}}]}'
);

insert into variant_shredded values
(1, date '2026-06-01', parse_json('{"name":"alice","age":18,"extra":"shredded"}')),
(2, date '2026-06-01', parse_json('{"name":"bob","age":30}'));
(1, date '2026-06-01', parse_json('{"name":"alice","age":18,"profile":{"city":"beijing"},"tags":["flink","paimon"],"extra":"shredded"}')),
(2, date '2026-06-01', parse_json('{"name":"bob","age":30,"profile":{"city":"shanghai"},"tags":["doris"]}'));

drop table if exists variant_mixed_us;
create table variant_mixed_us (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,19 @@ public void testVariantTypeAndEncodedLayout() {
column.appendVariant(ONE_KEY_METADATA, new byte[] {8});
long meta = table.getMetaAddress();
Assertions.assertEquals(3L, OffHeap.getLong(null, meta));
Assertions.assertArrayEquals(new boolean[] {false, false, false},
OffHeap.getBoolean(null, OffHeap.getLong(null, meta + 8), 3));
Assertions.assertEquals(2L, OffHeap.getLong(null, meta + 16));
Assertions.assertArrayEquals(new int[] {0, 3, 8},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 24), 3));
Assertions.assertArrayEquals(new byte[] {1, 0, 0, 1, 1, 0, 1, 'a'},
OffHeap.getByte(null, OffHeap.getLong(null, meta + 32), 8));
Assertions.assertArrayEquals(new int[] {0, 0, 1},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 40), 3));
Assertions.assertArrayEquals(new int[] {0, 1, 2, 3},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 48), 4));
Assertions.assertArrayEquals(new byte[] {0, 4, 8},
OffHeap.getByte(null, OffHeap.getLong(null, meta + 56), 3));
} finally {
table.close();
}
Expand All @@ -71,6 +77,10 @@ public void testSqlNullUsesValidVariantNullPlaceholder() {
Assertions.assertArrayEquals(new boolean[] {false, true},
OffHeap.getBoolean(null, OffHeap.getLong(null, meta + 8), 2));
Assertions.assertEquals(1L, OffHeap.getLong(null, meta + 16));
Assertions.assertArrayEquals(new int[] {0, 0},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 40), 2));
Assertions.assertArrayEquals(new int[] {0, 1, 2},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 48), 3));
Assertions.assertArrayEquals(new byte[] {4, 0},
OffHeap.getByte(null, OffHeap.getLong(null, meta + 56), 2));
} finally {
Expand All @@ -92,6 +102,8 @@ public void testResetRebuildsMetadataDictionary() {
Assertions.assertEquals(1L, OffHeap.getLong(null, meta + 16));
Assertions.assertArrayEquals(new int[] {0, 5},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 24), 2));
Assertions.assertArrayEquals(new int[] {0},
OffHeap.getInt(null, OffHeap.getLong(null, meta + 40), 1));
} finally {
table.close();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.data.variant.GenericVariant;
import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.DataType;
Expand All @@ -39,6 +40,7 @@
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.TimestampType;
import org.apache.paimon.types.VarCharType;
import org.apache.paimon.types.VariantType;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -97,6 +99,19 @@ public void testUnpackCompleteStruct() {
Assertions.assertEquals(100L, values.get(2).getLong());
}

@Test
public void testGetVariantEncodedBytes() {
GenericVariant variant = GenericVariant.fromJson("{\"a\":[1,null]}");
PaimonColumnValue columnValue = new PaimonColumnValue(
GenericRow.of(variant), 0, ColumnType.parseType("v", "variant"), new VariantType(), "UTC");

Assertions.assertArrayEquals(variant.metadata(), columnValue.getVariantMetadata());
Assertions.assertArrayEquals(variant.value(), columnValue.getVariantValue());
Assertions.assertEquals(
ColumnType.Type.VARIANT,
PaimonTypeUtils.fromPaimonType("v", new VariantType()).getType());
}

@Test
public void testReuseArrayElementsAcrossRows() {
ArrayType paimonArrayType = new ArrayType(new IntType());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
Expand Down Expand Up @@ -571,6 +572,19 @@ public void testConstructorDecodesDelimiterSafeNestedFieldNamesAndTypes() {
structType.getChildNames());
}

@Test
public void testVariantAccessPathsStayAlignedWithRequiredFields() {
Map<String, String> params = createBaseParams();
params.put("variant_access_path.1.0", encodeFields("name"));
params.put("variant_access_path.1.1", encodeFields("profile", "city"));

List<List<List<String>>> paths = PaimonJniScanner.variantAccessPathsByColumn(params, 3);
Assertions.assertTrue(paths.get(0).isEmpty());
Assertions.assertEquals(Collections.singletonList("name"), paths.get(1).get(0));
Assertions.assertEquals(Arrays.asList("profile", "city"), paths.get(1).get(1));
Assertions.assertTrue(paths.get(2).isEmpty());
}

@Test
public void testConstructorDistinguishesEmptyIdentifierFromEmptyProjection() {
Map<String, String> oneEmptyField = createBaseParams();
Expand Down
Loading
Loading