5151#include "core/column/column_nullable.h"
5252#include "core/column/column_string.h"
5353#include "core/column/column_struct.h"
54+ #include "core/column/column_varbinary.h"
5455#include "core/column/column_vector.h"
5556#include "core/data_type/data_type_array.h"
5657#include "core/data_type/data_type_date.h"
@@ -1693,7 +1694,8 @@ class NullableStringEqualsExpr final : public VExpr {
16931694 size_t count, ColumnPtr& result_column) const override {
16941695 const auto& nullable_column =
16951696 assert_cast<const ColumnNullable&>(*block->get_by_position(_column_id).column);
1696- const auto& input = assert_cast<const ColumnString&>(nullable_column.get_nested_column());
1697+ // Residual test comparisons apply to raw bytes in both string and binary columns.
1698+ const auto& input = nullable_column.get_nested_column();
16971699 auto result = ColumnUInt8::create();
16981700 auto& result_data = result->get_data();
16991701 result_data.resize(count);
@@ -8059,7 +8061,7 @@ TEST_F(NewOrcReaderTest, SargBinaryVarbinaryLiteralConjunctPrunesRowGroups) {
80598061 std::vector<format::ColumnDefinition> schema;
80608062 ASSERT_TRUE(reader->get_schema(&schema).ok());
80618063 ASSERT_EQ(schema.size(), 2);
8062- EXPECT_EQ(remove_nullable(schema[0].type)->get_primitive_type(), TYPE_STRING );
8064+ EXPECT_EQ(remove_nullable(schema[0].type)->get_primitive_type(), TYPE_VARBINARY );
80638065
80648066 auto request = std::make_shared<format::FileScanRequest>();
80658067 request->predicate_columns = {field_projection(0)};
@@ -8117,7 +8119,7 @@ TEST_F(NewOrcReaderTest, SargExceptionsFallBackToResidualScan) {
81178119 if (add_real_residual_filter) {
81188120 request->conjuncts.push_back(
81198121 VExprContext::create_shared(std::make_shared<NullableStringEqualsExpr>(
8120- 0, std::make_shared<DataTypeString >(), "aaa_1050", "value")));
8122+ 0, std::make_shared<DataTypeVarbinary >(), "aaa_1050", "value")));
81218123 }
81228124 *open_status = reader->open(request);
81238125 if (!open_status->ok()) {
@@ -8135,7 +8137,7 @@ TEST_F(NewOrcReaderTest, SargExceptionsFallBackToResidualScan) {
81358137 const auto& values_nullable =
81368138 assert_cast<const ColumnNullable&>(*block.get_by_position(0).column);
81378139 const auto& values =
8138- assert_cast<const ColumnString &>(values_nullable.get_nested_column());
8140+ assert_cast<const ColumnVarbinary &>(values_nullable.get_nested_column());
81398141 for (size_t row = 0; row < rows; ++row) {
81408142 ASSERT_FALSE(values_nullable.is_null_at(row));
81418143 result_values->push_back(values.get_data_at(row).to_string());
@@ -8228,7 +8230,7 @@ TEST_F(NewOrcReaderTest, SargBinaryCastFromVarbinaryToStringConjunctPrunesRowGro
82288230 std::vector<format::ColumnDefinition> schema;
82298231 ASSERT_TRUE(reader->get_schema(&schema).ok());
82308232 ASSERT_EQ(schema.size(), 2);
8231- EXPECT_EQ(remove_nullable(schema[0].type)->get_primitive_type(), TYPE_STRING );
8233+ EXPECT_EQ(remove_nullable(schema[0].type)->get_primitive_type(), TYPE_VARBINARY );
82328234
82338235 auto request = std::make_shared<format::FileScanRequest>();
82348236 request->predicate_columns = {field_projection(0)};
@@ -10401,6 +10403,34 @@ TEST_F(NewOrcReaderTest, ReadsOnlyRequestedAbsoluteFileRows) {
1040110403 EXPECT_EQ(ids, std::vector<int32_t>({1, 3, 5}));
1040210404}
1040310405
10406+ TEST_F(NewOrcReaderTest, NestedBinarySchemaRetainsBinarySemantics) {
10407+ auto type = ::orc::Type::buildTypeFromString(
10408+ "struct<b:binary,s:string,a:array<binary>,m:map<string,binary>,r:struct<b:binary>>");
10409+ MemoryOutputStream stream(1024);
10410+ ::orc::WriterOptions options;
10411+ auto writer = ::orc::createWriter(*type, &stream, options);
10412+ writer->close();
10413+ const auto path = (_test_dir / "nested_binary.orc").string();
10414+ std::ofstream out(path, std::ios::binary);
10415+ out.write(stream.getData(), static_cast<std::streamsize>(stream.getLength()));
10416+ out.close();
10417+ auto reader = create_reader_for_path(path);
10418+ RuntimeState state {TQueryOptions(), TQueryGlobals()};
10419+ ASSERT_TRUE(reader->init(&state).ok());
10420+ std::vector<format::ColumnDefinition> schema;
10421+ ASSERT_TRUE(reader->get_schema(&schema).ok());
10422+ ASSERT_EQ(schema.size(), 5);
10423+ EXPECT_EQ(schema[0].type->get_primitive_type(), TYPE_VARBINARY);
10424+ EXPECT_EQ(schema[1].type->get_primitive_type(), TYPE_STRING);
10425+ const auto& array = assert_cast<const DataTypeArray&>(*remove_nullable(schema[2].type));
10426+ EXPECT_EQ(array.get_nested_type()->get_primitive_type(), TYPE_VARBINARY);
10427+ const auto& map = assert_cast<const DataTypeMap&>(*remove_nullable(schema[3].type));
10428+ EXPECT_EQ(map.get_key_type()->get_primitive_type(), TYPE_STRING);
10429+ EXPECT_EQ(map.get_value_type()->get_primitive_type(), TYPE_VARBINARY);
10430+ const auto& structure = assert_cast<const DataTypeStruct&>(*remove_nullable(schema[4].type));
10431+ EXPECT_EQ(structure.get_elements()[0]->get_primitive_type(), TYPE_VARBINARY);
10432+ }
10433+
1040410434TEST_F(NewOrcReaderTest, ReadPrimitiveTypesWithNulls) {
1040510435 const auto primitive_file_path = (_test_dir / "primitive.orc").string();
1040610436 write_primitive_orc_file(primitive_file_path);
@@ -10420,7 +10450,7 @@ TEST_F(NewOrcReaderTest, ReadPrimitiveTypesWithNulls) {
1042010450 EXPECT_EQ(remove_nullable(schema[5].type)->get_primitive_type(), TYPE_FLOAT);
1042110451 EXPECT_EQ(remove_nullable(schema[6].type)->get_primitive_type(), TYPE_DOUBLE);
1042210452 EXPECT_EQ(remove_nullable(schema[7].type)->get_primitive_type(), TYPE_STRING);
10423- EXPECT_EQ (remove_nullable(schema[8].type)->get_primitive_type(), TYPE_STRING );
10453+ ASSERT_EQ (remove_nullable(schema[8].type)->get_primitive_type(), TYPE_VARBINARY );
1042410454 EXPECT_EQ(remove_nullable(schema[9].type)->get_primitive_type(), TYPE_VARCHAR);
1042510455 EXPECT_EQ(remove_nullable(schema[10].type)->get_primitive_type(), TYPE_CHAR);
1042610456 EXPECT_EQ(remove_nullable(schema[11].type)->get_primitive_type(), TYPE_DATEV2);
@@ -10475,7 +10505,7 @@ TEST_F(NewOrcReaderTest, ReadPrimitiveTypesWithNulls) {
1047510505 const auto& string_values = assert_cast<const ColumnString&>(
1047610506 assert_cast<const ColumnNullable&>(*block.get_by_position(7).column)
1047710507 .get_nested_column());
10478- const auto& binary_values = assert_cast<const ColumnString &>(
10508+ const auto& binary_values = assert_cast<const ColumnVarbinary &>(
1047910509 assert_cast<const ColumnNullable&>(*block.get_by_position(8).column)
1048010510 .get_nested_column());
1048110511 const auto& varchar_values = assert_cast<const ColumnString&>(
0 commit comments