Skip to content

Update to Arrow-5.0.0 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GPSnoopy merged 7 commits into from
Sep 2, 2021
Merged

Update to Arrow-5.0.0 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e96676
Update to Arrow-5.0.0
GPSnoopy Jul 30, 2021
02cc0c1
Review enums.
GPSnoopy Jul 30, 2021
0afef63
Fix unit tests (schema version).
GPSnoopy Jul 30, 2021
3e8a5f0
Point to arrow-5.0.0 PR merge on vcpkg master
GPSnoopy Aug 9, 2021
63a6302
Bump version to 5.0.0-beta1
GPSnoopy Aug 25, 2021
ba7d8c2
Merge branch 'master' into Arrow-5.0.0
GPSnoopy Aug 25, 2021
ce42f6c
Fix format error
GPSnoopy Aug 25, 2021
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
4 changes: 2 additions & 2 deletions cpp/BufferOutputStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern "C"
TRYCATCH
(
PARQUET_ASSIGN_OR_THROW(
std::shared_ptr<arrow::io::BufferOutputStream> output,
const std::shared_ptr<arrow::io::BufferOutputStream> output,
arrow::io::BufferOutputStream::Create(1024, arrow::default_memory_pool()));

*output_stream = new std::shared_ptr<arrow::io::BufferOutputStream>(output);
Expand All @@ -29,7 +29,7 @@ extern "C"
TRYCATCH
(
PARQUET_ASSIGN_OR_THROW(
std::shared_ptr<arrow::Buffer> buf,
const std::shared_ptr<arrow::Buffer> buf,
(*output_stream)->Finish());

*buffer = new std::shared_ptr<arrow::Buffer>(buf);
Expand Down
2 changes: 1 addition & 1 deletion cpp/ColumnChunkMetaData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ extern "C"
TRYCATCH
(
const auto s = column_chunk_meta_data->statistics();
*statistics = s ? new std::shared_ptr<Statistics>(s) : nullptr;
*statistics = s ? new std::shared_ptr(s) : nullptr;
)
}

Expand Down
2 changes: 1 addition & 1 deletion cpp/ColumnDecryptionProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern "C"
{
PARQUETSHARP_EXPORT ExceptionInfo* ColumnDecryptionProperties_Deep_Clone(const std::shared_ptr<ColumnDecryptionProperties>* properties, std::shared_ptr<ColumnDecryptionProperties>** clone)
{
TRYCATCH(*clone = new std::shared_ptr<ColumnDecryptionProperties>((*properties)->DeepClone());)
TRYCATCH(*clone = new std::shared_ptr((*properties)->DeepClone());)
}

PARQUETSHARP_EXPORT void ColumnDecryptionProperties_Free(const std::shared_ptr<const ColumnDecryptionProperties>* properties)
Expand Down
2 changes: 1 addition & 1 deletion cpp/ColumnEncryptionProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern "C"
{
PARQUETSHARP_EXPORT ExceptionInfo* ColumnEncryptionProperties_Deep_Clone(const std::shared_ptr<ColumnEncryptionProperties>* properties, std::shared_ptr<ColumnEncryptionProperties>** clone)
{
TRYCATCH(*clone = new std::shared_ptr<ColumnEncryptionProperties>((*properties)->DeepClone());)
TRYCATCH(*clone = new std::shared_ptr((*properties)->DeepClone());)
}

PARQUETSHARP_EXPORT void ColumnEncryptionProperties_Free(const std::shared_ptr<const ColumnEncryptionProperties>* properties)
Expand Down
2 changes: 1 addition & 1 deletion cpp/ColumnEncryptionPropertiesBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* ColumnEncryptionPropertiesBuilder_Build(ColumnEncryptionProperties::Builder* builder, std::shared_ptr<ColumnEncryptionProperties>** properties)
{
TRYCATCH(*properties = new std::shared_ptr<ColumnEncryptionProperties>(builder->build());)
TRYCATCH(*properties = new std::shared_ptr(builder->build());)
}
}
2 changes: 1 addition & 1 deletion cpp/ColumnPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extern "C"

for (size_t i = 0; i != v.size(); ++i)
{
strings[i] = AllocateCString(AllocateCString(v[i]));
strings[i] = AllocateCString(v[i]);
}

*dot_vector = strings;
Expand Down
2 changes: 2 additions & 0 deletions cpp/Enums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace
static_assert(Compression::LZ4_FRAME == 6);
static_assert(Compression::LZO == 7);
static_assert(Compression::BZ2 == 8);
static_assert(Compression::LZ4_HADOOP == 9);

static_assert(Encoding::PLAIN == 0);
static_assert(Encoding::PLAIN_DICTIONARY == 2);
Expand Down Expand Up @@ -71,6 +72,7 @@ namespace
static_assert(Repetition::REQUIRED == 0);
static_assert(Repetition::OPTIONAL == 1);
static_assert(Repetition::REPEATED == 2);
static_assert(Repetition::UNDEFINED == 3);
Copy link
Member

@jgiannuzzi jgiannuzzi Sep 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whilst we're at it, we should add Encoding::UNKNOWN with value 999.
See https://github.com/apache/arrow/blob/apache-arrow-5.0.0/cpp/src/parquet/types.h#L478

Copy link
Contributor Author

@GPSnoopy GPSnoopy Sep 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left it out since we currently do not expose Encoding.Unknown in C#. Thus no risk of ABI breaks here.

Also, a bit of a WTF here. What's the difference from Arrow's point of view between Encoding::UNDEFINED and Encoding::UNKNOWN ?

Copy link
Member

@jgiannuzzi jgiannuzzi Sep 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I get your point about ABI breaks. Why do we start exposing Repetition.Undefined in C# now though?

Also, no idea about the difference between Encoding::UNDEFINED and Encoding::UNKNOWN either. It sounds as WTF to me as to you 🤔


static_assert(SortOrder::SIGNED == 0);
static_assert(SortOrder::UNSIGNED == 1);
Expand Down
2 changes: 1 addition & 1 deletion cpp/FileDecryptionProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C"
{
PARQUETSHARP_EXPORT ExceptionInfo* FileDecryptionProperties_Deep_Clone(const std::shared_ptr<FileDecryptionProperties>* properties, std::shared_ptr<FileDecryptionProperties>** clone)
{
TRYCATCH(*clone = new std::shared_ptr<FileDecryptionProperties>((*properties)->DeepClone());)
TRYCATCH(*clone = new std::shared_ptr((*properties)->DeepClone());)
}

PARQUETSHARP_EXPORT void FileDecryptionProperties_Free(const std::shared_ptr<const FileDecryptionProperties>* properties)
Expand Down
2 changes: 1 addition & 1 deletion cpp/FileEncryptionProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern "C"
{
PARQUETSHARP_EXPORT ExceptionInfo* FileEncryptionProperties_Deep_Clone(const std::shared_ptr<FileEncryptionProperties>* properties, std::shared_ptr<FileEncryptionProperties>** clone)
{
TRYCATCH(*clone = new std::shared_ptr<FileEncryptionProperties>((*properties)->DeepClone());)
TRYCATCH(*clone = new std::shared_ptr((*properties)->DeepClone());)
}

PARQUETSHARP_EXPORT void FileEncryptionProperties_Free(const std::shared_ptr<const FileEncryptionProperties>* properties)
Expand Down
2 changes: 1 addition & 1 deletion cpp/FileEncryptionPropertiesBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* FileEncryptionPropertiesBuilder_Build(FileEncryptionProperties::Builder* builder, std::shared_ptr<FileEncryptionProperties>** properties)
{
TRYCATCH(*properties = new std::shared_ptr<FileEncryptionProperties>(builder->build());)
TRYCATCH(*properties = new std::shared_ptr(builder->build());)
}
}
2 changes: 1 addition & 1 deletion cpp/FileMetaData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extern "C"
TRYCATCH
(
const auto m = (*file_meta_data)->key_value_metadata();
*key_value_metadata = m ? new std::shared_ptr<const KeyValueMetadata>(m) : nullptr;
*key_value_metadata = m ? new std::shared_ptr(m) : nullptr;
)
}

Expand Down
4 changes: 2 additions & 2 deletions cpp/GroupNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ extern "C"
nodes.push_back(*fields[i]);
}

*groupNode = new std::shared_ptr<schema::Node>(schema::GroupNode::Make(name, repetition, nodes, logical_type == nullptr ? nullptr : *logical_type));
*groupNode = new std::shared_ptr(schema::GroupNode::Make(name, repetition, nodes, logical_type == nullptr ? nullptr : *logical_type));
)
}

PARQUETSHARP_EXPORT ExceptionInfo* GroupNode_Field(const std::shared_ptr<schema::GroupNode>* group_node, int i, std::shared_ptr<schema::Node>** field)
{
TRYCATCH(*field = new std::shared_ptr<schema::Node>((*group_node)->field(i));)
TRYCATCH(*field = new std::shared_ptr((*group_node)->field(i));)
}

PARQUETSHARP_EXPORT ExceptionInfo* GroupNode_Field_Count(const std::shared_ptr<schema::GroupNode>* group_node, int* field_count)
Expand Down
2 changes: 1 addition & 1 deletion cpp/KeyValueMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using namespace parquet;

extern "C"
{
PARQUETSHARP_EXPORT ExceptionInfo* KeyValueMetadata_Make(int64_t size, const char** keys, const char** values, std::shared_ptr<const KeyValueMetadata>** key_value_metadata)
PARQUETSHARP_EXPORT ExceptionInfo* KeyValueMetadata_Make(const int64_t size, const char** keys, const char** values, std::shared_ptr<const KeyValueMetadata>** key_value_metadata)
{
TRYCATCH
(
Expand Down
30 changes: 15 additions & 15 deletions cpp/LogicalType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,77 +38,77 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_String(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::String());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::String());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Map(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Map());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Map());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_List(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::List());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::List());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Enum(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Enum());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Enum());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Decimal(const int32_t precision, const int32_t scale, const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Decimal(precision, scale));)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Decimal(precision, scale));)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Date(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Date());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Date());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Time(const bool is_adjusted_to_utc, const LogicalType::TimeUnit::unit time_unit, const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Time(is_adjusted_to_utc, time_unit));)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Time(is_adjusted_to_utc, time_unit));)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Timestamp(const bool is_adjusted_to_utc, const LogicalType::TimeUnit::unit time_unit, const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Timestamp(is_adjusted_to_utc, time_unit));)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Timestamp(is_adjusted_to_utc, time_unit));)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Interval(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Interval());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Interval());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Int(const int32_t bit_width, const bool is_signed, const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Int(bit_width, is_signed));)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Int(bit_width, is_signed));)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_Null(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::Null());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::Null());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_JSON(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::JSON());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::JSON());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_BSON(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::BSON());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::BSON());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_UUID(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::UUID());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::UUID());)
}

PARQUETSHARP_EXPORT ExceptionInfo* LogicalType_None(const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>(LogicalType::None());)
TRYCATCH(*logical_type = new std::shared_ptr(LogicalType::None());)
}

// Typed properties
Expand Down
2 changes: 1 addition & 1 deletion cpp/Node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* Node_Logical_Type(const std::shared_ptr<const schema::Node>* node, const std::shared_ptr<const LogicalType>** logical_type)
{
TRYCATCH(*logical_type = new std::shared_ptr<const LogicalType>((*node)->logical_type());)
TRYCATCH(*logical_type = new std::shared_ptr((*node)->logical_type());)
}

PARQUETSHARP_EXPORT ExceptionInfo* Node_Name(const std::shared_ptr<const schema::Node>* node, const char** name)
Expand Down
1 change: 0 additions & 1 deletion cpp/OutputStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include "cpp/ParquetSharpExport.h"
#include "ExceptionInfo.h"

#include <arrow/io/interfaces.h>

Expand Down
4 changes: 2 additions & 2 deletions cpp/ParquetFileReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* ParquetFileReader_MetaData(const ParquetFileReader* reader, std::shared_ptr<FileMetaData>** fileMetaData)
{
TRYCATCH(*fileMetaData = new std::shared_ptr<FileMetaData>(reader->metadata());)
TRYCATCH(*fileMetaData = new std::shared_ptr(reader->metadata());)
}

PARQUETSHARP_EXPORT ExceptionInfo* ParquetFileReader_RowGroup(ParquetFileReader* reader, int i, std::shared_ptr<RowGroupReader>** rowGroupReader)
{
TRYCATCH(*rowGroupReader = new std::shared_ptr<RowGroupReader>(reader->RowGroup(i));)
TRYCATCH(*rowGroupReader = new std::shared_ptr(reader->RowGroup(i));)
}
}
8 changes: 4 additions & 4 deletions cpp/ParquetFileWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* ParquetFileWriter_Properties(ParquetFileWriter* writer, const std::shared_ptr<WriterProperties>** properties)
{
TRYCATCH(*properties = new std::shared_ptr<WriterProperties>(writer->properties());)
TRYCATCH(*properties = new std::shared_ptr(writer->properties());)
}

PARQUETSHARP_EXPORT ExceptionInfo* ParquetFileWriter_Schema(ParquetFileWriter* writer, const SchemaDescriptor** schema)
Expand All @@ -90,8 +90,8 @@ extern "C"
{
TRYCATCH
(
const auto m = writer->key_value_metadata();
*key_value_metadata = m ? new std::shared_ptr<const KeyValueMetadata>(m) : nullptr;
const auto& m = writer->key_value_metadata();
*key_value_metadata = m ? new std::shared_ptr(m) : nullptr;
)
}

Expand All @@ -100,7 +100,7 @@ extern "C"
TRYCATCH
(
const auto m = writer->metadata();
*metadata = m ? new std::shared_ptr<FileMetaData>(m) : nullptr;
*metadata = m ? new std::shared_ptr(m) : nullptr;
)
}
}
1 change: 0 additions & 1 deletion cpp/RandomAccessFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include "cpp/ParquetSharpExport.h"
#include "ExceptionInfo.h"

#include <arrow/io/interfaces.h>

Expand Down
5 changes: 2 additions & 3 deletions cpp/ReaderProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include "cpp/ParquetSharpExport.h"
#include "CString.h"
#include "ExceptionInfo.h"

#include <parquet/properties.h>
Expand Down Expand Up @@ -53,8 +52,8 @@ extern "C"
{
TRYCATCH
(
const auto p = reader_properties->file_decryption_properties();
*file_decryption_properties = p ? new std::shared_ptr<FileDecryptionProperties>(p) : nullptr;
const auto& p = reader_properties->file_decryption_properties();
*file_decryption_properties = p ? new std::shared_ptr(p) : nullptr;
)
}
}
2 changes: 1 addition & 1 deletion cpp/RowGroupReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* RowGroupReader_Column(const std::shared_ptr<RowGroupReader>* row_group_reader, int i, std::shared_ptr<ColumnReader>** column_reader)
{
TRYCATCH(*column_reader = new std::shared_ptr<ColumnReader>((*row_group_reader)->Column(i));)
TRYCATCH(*column_reader = new std::shared_ptr((*row_group_reader)->Column(i));)
}

PARQUETSHARP_EXPORT ExceptionInfo* RowGroupReader_Metadata(const std::shared_ptr<RowGroupReader>* row_group_reader, const RowGroupMetaData** row_group_meta_data)
Expand Down
2 changes: 1 addition & 1 deletion cpp/WriterPropertiesBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern "C"

PARQUETSHARP_EXPORT ExceptionInfo* WriterPropertiesBuilder_Build(WriterProperties::Builder* builder, const std::shared_ptr<WriterProperties>** writerProperties)
{
TRYCATCH(*writerProperties = new std::shared_ptr<WriterProperties>(builder->build()););
TRYCATCH(*writerProperties = new std::shared_ptr(builder->build());)
}

// Dictonary enable/disable
Expand Down
4 changes: 2 additions & 2 deletions csharp.test/TestPhysicalTypeRoundtrip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ private static void AssertReadRoundtrip(ResizableBuffer buffer, ExpectedColumn[]

var numRows = expectedColumns.First().Values.Length;

Assert.AreEqual("parquet-cpp-arrow version 4.0.0", fileMetaData.CreatedBy);
Assert.AreEqual("parquet-cpp-arrow version 5.0.0", fileMetaData.CreatedBy);
Assert.AreEqual(new Dictionary<string, string> {{"case", "Test"}, {"Awesome", "true"}}, fileMetaData.KeyValueMetadata);
Assert.AreEqual(expectedColumns.Length, fileMetaData.NumColumns);
Assert.AreEqual(numRows, fileMetaData.NumRows);
Assert.AreEqual(1, fileMetaData.NumRowGroups);
Assert.AreEqual(1 + expectedColumns.Length, fileMetaData.NumSchemaElements);
Assert.AreEqual(ParquetVersion.PARQUET_1_0, fileMetaData.Version);
Assert.AreEqual("parquet-cpp-arrow version 4.0.0", fileMetaData.WriterVersion.ToString());
Assert.AreEqual("parquet-cpp-arrow version 5.0.0", fileMetaData.WriterVersion.ToString());

using var rowGroupReader = fileReader.RowGroup(0);
var rowGroupMetaData = rowGroupReader.MetaData;
Expand Down
2 changes: 1 addition & 1 deletion csharp.test/TestWriterProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static void TestDefaultProperties()
{
var p = WriterProperties.GetDefaultWriterProperties();

Assert.AreEqual("parquet-cpp-arrow version 4.0.0", p.CreatedBy);
Assert.AreEqual("parquet-cpp-arrow version 5.0.0", p.CreatedBy);
Assert.AreEqual(Compression.Uncompressed, p.Compression(new ColumnPath("anypath")));
Assert.AreEqual(int.MinValue, p.CompressionLevel(new ColumnPath("anypath")));
Assert.AreEqual(1024 * 1024, p.DataPageSize);
Expand Down
3 changes: 2 additions & 1 deletion csharp/Compression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public enum Compression
Lz4 = 5,
Lz4Frame = 6,
Lzo = 7,
Bz2 = 8
Bz2 = 8,
Lz4Hadoop = 9
}
}
2 changes: 1 addition & 1 deletion csharp/ParquetSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591;</NoWarn>
<Version>4.0.0</Version>
<Version>5.0.0-beta1</Version>
<Company>G-Research</Company>
<Authors>G-Research</Authors>
<Product>ParquetSharp</Product>
Expand Down
3 changes: 2 additions & 1 deletion csharp/Repetition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum Repetition
{
Required = 0,
Optional = 1,
Repeated = 2
Repeated = 2,
Undefined = 3
}
}
2 changes: 1 addition & 1 deletion vcpkg_version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/microsoft/vcpkg.git 4dc864e2401f2ed3230c9042a4dd56f6d1c30360
https://github.com/microsoft/vcpkg.git ba69c09fab296d975ee4f578d070f9c67da21dd5