Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.
Closed
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
25 changes: 25 additions & 0 deletions src/parquet/arrow/arrow-reader-writer-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,31 @@ TEST_F(TestUInt32ParquetIO, Parquet_1_0_Compability) {
this->ReadAndCheckSingleColumnTable(expected_values);
}

using TestStringParquetIO = TestParquetIO<::arrow::StringType>;

TEST_F(TestStringParquetIO, EmptyStringColumnRequiredWrite) {
std::shared_ptr<Array> values;
::arrow::StringBuilder builder(
::arrow::default_memory_pool(), std::make_shared<::arrow::StringType>());
for (size_t i = 0; i < SMALL_SIZE; i++) {
builder.Append("");
}
ASSERT_OK(builder.Finish(&values));
std::shared_ptr<Table> table = MakeSimpleTable(values, false);
this->sink_ = std::make_shared<InMemoryOutputStream>();
ASSERT_OK_NO_THROW(WriteFlatTable(table.get(), ::arrow::default_memory_pool(),
this->sink_, values->length(), default_writer_properties()));

std::shared_ptr<Table> out;
this->ReadTableFromFile(this->ReaderFromSink(), &out);
ASSERT_EQ(1, out->num_columns());
ASSERT_EQ(100, out->num_rows());

std::shared_ptr<ChunkedArray> chunked_array = out->column(0)->data();
ASSERT_EQ(1, chunked_array->num_chunks());
ASSERT_TRUE(values->Equals(chunked_array->chunk(0)));
}

template <typename T>
using ParquetCDataType = typename ParquetDataType<T>::c_type;

Expand Down
10 changes: 8 additions & 2 deletions src/parquet/arrow/writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,14 @@ Status FileWriter::Impl::WriteFlatColumnChunk(
DCHECK((offset + length) <= data->length());
RETURN_NOT_OK(data_buffer_.Resize(length * sizeof(ByteArray)));
auto buffer_ptr = reinterpret_cast<ByteArray*>(data_buffer_.mutable_data());
auto data_ptr = reinterpret_cast<const uint8_t*>(data->data()->data());
DCHECK(data_ptr != nullptr);
// In the case of an array consisting of only empty strings or all null,
// data->data() points already to a nullptr, thus data->data()->data() will
// segfault.
const uint8_t* data_ptr = nullptr;
if (data->data()) {
data_ptr = reinterpret_cast<const uint8_t*>(data->data()->data());
DCHECK(data_ptr != nullptr);
}
auto writer = reinterpret_cast<TypedColumnWriter<ByteArrayType>*>(column_writer);
if (writer->descr()->max_definition_level() > 0) {
RETURN_NOT_OK(def_levels_buffer_.Resize(length * sizeof(int16_t)));
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

ARROW_VERSION="676c32ccea6274c75b2750453c1ddbc5f645c037"
ARROW_VERSION="d946e7917d55cb220becd6469ae93430f2e60764"
ARROW_URL="https://github.com/apache/arrow/archive/${ARROW_VERSION}.tar.gz"
ARROW_BASEDIR="arrow-${ARROW_VERSION}"

Expand Down