Skip to content

Commit c6667ff

Browse files
committed
fix ci
1 parent 2da728a commit c6667ff

4 files changed

Lines changed: 9 additions & 20 deletions

File tree

cpp/src/arrow/extension/variant/meson.build

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,9 @@
1717

1818
exc = executable(
1919
'arrow-variant-extension-test',
20-
sources: [
21-
'type_test.cc',
22-
'encoding_test.cc',
23-
'builder_test.cc',
24-
],
20+
sources: ['type_test.cc', 'encoding_test.cc', 'builder_test.cc'],
2521
dependencies: [arrow_test_dep],
2622
)
2723
test('arrow-variant-extension-test', exc)
2824

29-
install_headers(
30-
[
31-
'encoding.h',
32-
'builder.h',
33-
],
34-
subdir: 'arrow/extension/variant',
35-
)
25+
install_headers(['encoding.h', 'builder.h'], subdir: 'arrow/extension/variant')

cpp/src/arrow/extension/variant/type_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ TEST(TestVariantType, Storage) {
2626
auto unshredded = struct_({field("metadata", binary(), /*nullable=*/false),
2727
field("value", binary(), /*nullable=*/false)});
2828
ASSERT_OK_AND_ASSIGN(auto type, VariantExtensionType::Make(unshredded));
29-
ASSERT_EQ(VariantExtensionType::kExtensionName,
30-
::arrow::internal::checked_cast<const ExtensionType&>(*type)
31-
.extension_name());
29+
ASSERT_EQ(
30+
VariantExtensionType::kExtensionName,
31+
::arrow::internal::checked_cast<const ExtensionType&>(*type).extension_name());
3232

3333
auto shredded = struct_({field("metadata", binary(), /*nullable=*/false),
3434
field("value", binary()), field("typed_value", int64())});

cpp/src/parquet/arrow/arrow_reader_writer_test.cc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5928,11 +5928,8 @@ TEST(TestArrowReadWrite, AllNulls) {
59285928
auto schema = ::arrow::schema({::arrow::field("all_nulls", ::arrow::int8())});
59295929

59305930
constexpr int64_t length = 3;
5931-
ASSERT_OK_AND_ASSIGN(auto null_bitmap, ::arrow::AllocateEmptyBitmap(length));
5932-
auto array_data = ::arrow::ArrayData::Make(
5933-
::arrow::int8(), length, {null_bitmap, /*values=*/nullptr}, /*null_count=*/length);
5934-
auto array = ::arrow::MakeArray(array_data);
5935-
auto record_batch = ::arrow::RecordBatch::Make(schema, length, {array});
5931+
ASSERT_OK_AND_ASSIGN(auto array, MakeArrayOfNull(::arrow::int8(), length));
5932+
auto record_batch = ::arrow::RecordBatch::Make(schema, length, {std::move(array)});
59365933

59375934
auto sink = CreateOutputStream();
59385935
ASSERT_OK_AND_ASSIGN(auto writer, parquet::arrow::FileWriter::Open(

cpp/src/parquet/arrow/variant_validate_internal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#pragma once
1919

2020
#include "arrow/status.h"
21+
#include "parquet/platform.h"
2122

2223
namespace arrow {
2324

@@ -28,6 +29,7 @@ class MemoryPool;
2829

2930
namespace parquet::arrow::internal {
3031

32+
PARQUET_EXPORT
3133
::arrow::Status ValidateVariants(const ::arrow::ChunkedArray& data,
3234
::arrow::MemoryPool* pool);
3335

0 commit comments

Comments
 (0)