win tests only again + partial revert

Author: sanikolaev

.github/workflows/test.yml

@@ -125,251 +125,6 @@ jobs:
           wget https://repo.manticoresearch.com/repository/ci/boost_1_75_0.tgz
           tar -xf boost_1_75_0.tgz
 
-  build_linux_debug:
-    if: (needs.changes.outputs.source == 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    needs: [changes, check_branch]
-    name: Linux debug build
-    uses: ./.github/workflows/build_template.yml
-    with:
-      CTEST_CONFIGURATION_TYPE: "Debug"
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      artifact_name: debug_build
-      cache_key: build_linux_debug_x86_64
-      cmake_command: |
-        export CMAKE_TOOLCHAIN_FILE=$(pwd)/dist/build_dockers/cross/linux.cmake
-        ctest -VV -S misc/ctest/gltest.cmake --no-compress-output
-
-  test_linux_debug:
-    if: (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    name: Linux debug mode tests
-    needs: [build_linux_debug, check_branch]
-    uses: ./.github/workflows/test_template.yml
-    with:
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      build_artifact_name: debug_build
-      artifact_name: debug_test_results
-      results_name: "Linux debug test results"
-      timeout: 10
-
-  build_linux_release:
-    if: (needs.changes.outputs.source == 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    needs: [changes, check_branch]
-    name: Linux release build
-    uses: ./.github/workflows/build_template.yml
-    with:
-      artifact_name: release_build
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      cache_key: build_linux_release_x86_64
-      cmake_command: |
-        export CMAKE_TOOLCHAIN_FILE=$(pwd)/dist/build_dockers/cross/linux.cmake
-        ctest -VV -S misc/ctest/gltest.cmake --no-compress-output
-
-  test_linux_release:
-    if: (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    name: Linux release mode tests
-    needs: [build_linux_release, check_branch]
-    uses: ./.github/workflows/test_template.yml
-    with:
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      build_artifact_name: release_build
-      artifact_name: release_test_results
-      results_name: "Linux release test results"
-      timeout: 10
-
-
-  pack_jammy_cache_check:
-    needs: changes
-    name: Jammy x86_64 package [check cache]
-    runs-on: ubuntu-22.04
-    outputs:
-      cache-key: ${{ steps.generate-key.outputs.cache-key }}
-      cache-hit: ${{ steps.cache.outputs.cache-hit }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Generate cache key
-        id: generate-key
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            branch=${{ github.head_ref }}
-          else
-            branch=$(git rev-parse --abbrev-ref HEAD)
-          fi
-          cache_key="jammy-build-${branch}"
-          echo "cache-key=${cache_key}" >> $GITHUB_OUTPUT
-
-      - name: Set up cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: build
-          key: ${{ steps.generate-key.outputs.cache-key }}
-
-      - name: Override cache hit
-        id: override-cache-hit
-        run: |
-          if [ "${{ needs.changes.outputs.source }}" == "true" ]; then
-            echo "cache-hit=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Upload build artifacts from cache
-        if: ${{ steps.override-cache-hit.outputs.cache-hit == 'true' }}
-        uses: manticoresoftware/upload_artifact_with_retries@v4
-        with:
-          name: build_jammy_RelWithDebInfo_x86_64
-          path: "build/manticore*deb"
-
-  pack_jammy:
-    needs: [pack_jammy_cache_check, changes, check_branch]
-    if: |
-      needs.pack_jammy_cache_check.outputs.cache-hit != 'true' ||
-      needs.changes.outputs.source == 'true'
-    name: Jammy x86_64 package [build]
-    uses: ./.github/workflows/build_template.yml
-    with:
-      DISTR: jammy
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      arch: x86_64
-      cmake_command: |
-        mkdir build
-        cd build
-        cmake -DPACK=1 ..
-        export CMAKE_TOOLCHAIN_FILE=$(pwd)/dist/build_dockers/cross/linux.cmake
-        cmake --build . --target package
-      cache_key: pack_jammy_x86_64
-      artifact_list: "build/manticore*deb"
-
-  pack_jammy_cache_update:
-    if: (needs.pack_jammy_cache_check.outputs.cache-hit != 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    name: Jammy x86_64 package [update cache]
-    needs: [pack_jammy, pack_jammy_cache_check]
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository # We have to checkout to access .github/workflows/ in further steps
-        uses: actions/checkout@v3
-
-      - name: Download built x86_64 Ubuntu Jammy packages
-        uses: manticoresoftware/download_artifact_with_retries@v3
-        continue-on-error: true
-        with:
-          name: build_jammy_RelWithDebInfo_x86_64
-          path: .
-
-      - name: Save cache
-        uses: actions/cache@v4
-        with:
-          path: build
-          key: ${{ needs.pack_jammy_cache_check.outputs.cache-key }}
-
-  test_kit_docker_build:
-    name: Test Kit docker image
-    needs: [pack_jammy, pack_jammy_cache_check]
-    if: always() && needs.pack_jammy.result != 'failure'
-    runs-on: ubuntu-22.04
-    outputs:
-      out-build: ${{ steps.build.outputs.build_image }}
-    steps:
-      - name: Checkout repository # We have to checkout to access .github/workflows/ in further steps
-        uses: actions/checkout@v3
-      - name: Download built x86_64 Ubuntu Jammy packages
-        uses: manticoresoftware/download_artifact_with_retries@v3
-        with:
-          name: build_jammy_RelWithDebInfo_x86_64
-          path: .
-      # Uncomment this shortcut for debug to save time by not preparing the packages in the pack_jammy job
-      # - run: |
-      #     wget http://dev2.manticoresearch.com/build_jammy_RelWithDebInfo_x86_64.zip
-      #     unzip build_jammy_RelWithDebInfo_x86_64.zip
-      #     tar -xvf artifact.tar
-      - name: Calculate short commit hash
-        id: sha
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Building docker
-        id: build
-        run: |
-          BUILD_COMMIT=${{ steps.sha.outputs.sha_short }} /bin/bash dist/test_kit_docker_build.sh
-          echo "build_image=ghcr.io/$REPO_OWNER/manticoresearch:test-kit-${{ steps.sha.outputs.sha_short }}" >> $GITHUB_OUTPUT
-      - name: Upload docker image artifact
-        uses: manticoresoftware/upload_artifact_with_retries@v4
-        with:
-          name: manticore_test_kit.img
-          path: manticore_test_kit.img
-
-  clt:
-    if: always() && needs.test_kit_docker_build.result != 'failure'
-    name: CLT
-    needs: test_kit_docker_build
-    uses: ./.github/workflows/clt_tests.yml
-    secrets:
-      OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-      VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
-      JINA_API_KEY: ${{ secrets.JINA_API_KEY }}
-    with:
-      docker_image: test-kit:img
-      artifact_name: manticore_test_kit.img
-      repository: ${{ github.repository }}
-      ref: ${{ github.sha }}
-
-  test_kit_docker_push:
-    if: always() && needs.changes.outputs.source == 'true'
-    needs:
-      - changes
-      - clt
-    name: Push Test Kit docker image to repo
-    runs-on: ubuntu-22.04
-    env:
-      GHCR_USER: ${{ vars.GHCR_USER }}
-      GHCR_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
-      REPO_OWNER: ${{ github.repository_owner }}
-    steps:
-      - name: Checkout repository # We have to checkout to access .github/workflows/ in further steps
-        uses: actions/checkout@v3
-      - name: Download artifact
-        uses: manticoresoftware/download_artifact_with_retries@main
-        with:
-          name: manticore_test_kit.img
-          path: .
-      - name: Calculate short commit hash
-        id: sha
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Pushing docker image to repo
-        id: test-kit-push
-        run: |
-          TEST_RESULT=${{ needs.clt.result }} BUILD_COMMIT=${{ steps.sha.outputs.sha_short }} /bin/bash dist/test_kit_docker_push.sh
-
-  build_aarch64:
-    if: (needs.changes.outputs.source == 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    needs: [changes, check_branch]
-    name: Linux aarch64 build
-    uses: ./.github/workflows/build_template.yml
-    # Use -VV instead of -V below for more verbose output
-    with:
-      arch: aarch64
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      cmake_command: |
-        mkdir build
-        cd build
-        export CMAKE_TOOLCHAIN_FILE=$(pwd)/../dist/build_dockers/cross/linux.cmake
-        ctest -V -S ../misc/ctest/justbuild.cmake -DCTEST_SOURCE_DIRECTORY=.. --no-compress-output
-      cache_key: build_jammy_aarch64
-
-  build_freebsd:
-    if: (needs.changes.outputs.source == 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
-    needs: [changes, check_branch]
-    name: FreeBSD x86_64 build
-    uses: ./.github/workflows/build_template.yml
-    with:
-      DISTR: freebsd13
-      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
-      boost_url_key: none
-      cmake_command: |
-        mkdir build
-        cd build
-        export CMAKE_TOOLCHAIN_FILE=$(pwd)/../dist/build_dockers/cross/freebsd.cmake
-        ctest -VV -S ../misc/ctest/justbuild.cmake -DCTEST_SOURCE_DIRECTORY=.. --no-compress-output
-      cache_key: build_freebsd_x86_64
-
   build_windows:
     if: (needs.changes.outputs.source == 'true') && (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
     needs: [changes, check_branch]

.github/workflows/win_test_template.yml

@@ -32,7 +32,7 @@ jobs:
       CTEST_START: ${{ inputs.CTEST_START }}
       CTEST_END: ${{ inputs.CTEST_END }}
       # The following is useful to test a specific test, just uncomment it, no need to disable CTEST_START/END
-      # CTEST_REGEX: test_234
+      CTEST_REGEX: test_307
       NO_BUILD: 1
       COLUMNAR_LOCATOR: ${{ inputs.COLUMNAR_LOCATOR }}
     steps:

src/sorterscroll.cpp

@@ -348,9 +348,6 @@ bool ParseScroll ( CSphQuery & tQuery, const CSphString & sVal, CSphString & sEr
 
 static void AddScrollFilter ( CSphQuery & tQuery )
 {
-	if ( !tQuery.m_tScrollSettings.m_dAttrs.GetLength() )
-		return;
-
 	const ScrollAttr_t & tFirst = tQuery.m_tScrollSettings.m_dAttrs[0];
 	int iFilterId = tQuery.m_dFilters.GetLength();
 
@@ -401,10 +398,6 @@ bool SetupScroll ( CSphQuery & tQuery, CSphString & sError )
 	if ( !tQuery.m_tScrollSettings.m_dAttrs.GetLength() )
 		return true;
 
-	// Ensure m_sSortBy is set (scroll settings are valid)
-	if ( tQuery.m_tScrollSettings.m_sSortBy.IsEmpty() )
-		return true;
-
 	// replace order by with order_by_str here (if order by is default)
 	const char * szDefaultSortBy = "@weight desc";
 	if ( tQuery.m_sSortBy==szDefaultSortBy )

src/std/base64.cpp

@@ -21,17 +21,6 @@ bool DecodeBase64 ( const CSphString & sValue, CSphString & sResult )
 {
 	std::string sVal = sValue.cstr();
 
-	// Validate base64 characters before attempting decode to avoid crashes on Windows
-	// Base64 uses A-Z, a-z, 0-9, +, /, and = for padding
-	if ( sVal.empty() )
-		return false;
-
-	for ( char c : sVal )
-	{
-		if ( !((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '+' || c == '/' || c == '=') )
-			return false;
-	}
-
 	using namespace boost::archive::iterators;
 	try
 	{