wgtmac commented on code in PR #2363:
URL: https://github.com/apache/orc/pull/2363#discussion_r2366275315
##########
.github/workflows/build_and_test.yml:
##########
@@ -114,6 +114,54 @@ jobs:
run: |
cat /home/runner/work/orc/orc/build/java/rat.txt
+ windows:
+ name: "C++ ${{ matrix.simd }} Test on Windows"
+ runs-on: windows-2025
+ strategy:
+ fail-fast: false
+ matrix:
+ simd:
+ - General
+ - AVX512
+ env:
+ ORC_USER_SIMD_LEVEL: AVX512
+ VCPKG_ROOT: C:/vcpkg
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Add msbuild to PATH
+ uses: microsoft/[email protected]
+ with:
+ msbuild-architecture: x64
+ - name: Install Install dependencies via vcpkg
+ shell: cmd
+ run: |
+ vcpkg install zlib:x64-windows
+ vcpkg install protobuf:x64-windows
+ vcpkg install snappy:x64-windows
+ vcpkg install zstd:x64-windows
+ vcpkg install lz4:x64-windows
+ - name: "Build and Test"
+ shell: bash
+ run: |
+ mkdir build
+ cd build
+ cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE
-DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DANALYZE_JAVA=OFF
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
-DProtobuf_ROOT="$VCPKG_ROOT/installed/x64-windows"
-DCMAKE_PREFIX_PATH="$VCPKG_ROOT/installed/x64-windows" -DORC_PACKAGE_KIND=vcpkg
Review Comment:
This line is too long. Can we break it into multiple lines?
##########
cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -214,6 +214,8 @@ if (ORC_PACKAGE_KIND STREQUAL "conan")
list (APPEND ORC_SYSTEM_DEPENDENCIES ZLIB)
list (APPEND ORC_INSTALL_INTERFACE_TARGETS "$<INSTALL_INTERFACE:ZLIB::ZLIB>")
elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg")
+
Review Comment:
```suggestion
```
##########
.github/workflows/build_and_test.yml:
##########
@@ -114,6 +114,54 @@ jobs:
run: |
cat /home/runner/work/orc/orc/build/java/rat.txt
+ windows:
+ name: "C++ ${{ matrix.simd }} Test on Windows"
+ runs-on: windows-2025
+ strategy:
+ fail-fast: false
+ matrix:
+ simd:
+ - General
+ - AVX512
+ env:
+ ORC_USER_SIMD_LEVEL: AVX512
+ VCPKG_ROOT: C:/vcpkg
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Add msbuild to PATH
+ uses: microsoft/[email protected]
+ with:
+ msbuild-architecture: x64
+ - name: Install Install dependencies via vcpkg
+ shell: cmd
+ run: |
+ vcpkg install zlib:x64-windows
+ vcpkg install protobuf:x64-windows
+ vcpkg install snappy:x64-windows
+ vcpkg install zstd:x64-windows
+ vcpkg install lz4:x64-windows
+ - name: "Build and Test"
+ shell: bash
+ run: |
+ mkdir build
+ cd build
+ cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE
-DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DANALYZE_JAVA=OFF
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
-DProtobuf_ROOT="$VCPKG_ROOT/installed/x64-windows"
-DCMAKE_PREFIX_PATH="$VCPKG_ROOT/installed/x64-windows" -DORC_PACKAGE_KIND=vcpkg
+ cmake --build . --config Debug
+ if [ $? -ne 0 ]; then
+ echo "Build failed"
+ ls -la
+ exit 1
+ fi
+ ctest -C Debug --output-on-failure
Review Comment:
ditto
##########
c++/test/TestTimezone.cc:
##########
@@ -344,7 +344,9 @@ namespace orc {
EXPECT_EQ("PDT", getVariantFromZone(*la, "2100-03-14 10:00:00"));
}
- TEST(TestTimezone, testZoneCache) {
+ // FIXME: Temporarily disable the test due to the failure on CI system
+ //
https://issues.apache.org/jira/projects/ORC/issues/ORC-1976?filter=allopenissues
Review Comment:
```suggestion
// https://issues.apache.org/jira/projects/ORC/issues/ORC-1976
```
##########
.github/workflows/build_and_test.yml:
##########
@@ -114,6 +114,54 @@ jobs:
run: |
cat /home/runner/work/orc/orc/build/java/rat.txt
+ windows:
+ name: "C++ ${{ matrix.simd }} Test on Windows"
+ runs-on: windows-2025
+ strategy:
+ fail-fast: false
+ matrix:
+ simd:
+ - General
+ - AVX512
+ env:
+ ORC_USER_SIMD_LEVEL: AVX512
+ VCPKG_ROOT: C:/vcpkg
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Add msbuild to PATH
+ uses: microsoft/[email protected]
+ with:
+ msbuild-architecture: x64
+ - name: Install Install dependencies via vcpkg
+ shell: cmd
+ run: |
+ vcpkg install zlib:x64-windows
+ vcpkg install protobuf:x64-windows
+ vcpkg install snappy:x64-windows
+ vcpkg install zstd:x64-windows
+ vcpkg install lz4:x64-windows
+ - name: "Build and Test"
+ shell: bash
+ run: |
+ mkdir build
+ cd build
+ cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE
-DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DANALYZE_JAVA=OFF
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
-DProtobuf_ROOT="$VCPKG_ROOT/installed/x64-windows"
-DCMAKE_PREFIX_PATH="$VCPKG_ROOT/installed/x64-windows" -DORC_PACKAGE_KIND=vcpkg
+ cmake --build . --config Debug
+ if [ $? -ne 0 ]; then
+ echo "Build failed"
+ ls -la
Review Comment:
Why do we need this?
##########
c++/test/TestWriter.cc:
##########
@@ -619,7 +619,9 @@ namespace orc {
}
}
- TEST_P(WriterTest, writeTimestamp) {
+ // FIXME: Temporarily disable the test due to the failure on CI system
+ //
https://issues.apache.org/jira/projects/ORC/issues/ORC-1976?filter=allopenissues
Review Comment:
ditto, same for below
##########
.github/workflows/build_and_test.yml:
##########
@@ -254,4 +302,4 @@ jobs:
run: |
meson setup build -Dbuildtype=release
meson compile -C build
- meson test -C build
+ meson test -C build
Review Comment:
Can you please revert this line?
##########
cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -531,6 +533,15 @@ elseif (NOT "${PROTOBUF_HOME}" STREQUAL "")
list (APPEND ORC_SYSTEM_DEPENDENCIES Protobuf)
list (APPEND ORC_INSTALL_INTERFACE_TARGETS
"$<INSTALL_INTERFACE:protobuf::libprotobuf>")
orc_provide_find_module (Protobuf)
+elseif (ORC_PACKAGE_KIND STREQUAL "vcpkg")
Review Comment:
Will this branch ever be hit? It has the same branch at line 511.
##########
.github/workflows/build_and_test.yml:
##########
@@ -114,6 +114,54 @@ jobs:
run: |
cat /home/runner/work/orc/orc/build/java/rat.txt
+ windows:
+ name: "C++ ${{ matrix.simd }} Test on Windows"
+ runs-on: windows-2025
+ strategy:
+ fail-fast: false
+ matrix:
+ simd:
+ - General
+ - AVX512
+ env:
+ ORC_USER_SIMD_LEVEL: AVX512
+ VCPKG_ROOT: C:/vcpkg
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Add msbuild to PATH
+ uses: microsoft/[email protected]
+ with:
+ msbuild-architecture: x64
+ - name: Install Install dependencies via vcpkg
+ shell: cmd
+ run: |
+ vcpkg install zlib:x64-windows
+ vcpkg install protobuf:x64-windows
+ vcpkg install snappy:x64-windows
+ vcpkg install zstd:x64-windows
+ vcpkg install lz4:x64-windows
+ - name: "Build and Test"
+ shell: bash
+ run: |
+ mkdir build
+ cd build
+ cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=RELEASE
-DBUILD_LIBHDFSPP=OFF -DBUILD_TOOLS=OFF -DBUILD_JAVA=OFF -DANALYZE_JAVA=OFF
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
-DProtobuf_ROOT="$VCPKG_ROOT/installed/x64-windows"
-DCMAKE_PREFIX_PATH="$VCPKG_ROOT/installed/x64-windows" -DORC_PACKAGE_KIND=vcpkg
+ cmake --build . --config Debug
Review Comment:
Can we be consistent with `-DCMAKE_BUILD_TYPE=RELEASE`?
##########
c++/test/TestTimezone.cc:
##########
@@ -344,7 +344,9 @@ namespace orc {
EXPECT_EQ("PDT", getVariantFromZone(*la, "2100-03-14 10:00:00"));
}
- TEST(TestTimezone, testZoneCache) {
+ // FIXME: Temporarily disable the test due to the failure on CI system
Review Comment:
```suggestion
// FIXME: Temporarily disable the test to make Windows CI happy
```
##########
c++/test/TestTimezone.cc:
##########
@@ -442,7 +444,9 @@ namespace orc {
}
}
- TEST(TestTimezone, testTzdbFromCondaEnv) {
+ // FIXME: Temporarily disable the test due to the failure on CI system
+ //
https://issues.apache.org/jira/projects/ORC/issues/ORC-1976?filter=allopenissues
Review Comment:
```suggestion
// https://issues.apache.org/jira/projects/ORC/issues/ORC-1976
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
