Skip to content

Commit

Permalink
Upgrade Arrow C++ version to 15.0.2 (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamreeve authored Mar 20, 2024
1 parent 010bdde commit 2879d32
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ devcontainer exec dotnet test csharp.test
Building ParquetSharp natively requires the following dependencies:
- A modern C++ compiler toolchain
- .NET SDK 7.0
- Apache Arrow (14.0.2)
- Apache Arrow (15.0.2)

For building Arrow (including Parquet) and its dependencies, we recommend using Microsoft's [vcpkg](https://vcpkg.io).
The build scripts will use an existing vcpkg installation if either of the `VCPKG_INSTALLATION_ROOT` or `VCPKG_ROOT` environment variables are defined, otherwise vcpkg will be downloaded into the build directory.
Expand Down
4 changes: 2 additions & 2 deletions csharp.test/TestPhysicalTypeRoundtrip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private static void AssertReadRoundtrip(ResizableBuffer buffer, ExpectedColumn[]

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

Assert.AreEqual("parquet-cpp-arrow version 15.0.0", fileMetaData.CreatedBy);
Assert.AreEqual("parquet-cpp-arrow version 15.0.2", 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);
Expand All @@ -174,7 +174,7 @@ private static void AssertReadRoundtrip(ResizableBuffer buffer, ExpectedColumn[]
// The parquet format only stores an integer file version (1 or 2) and
// 2 gets mapped to the latest 2.x version.
Assert.AreEqual(ParquetVersion.PARQUET_2_6, fileMetaData.Version);
Assert.AreEqual("parquet-cpp-arrow version 15.0.0", fileMetaData.WriterVersion.ToString());
Assert.AreEqual("parquet-cpp-arrow version 15.0.2", 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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static void TestDefaultProperties()
{
var p = WriterProperties.GetDefaultWriterProperties();

Assert.AreEqual("parquet-cpp-arrow version 15.0.0", p.CreatedBy);
Assert.AreEqual("parquet-cpp-arrow version 15.0.2", 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
2 changes: 1 addition & 1 deletion csharp/ParquetSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591;</NoWarn>
<Version>15.0.0-beta3</Version>
<Version>15.0.2-beta1</Version>
<Company>G-Research</Company>
<Authors>G-Research</Authors>
<Product>ParquetSharp</Product>
Expand Down
4 changes: 2 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "parquetsharp",
"version-string": "undefined",
"builtin-baseline": "3b213864579b6fa686e38715508f7cd41a50900f",
"builtin-baseline": "eacb83982dd1d74950f36c3fbb6389d4a1c38982",
"dependencies": [
"arrow"
],
"overrides": [
{
"name": "arrow",
"version": "15.0.0"
"version": "15.0.2"
}
]
}

0 comments on commit 2879d32

Please sign in to comment.