Upgrade C++ Arrow to 16.1.0

.devcontainer/Dockerfile

@@ -45,9 +45,8 @@ FROM cpp AS vcpkg
 
 USER vscode
 
-# Copy our vcpkg manifest and ports
+# Copy our vcpkg manifest
 COPY --chown=vscode:vscode vcpkg.json /tmp/build/
-COPY --chown=vscode:vscode ports /tmp/build/ports
 
 # Install vcpkg
 RUN sudo mkdir -p $VCPKG_ROOT \

.dockerignore

@@ -1,4 +1,3 @@
 **
 !vcpkg.json
-!ports
-!*/*.csproj
+!*/*.csproj

.github/workflows/devcontainer.yml

@@ -9,7 +9,6 @@ on:
       - "vcpkg.json"
       - "*/*.csproj"
       - ".github/workflows/devcontainer.yml"
-      - "ports/**"
   pull_request:
     branches: [master]
     paths:
@@ -18,7 +17,6 @@ on:
       - "vcpkg.json"
       - "*/*.csproj"
       - ".github/workflows/devcontainer.yml"
-      - "ports/**"
   # Run once a week
   schedule:
     - cron: "34 2 * * 2"

csharp.test/Encryption/TestEncryptionRoundTrip.cs

@@ -177,7 +177,9 @@ public static void TestSingleWrapping()
             // 1 for footer and 1 for each column, even though they use the same master key,
             // as each data key needs to be encrypted separately by the master key rather than use a KEK.
             Assert.That(testClient.WrappedKeys.Count, Is.EqualTo(3));
-            Assert.That(testClient.UnwrappedKeys.Count, Is.EqualTo(3));
+            // Column keys were previously cached and so would only be unwrapped once per column,
+            // but as of Arrow 16 this is no longer true and the unwrap count may be more.
+            Assert.That(testClient.UnwrappedKeys.Count, Is.GreaterThanOrEqualTo(3));
         }
 
         [Test]

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 15.0.2", fileMetaData.CreatedBy);
+            Assert.AreEqual("parquet-cpp-arrow version 16.1.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);
@@ -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.2", fileMetaData.WriterVersion.ToString());
+            Assert.AreEqual("parquet-cpp-arrow version 16.1.0", fileMetaData.WriterVersion.ToString());
 
             using var rowGroupReader = fileReader.RowGroup(0);
             var rowGroupMetaData = rowGroupReader.MetaData;

csharp.test/TestWriterProperties.cs

@@ -14,7 +14,7 @@ public static void TestDefaultProperties()
         {
             var p = WriterProperties.GetDefaultWriterProperties();
 
-            Assert.AreEqual("parquet-cpp-arrow version 15.0.2", p.CreatedBy);
+            Assert.AreEqual("parquet-cpp-arrow version 16.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);

csharp/ParquetSharp.csproj

@@ -12,7 +12,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591;</NoWarn>
-    <VersionPrefix>15.0.2.1</VersionPrefix>
+    <VersionPrefix>16.1.0-beta1</VersionPrefix>
     <Company>G-Research</Company>
     <Authors>G-Research</Authors>
     <Product>ParquetSharp</Product>

vcpkg.json

@@ -2,17 +2,14 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "parquetsharp",
   "version-string": "undefined",
-  "builtin-baseline": "eacb83982dd1d74950f36c3fbb6389d4a1c38982",
+  "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625",
   "dependencies": [
     "arrow"
   ],
   "overrides": [
     {
       "name": "arrow",
-      "version": "15.0.2"
+      "version": "16.1.0#1"
     }
-  ],
-  "vcpkg-configuration": {
-    "overlay-ports": ["./ports"]
-  }
+  ]
 }