From 970c7d5b4ef9ce620f9222f36e61b855cf95325b Mon Sep 17 00:00:00 2001 From: Juan Escalada Date: Tue, 14 Jan 2025 15:36:06 +0900 Subject: [PATCH 1/2] Bump parquet-cpp-arrow to 18.1.0 Signed-off-by: Juan Escalada --- README.md | 2 +- csharp.test/TestPhysicalTypeRoundtrip.cs | 4 ++-- csharp.test/TestWriterProperties.cs | 2 +- csharp/ParquetSharp.csproj | 2 +- vcpkg.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 94e3cb81..493fe584 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,7 @@ devcontainer exec dotnet test csharp.test Building ParquetSharp natively requires the following dependencies: - A modern C++ compiler toolchain - .NET SDK 8.0 -- Apache Arrow (15.0.2) +- Apache Arrow (18.1.0) 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. diff --git a/csharp.test/TestPhysicalTypeRoundtrip.cs b/csharp.test/TestPhysicalTypeRoundtrip.cs index 645327d2..4b8be3a7 100644 --- a/csharp.test/TestPhysicalTypeRoundtrip.cs +++ b/csharp.test/TestPhysicalTypeRoundtrip.cs @@ -163,7 +163,7 @@ private static void AssertReadRoundtrip(ResizableBuffer buffer, ExpectedColumn[] var numRows = expectedColumns.First().Values.Length; - Assert.AreEqual("parquet-cpp-arrow version 17.0.0", fileMetaData.CreatedBy); + Assert.AreEqual("parquet-cpp-arrow version 18.1.0", fileMetaData.CreatedBy); Assert.AreEqual(new Dictionary {{"case", "Test"}, {"Awesome", "true"}}, fileMetaData.KeyValueMetadata); Assert.AreEqual(expectedColumns.Length, fileMetaData.NumColumns); Assert.AreEqual(numRows, fileMetaData.NumRows); @@ -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 17.0.0", fileMetaData.WriterVersion.ToString()); + Assert.AreEqual("parquet-cpp-arrow version 18.1.0", fileMetaData.WriterVersion.ToString()); using var rowGroupReader = fileReader.RowGroup(0); var rowGroupMetaData = rowGroupReader.MetaData; diff --git a/csharp.test/TestWriterProperties.cs b/csharp.test/TestWriterProperties.cs index cb90cac9..a04379d1 100644 --- a/csharp.test/TestWriterProperties.cs +++ b/csharp.test/TestWriterProperties.cs @@ -14,7 +14,7 @@ public static void TestDefaultProperties() { var p = WriterProperties.GetDefaultWriterProperties(); - Assert.AreEqual("parquet-cpp-arrow version 17.0.0", p.CreatedBy); + Assert.AreEqual("parquet-cpp-arrow version 18.1.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); diff --git a/csharp/ParquetSharp.csproj b/csharp/ParquetSharp.csproj index 51e430bd..a7378316 100644 --- a/csharp/ParquetSharp.csproj +++ b/csharp/ParquetSharp.csproj @@ -12,7 +12,7 @@ true true 1591; - 17.0.0-beta1 + 18.1.0-beta1 G-Research G-Research ParquetSharp diff --git a/vcpkg.json b/vcpkg.json index 8a4a55bf..c30d6d7f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ "overrides": [ { "name": "arrow", - "version": "17.0.0" + "version": "18.1.0" } ] } From 092e03b0ba74194596825e5283e06960a3260a6a Mon Sep 17 00:00:00 2001 From: Juan Escalada <97265671+jescalada@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:56:26 -0800 Subject: [PATCH 2/2] Update builtin-baseline to latest release commit --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index c30d6d7f..6bb9d2fb 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "parquetsharp", "version-string": "undefined", - "builtin-baseline": "e590c2b30c08caf1dd8d612ec602a003f9784b7d", + "builtin-baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836", "dependencies": [ "arrow" ],