diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9aefefd5..9ff59aab 100644 --- a/.devcontainer/Dockerfile +++ b/.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 \ diff --git a/.dockerignore b/.dockerignore index 32b31635..7d0de582 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ ** !vcpkg.json -!ports -!*/*.csproj +!*/*.csproj \ No newline at end of file diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 3fc513a9..3d2c816e 100644 --- a/.github/workflows/devcontainer.yml +++ b/.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" diff --git a/csharp.test/Encryption/TestEncryptionRoundTrip.cs b/csharp.test/Encryption/TestEncryptionRoundTrip.cs index 9401c4c0..05fe31dd 100644 --- a/csharp.test/Encryption/TestEncryptionRoundTrip.cs +++ b/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] diff --git a/csharp.test/TestPhysicalTypeRoundtrip.cs b/csharp.test/TestPhysicalTypeRoundtrip.cs index a0af5e35..d6fcb929 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 15.0.2", fileMetaData.CreatedBy); + Assert.AreEqual("parquet-cpp-arrow version 16.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 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; diff --git a/csharp.test/TestWriterProperties.cs b/csharp.test/TestWriterProperties.cs index 53307d28..2a7fde8d 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 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); diff --git a/csharp/ParquetSharp.csproj b/csharp/ParquetSharp.csproj index acdd6e19..a486ae18 100644 --- a/csharp/ParquetSharp.csproj +++ b/csharp/ParquetSharp.csproj @@ -12,7 +12,7 @@ true true 1591; - 15.0.2.1 + 16.1.0-beta1 G-Research G-Research ParquetSharp diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake deleted file mode 100644 index 9635eb5c..00000000 --- a/ports/re2/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/re2 - REF "${VERSION}" - SHA512 b033bb38020947cce49f7fa27c711a49bd147a0286993852ed7fea6f653af5b2f48b8de9dae324596e44a1731e8747382a4151f6f5d44b1d92ce2748b83ca85c - HEAD_REF master - PATCHES - remove_include_dir.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DRE2_BUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_fixup_pkgconfig() - -vcpkg_copy_pdbs() - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/re2/remove_include_dir.patch b/ports/re2/remove_include_dir.patch deleted file mode 100644 index b8ede990..00000000 --- a/ports/re2/remove_include_dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/re2Config.cmake.in b/re2Config.cmake.in -index 6a177c6..be7b6bc 100644 ---- a/re2Config.cmake.in -+++ b/re2Config.cmake.in -@@ -6,8 +6,6 @@ - - include(CMakeFindDependencyMacro) - --set_and_check(re2_INCLUDE_DIR ${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@) -- - if(UNIX) - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_dependency(Threads REQUIRED) diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json deleted file mode 100644 index 0e93b876..00000000 --- a/ports/re2/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "re2", - "version-date": "2023-07-01", - "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", - "homepage": "https://github.com/google/re2", - "license": "BSD-3-Clause", - "dependencies": [ - "abseil", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/vcpkg.json b/vcpkg.json index ac81c5d7..90cf4578 100644 --- a/vcpkg.json +++ b/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"] - } + ] }