diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index 69fe87cdce4..945a2a22694 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -122,6 +122,9 @@ jobs: name: LN cmake_options_extra: "" ln: true + - os: centos-7 + name: LN + ln: true fail-fast: false steps: diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 8cfcf6774c2..68664dfb99d 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -152,7 +152,7 @@ jobs: --mount source="${{ github.workspace }}/build",target=/hpcc-dev/build,type=bind,consistency=delegated \ --mount source="${{ github.workspace }}/.ccache",target=/root/.ccache,type=bind,consistency=delegated \ ${{ steps.vars.outputs.docker_tag }} "\ - cmake -G Ninja -S /hpcc-dev/${{ inputs.ln == true && 'LN' || 'HPCC-Platform' }} -B /hpcc-dev/build -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -DCONTAINERIZED=${{ inputs.containerized == true && 'ON' || 'OFF' }} -DCPACK_STRIP_FILES=${{ inputs.strip-files == true && 'ON' || 'OFF' }} ${{ inputs.single-package == true && '-DINCLUDE_PLUGINS=ON' || '-D$plugin=ON' }} ${{ inputs.cmake-configuration }} ${{ inputs.cmake-configuration-ex }} && \ + cmake -G Ninja -S /hpcc-dev/${{ inputs.ln == true && 'LN' || 'HPCC-Platform' }} -B /hpcc-dev/build -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DVCPKG_FILES_DIR=/hpcc-dev -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -DCONTAINERIZED=${{ inputs.containerized == true && 'ON' || 'OFF' }} -DCPACK_STRIP_FILES=${{ inputs.strip-files == true && 'ON' || 'OFF' }} ${{ inputs.single-package == true && '-DINCLUDE_PLUGINS=ON' || '-D$plugin=ON' }} ${{ inputs.cmake-configuration }} ${{ inputs.cmake-configuration-ex }} && \ cmake --build /hpcc-dev/build --parallel ${{ inputs.upload-package == true && '--target package' || ''}}" done diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 368b3910954..d47fe52010d 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -10,6 +10,7 @@ on: - 'ubuntu-22.04' - 'ubuntu-20.04' - 'rockylinux-8' + - 'centos-7' description: 'Operating System' required: false default: 'ubuntu-22.04' @@ -168,6 +169,13 @@ jobs: os: rockylinux-8 secrets: inherit + build-docker-centos-7: + if: ${{ contains('pull_request,push', github.event_name) }} + uses: ./.github/workflows/build-docker.yml + with: + os: centos-7 + secrets: inherit + build-gh_runner-ubuntu-22_04: if: ${{ contains('schedule,push', github.event_name) }} uses: ./.github/workflows/build-gh_runner.yml diff --git a/dockerfiles/vcpkg/amazonlinux.dockerfile b/dockerfiles/vcpkg/amazonlinux.dockerfile deleted file mode 100644 index c7ea3c4e138..00000000000 --- a/dockerfiles/vcpkg/amazonlinux.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG VCPKG_REF=latest -FROM hpccsystems/platform-build-base-amazonlinux:$VCPKG_REF - -ENTRYPOINT ["/bin/bash", "--login", "-c"] - -CMD ["/bin/bash"] diff --git a/dockerfiles/vcpkg/build.sh b/dockerfiles/vcpkg/build.sh index c15e8a2f2f3..d98257658ad 100755 --- a/dockerfiles/vcpkg/build.sh +++ b/dockerfiles/vcpkg/build.sh @@ -27,16 +27,16 @@ echo "DOCKER_PASSWORD: $DOCKER_PASSWORD" docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD -CMAKE_ALL_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=ON -DINCLUDE_PLUGINS=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DUSE_CPPUNIT=ON -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" -CMAKE_OPENBLAS_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF -DECLBLAS=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" -CMAKE_PLATFORM_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=ON -DPLATFORM=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" +CMAKE_ALL_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=ON -DINCLUDE_PLUGINS=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF -DUSE_CPPUNIT=ON -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON" +CMAKE_OPENBLAS_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF -DECLBLAS=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF" +CMAKE_PLATFORM_OPTIONS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=ON -DPLATFORM=ON -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF" function doBuild() { # docker pull "hpccsystems/platform-build-base-$1:$VCPKG_REF" || true # docker pull "hpccsystems/platform-build-$1:$VCPKG_REF" || true # docker pull "hpccsystems/platform-build-$1:$GITHUB_BRANCH" || true - docker build --progress plain --rm -f "$SCRIPT_DIR/$1.dockerfile" \ + docker buildx build --progress plain --rm -f "$SCRIPT_DIR/$1.dockerfile" \ --build-arg DOCKER_NAMESPACE=$DOCKER_USERNAME \ --build-arg VCPKG_REF=$VCPKG_REF \ --cache-from hpccsystems/platform-build-$1:$VCPKG_REF \ @@ -48,12 +48,10 @@ function doBuild() { # docker push hpccsystems/platform-build-$1:$VCPKG_REF # docker push hpccsystems/platform-build-$1:$GITHUB_BRANCH - CMAKE_OPTIONS_EXTRA="" - if [ "$1" == "centos-7*" ]; then - CMAKE_OPTIONS_EXTRA="-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic" - elif [ "$1" == "amazonlinux" ]; then - CMAKE_OPTIONS_EXTRA="-DVCPKG_TARGET_TRIPLET=x64-amazonlinux-dynamic" - fi + rm -f ./vcpkg/vcpkg + mkdir -p ./build-$1 + CMAKE_OPTIONS_EXTRA="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" + mkdir -p $HOME/.ccache docker run --rm \ --mount source="$(pwd)",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached \ @@ -61,29 +59,33 @@ function doBuild() { --mount source="$HOME/.ccache",target=/root/.ccache,type=bind,consistency=cached \ hpccsystems/platform-build-$1:$VCPKG_REF \ "rm -rf /hpcc-dev/HPCC-Platform/build-$1/CMakeCache.txt /hpcc-dev/HPCC-Platform/build-$1/CMakeFiles && \ - cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/HPCC-Platform/build-$1 ${CMAKE_ALL_OPTIONS} ${CMAKE_OPTIONS_EXTRA} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache && \ + cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/HPCC-Platform/build-$1 ${CMAKE_ALL_OPTIONS} ${CMAKE_OPTIONS_EXTRA} && \ cmake --build /hpcc-dev/HPCC-Platform/build-$1 --parallel && \ echo 'Done'" + rm -f ./vcpkg/vcpkg + # sudo chown -R $(id -u):$(id -g) ./build-$1 # docker run -it --mount source="$(pwd)",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached build-ubuntu-22.04:latest bash } -trap 'kill $(jobs -p)' EXIT +function cleanup() { + kill $(jobs -p) + rm -f ./vcpkg/vcpkg || true +} + +trap 'cleanup; exit' EXIT # ./vcpkg/bootstrap-vcpkg.sh mkdir -p ./vcpkg-logs if [ "$1" != "" ]; then - doBuild $1 & + doBuild $1 else doBuild ubuntu-24.04 &> vcpkg-logs/ubuntu-24.04.log & doBuild ubuntu-22.04 &> vcpkg-logs/ubuntu-22.04.log & doBuild ubuntu-20.04 &> vcpkg-logs/ubuntu-20.04.log & doBuild rockylinux-8 &> vcpkg-logs/rockylinux-8.log & - doBuild centos-8 &> vcpkg-logs/centos-8.log & - doBuild amazonlinux &> vcpkg-logs/amazonlinux.log & - doBuild centos-7-rh-python38 &> vcpkg-logs/centos-7-rh-python38.log & doBuild centos-7 &> vcpkg-logs/centos-7.log & fi diff --git a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile b/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile deleted file mode 100644 index 8752d764d67..00000000000 --- a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG VCPKG_REF=latest -FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF - -RUN yum remove -y python3 python3-devel && \ - yum install -y rh-python38 rh-python38-python-devel && \ - yum clean all - -RUN echo "source /opt/rh/rh-python38/enable" >> /etc/bashrc -SHELL ["/bin/bash", "--login", "-c"] - -ENTRYPOINT ["/bin/bash", "--login", "-c"] - -CMD ["/bin/bash"] diff --git a/dockerfiles/vcpkg/centos-7.dockerfile b/dockerfiles/vcpkg/centos-7.dockerfile index 04d1ba29af5..19ab3186f89 100644 --- a/dockerfiles/vcpkg/centos-7.dockerfile +++ b/dockerfiles/vcpkg/centos-7.dockerfile @@ -1,6 +1,10 @@ ARG VCPKG_REF=latest FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF +RUN yum install -y \ + rpm-build && \ + yum -y clean all && rm -rf /var/cache + ENTRYPOINT ["/bin/bash", "--login", "-c"] CMD ["/bin/bash"] diff --git a/dockerfiles/vcpkg/centos-8.dockerfile b/dockerfiles/vcpkg/centos-8.dockerfile deleted file mode 100644 index 108398a2711..00000000000 --- a/dockerfiles/vcpkg/centos-8.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG VCPKG_REF=latest -FROM hpccsystems/platform-build-base-centos-8:$VCPKG_REF - -ENTRYPOINT ["/bin/bash", "--login", "-c"] - -CMD ["/bin/bash"] \ No newline at end of file diff --git a/dockerfiles/vcpkg/rockylinux-8.dockerfile b/dockerfiles/vcpkg/rockylinux-8.dockerfile index 17c76d889b3..91e189d2734 100644 --- a/dockerfiles/vcpkg/rockylinux-8.dockerfile +++ b/dockerfiles/vcpkg/rockylinux-8.dockerfile @@ -1,10 +1,10 @@ ARG VCPKG_REF=latest FROM hpccsystems/platform-build-base-rockylinux-8:$VCPKG_REF -ENTRYPOINT ["/bin/bash", "--login", "-c"] - RUN yum install -y \ rpm-build && \ yum -y clean all && rm -rf /var/cache +ENTRYPOINT ["/bin/bash", "--login", "-c"] + CMD ["/bin/bash"] diff --git a/esp/clients/roxiecontrol.cpp b/esp/clients/roxiecontrol.cpp index 6f772f431b7..14ed2d61b7b 100644 --- a/esp/clients/roxiecontrol.cpp +++ b/esp/clients/roxiecontrol.cpp @@ -38,6 +38,10 @@ static void checkRoxieControlExceptions(IPropertyTree *response) me->append(*MakeStringException(ex.getPropInt("Code"), "Endpoint %s: %s", endp.queryProp("@ep"), ex.queryProp("Message"))); } } + + if( strieq("Exception", response->queryName())) + me->append(*MakeStringException(response->getPropInt("Code"), "Source %s: %s", response->queryProp("Source"), response->queryProp("Message"))); + if (me->ordinality()) throw me.getClear(); } diff --git a/esp/src/src-react/comms/workunit.ts b/esp/src/src-react/comms/workunit.ts index 26debedffa9..b5419b8140d 100644 --- a/esp/src/src-react/comms/workunit.ts +++ b/esp/src/src-react/comms/workunit.ts @@ -1,9 +1,13 @@ import { Workunit, WorkunitsService, type WsWorkunits } from "@hpcc-js/comms"; +import { scopedLogger } from "@hpcc-js/util"; +import nlsHPCC from "src/nlsHPCC"; import { Thenable } from "src/store/Deferred"; import { Paged } from "src/store/Paged"; import { BaseStore } from "src/store/Store"; import { wuidToDateTime } from "src/Utility"; +const logger = scopedLogger("src-react/comms/workunit.ts"); + const service = new WorkunitsService({ baseUrl: "" }); export type WUQueryStore = BaseStore; @@ -65,6 +69,16 @@ export function CreateWUQueryStore(): BaseStore { data, total: response.NumWUs }; + }).catch(e => { + if (e.Exception && e.Exception[0] && e.Exception[0].Message === nlsHPCC.GridAbortMessage) { + logger.debug(e.Exception[0].Message); + } else { + logger.error(e); + } + return { + data: [], + total: 0 + }; }); }); return store; diff --git a/esp/src/src-react/components/controls/Grid.tsx b/esp/src/src-react/components/controls/Grid.tsx index cbbf129f7d9..e2846cf5fbe 100644 --- a/esp/src/src-react/components/controls/Grid.tsx +++ b/esp/src/src-react/components/controls/Grid.tsx @@ -239,12 +239,12 @@ const FluentStoreGrid: React.FunctionComponent = ({ const abortController = React.useRef(); - React.useEffect(() => { + useDeepEffect(() => { if (abortController.current) { - abortController.current.abort({ message: "Grid aborting stale request" }); + abortController.current.abort({ message: nlsHPCC.GridAbortMessage }); } abortController.current = new AbortController(); - }, [query]); + }, [], [query, sorted]); const refreshTable = useDeepCallback((clearSelection = false) => { if (isNaN(start) || isNaN(count)) return; @@ -260,7 +260,7 @@ const FluentStoreGrid: React.FunctionComponent = ({ setItems(items); selectedIndices.forEach(index => selectionHandler.setIndexSelected(index, true, false)); }); - }, [abortController?.current?.signal, count, selectionHandler, start, store], [query, sorted]); + }, [count, selectionHandler, start, store], [query, sorted]); React.useEffect(() => { // Dummy line to ensure its included in the dependency array --- diff --git a/esp/src/src-react/util/history.ts b/esp/src/src-react/util/history.ts index 009a122a80f..e1b54232b0a 100644 --- a/esp/src/src-react/util/history.ts +++ b/esp/src/src-react/util/history.ts @@ -67,7 +67,7 @@ export function parseSort(_?: string): QuerySortItem | undefined { } export function updateSort(sorted: boolean, descending: boolean, sortBy: string) { - updateParam("sortBy", sorted ? (descending ? "-" : "") + sortBy : undefined); + updateParam("sortBy", sorted ? (descending ? "-" : "") + sortBy : null); // null to remove param... } export function parsePage(_: string): number { diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts index 182faf5b59f..814b1b547d0 100644 --- a/esp/src/src/nls/hpcc.ts +++ b/esp/src/src/nls/hpcc.ts @@ -396,6 +396,7 @@ export = { Graphs: "Graphs", GraphControl: "Graph Control", GraphView: "Graph View", + GridAbortMessage: "Grid aborting stale request", Group: "Group", GroupBy: "Group By", Grouping: "Grouping", diff --git a/roxie/ccd/ccdactivities.cpp b/roxie/ccd/ccdactivities.cpp index fa679f4f3ce..d8b4e51f68e 100644 --- a/roxie/ccd/ccdactivities.cpp +++ b/roxie/ccd/ccdactivities.cpp @@ -2514,15 +2514,19 @@ class CRoxieKeyedActivity : public CRoxieAgentActivity else { IKeyIndexBase *kib = keyArray->queryKeyPart(lastPartNo.partNo); - assertex(kib != NULL); - IKeyIndex *k = kib->queryPart(lastPartNo.fileNo); - if (filechanged) + if (!kib) + tlk.clear(); + else { - tlk.setown(createLocalKeyManager(*keyRecInfo, k, &logctx, hasNewSegmentMonitors(), !logctx.isBlind())); - createSegmentMonitorsPending = true; + IKeyIndex *k = kib->queryPart(lastPartNo.fileNo); + if (filechanged || !tlk) + { + tlk.setown(createLocalKeyManager(*keyRecInfo, k, &logctx, hasNewSegmentMonitors(), !logctx.isBlind())); + createSegmentMonitorsPending = true; + } + else + tlk->setKey(k); } - else - tlk->setKey(k); } } diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp index 64e65f611bf..a4d611da13f 100644 --- a/roxie/ccd/ccdserver.cpp +++ b/roxie/ccd/ccdserver.cpp @@ -1516,7 +1516,11 @@ class CRoxieServerActivity : implements CInterfaceOf, impl virtual IEngineRowStream *queryConcreteOutputStream(unsigned whichInput) { assertex(whichInput==0); return this; } virtual IStrandJunction *queryConcreteOutputJunction(unsigned idx) const { assertex(idx==0); return junction; } virtual IRoxieServerActivity *queryActivity() { return this; } - virtual IIndexReadActivityInfo *queryIndexReadActivity() { return NULL; } + virtual IIndexReadActivityInfo *queryIndexReadActivity() + { + CTXLOG("Activity does not implement queryIndexReadActivity"); + return NULL; + } virtual bool needsAllocator() const { return false; } @@ -5598,6 +5602,18 @@ IRoxieServerActivityFactory *createRoxieServerApplyActivityFactory(unsigned _id, //================================================================================= +static class CDummyIndexReadInfo : public CInterfaceOf +{ +public: + virtual IKeyArray *getKeySet() const { return nullptr; } + virtual const IResolvedFile *getVarFileInfo() const { return nullptr; } + virtual ITranslatorSet *getTranslators() const { return nullptr; } + + virtual void mergeSegmentMonitors(IIndexReadContext *irc) const { } + virtual IRoxieServerActivity *queryActivity() { throwUnexpected(); }; // Should never involve remote agent if keyset has returned nullptr + virtual const RemoteActivityId &queryRemoteId() const { throwUnexpected(); } +} dummyIndexReadInfo; + class CRoxieServerNullActivity : public CRoxieServerActivity { public: @@ -5611,6 +5627,10 @@ class CRoxieServerNullActivity : public CRoxieServerActivity return NULL; } + virtual IIndexReadActivityInfo *queryIndexReadActivity() + { + return &dummyIndexReadInfo; + } }; IRoxieServerActivity * createRoxieServerNullActivity(IRoxieAgentContext *_ctx, const IRoxieServerActivityFactory *_factory, IProbeManager *_probeManager) @@ -21282,7 +21302,7 @@ class CRoxieServerIfActivity : public CRoxieServerActivity IFinalRoxieInput *in = cond ? inputTrue : inputFalse; if (in) return in->queryIndexReadActivity(); - return NULL; + return &dummyIndexReadInfo; } virtual void reset() diff --git a/roxie/udplib/udptrr.cpp b/roxie/udplib/udptrr.cpp index 940ca28a9fc..05bdca6f582 100644 --- a/roxie/udplib/udptrr.cpp +++ b/roxie/udplib/udptrr.cpp @@ -392,7 +392,7 @@ enum class ReceiveState { granted, // at least one permit granted and NO pending request, waiting for data to be sent max }; -constexpr const char * receiveStateNameText[(unsigned)ReceiveState::max] = { "idle", "requested", "granted" }; +constexpr const char * receiveStateNameText[(unsigned)ReceiveState::max+1] = { "idle", "requested", "granted", "unknown" }; const char * receiveStateName(ReceiveState idx) { return receiveStateNameText[(unsigned)idx]; } diff --git a/testing/regress/ecl/setup/aaajavalibrary.ecl b/testing/regress/ecl/setup/aaajavalibrary.ecl index 3373795f92e..e32a90e233a 100644 --- a/testing/regress/ecl/setup/aaajavalibrary.ecl +++ b/testing/regress/ecl/setup/aaajavalibrary.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaJavaLibrary'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary2.ecl b/testing/regress/ecl/setup/aaalibrary2.ecl index b59f93bb151..cf81d801cf9 100644 --- a/testing/regress/ecl/setup/aaalibrary2.ecl +++ b/testing/regress/ecl/setup/aaalibrary2.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary2'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary3a.ecl b/testing/regress/ecl/setup/aaalibrary3a.ecl index b130f1fd73c..0b17883299e 100644 --- a/testing/regress/ecl/setup/aaalibrary3a.ecl +++ b/testing/regress/ecl/setup/aaalibrary3a.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary3a'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary3b.ecl b/testing/regress/ecl/setup/aaalibrary3b.ecl index ee16b646e7e..521b2559fed 100644 --- a/testing/regress/ecl/setup/aaalibrary3b.ecl +++ b/testing/regress/ecl/setup/aaalibrary3b.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary3b'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary4.ecl b/testing/regress/ecl/setup/aaalibrary4.ecl index 41a56f9a7c6..e7b1ca54e90 100644 --- a/testing/regress/ecl/setup/aaalibrary4.ecl +++ b/testing/regress/ecl/setup/aaalibrary4.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary4'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary5.ecl b/testing/regress/ecl/setup/aaalibrary5.ecl index bb600ff0d0f..70b5d125083 100644 --- a/testing/regress/ecl/setup/aaalibrary5.ecl +++ b/testing/regress/ecl/setup/aaalibrary5.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary5'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary6.ecl b/testing/regress/ecl/setup/aaalibrary6.ecl index 5270814dcc4..e31434f4cf0 100644 --- a/testing/regress/ecl/setup/aaalibrary6.ecl +++ b/testing/regress/ecl/setup/aaalibrary6.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary6'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibrary7.ecl b/testing/regress/ecl/setup/aaalibrary7.ecl index d2afcc58ecb..432aadb5734 100644 --- a/testing/regress/ecl/setup/aaalibrary7.ecl +++ b/testing/regress/ecl/setup/aaalibrary7.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibrary7'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/setup/aaalibraryjava.ecl b/testing/regress/ecl/setup/aaalibraryjava.ecl index 76ce173166d..2e1deea1caf 100644 --- a/testing/regress/ecl/setup/aaalibraryjava.ecl +++ b/testing/regress/ecl/setup/aaalibraryjava.ecl @@ -18,6 +18,7 @@ //nohthor //nothor //publish +//library #option ('targetService', 'aaaLibraryJava'); #option ('createServiceAlias', true); diff --git a/testing/regress/ecl/stresstext_if.ecl b/testing/regress/ecl/stresstext_if.ecl index 3cff2788ad6..dae81eb3bff 100644 --- a/testing/regress/ecl/stresstext_if.ecl +++ b/testing/regress/ecl/stresstext_if.ecl @@ -25,10 +25,7 @@ //version multiPart=true,variant='inplace',conditionVersion=2 //version multiPart=true,variant='inplace',conditionVersion=3 //version multiPart=true,variant='',conditionVersion=2 - -//The following is processed correctly by the code generator, but not yet supported by roxie -//enable the test once the necessary changes are made in the roxie engine. -//noversion multiPart=true,variant='',conditionVersion=4 +//version multiPart=true,variant='',conditionVersion=4 // The settings below may be useful when trying to analyse Roxie keyed join behaviour, as they will // eliminate some wait time for an agent queue to become available diff --git a/vcpkg.json.in b/vcpkg.json.in index f2e23d68ff5..df7d2ce54a9 100644 --- a/vcpkg.json.in +++ b/vcpkg.json.in @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "hpcc-platform", - "version": "8.12.0", + "version": "9.8.0", "dependencies": [ { "name": "apr",