Fix merge conflict with vcpkg submodule

.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:

.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
 

.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

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,42 +48,44 @@ 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 \
         --mount source="$(realpath ~)/.cache/vcpkg",target=/root/.cache/vcpkg,type=bind,consistency=cached \
         --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
 

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"]

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"]

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();
 }

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<WsWorkunits.WUQuery, Workunit>;
@@ -65,6 +69,16 @@ export function CreateWUQueryStore(): BaseStore<WsWorkunits.WUQuery, Workunit> {
                 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;

esp/src/src-react/components/controls/Grid.tsx

@@ -239,12 +239,12 @@ const FluentStoreGrid: React.FunctionComponent<FluentStoreGridProps> = ({
 
     const abortController = React.useRef<AbortController>();
 
-    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<FluentStoreGridProps> = ({
             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  ---

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 {

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",

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);
         }
     }
 

roxie/ccd/ccdserver.cpp

@@ -1516,7 +1516,11 @@ class CRoxieServerActivity : implements CInterfaceOf<IRoxieServerActivity>, 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<IIndexReadActivityInfo>
+{
+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()

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]; }
 
 

testing/regress/ecl/setup/aaajavalibrary.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaJavaLibrary');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary2.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary2');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary3a.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary3a');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary3b.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary3b');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary4.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary4');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary5.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary5');
 #option ('createServiceAlias', true);

testing/regress/ecl/setup/aaalibrary6.ecl

@@ -18,6 +18,7 @@
 //nohthor
 //nothor
 //publish
+//library
 
 #option ('targetService', 'aaaLibrary6');
 #option ('createServiceAlias', true);