Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-…

…9.8.x

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

# Conflicts:
#	helm/hpcc/Chart.yaml
#	helm/hpcc/templates/_helpers.tpl
#	helm/hpcc/templates/dafilesrv.yaml
#	helm/hpcc/templates/dali.yaml
#	helm/hpcc/templates/dfuserver.yaml
#	helm/hpcc/templates/eclagent.yaml
#	helm/hpcc/templates/eclccserver.yaml
#	helm/hpcc/templates/eclscheduler.yaml
#	helm/hpcc/templates/esp.yaml
#	helm/hpcc/templates/localroxie.yaml
#	helm/hpcc/templates/roxie.yaml
#	helm/hpcc/templates/sasha.yaml
#	helm/hpcc/templates/thor.yaml
#	version.cmake

.github/workflows/build-assets.yml

@@ -408,20 +408,6 @@ jobs:
           cmake -S /hpcc-dev/LN -B /hpcc-dev/build -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform ${{ needs.preamble.outputs.cmake_docker_config }} -DBUILD_LEVEL=ENTERPRISE -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DPLATFORM=ON -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=OFF -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON -DSUPPRESS_SPARK=ON -DCPACK_STRIP_FILES=OFF && \
           cmake --build /hpcc-dev/build --parallel $(nproc) --target package" 
       
-      - name: Upload Assets (enterprise)
-        if: ${{ matrix.ee }}
-        uses: ncipollo/release-action@v1.12.0
-        with:
-          allowUpdates: true
-          generateReleaseNotes: false
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          owner: ${{ secrets.LNB_ACTOR }}
-          repo: LN
-          token: ${{ secrets.LNB_TOKEN }}
-          tag: ${{ needs.preamble.outputs.internal_tag }}
-          artifacts: "${{ needs.preamble.outputs.folder_build }}/hpccsystems-platform-enterprise*.deb,${{ needs.preamble.outputs.folder_build }}/hpccsystems-platform-enterprise*.rpm"
-
-
       #  Common  ---
       - name: Cleanup Environment
         if: always()
@@ -687,12 +673,22 @@ jobs:
           C:\"Program Files (x86)"\"Microsoft SDKs"\ClickOnce\SignTool\signtool.exe sign /debug /f ../../sign/hpcc_code_signing.pfx /p ${{ secrets.SIGNING_CERTIFICATE_PASSPHRASE}} /t http://timestamp.digicert.com /fd SHA256 hpccsystems-eclide*.exe
 
       - name: Upload Assets
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
           prerelease: ${{ contains(github.ref, '-rc') }}
           artifacts: "./ECLIDE/build/*.exe"
+
+      - name: Upload Assets to Jfrog (windows)
+        if: ${{ github.repository_owner == 'hpcc-systems' }}
+        shell: bash
+        run: |
+          cd ./ECLIDE/build
+          packages=($(ls -1 hpccsystems-*.exe ))
+          for _package in ${packages[@]}; do
+            curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-windows-local/LN/windows/x86_64/${_package}" -T ${_package}
+          done
 
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}

common/thorhelper/thorcommon.cpp

@@ -1647,7 +1647,10 @@ IExtRowWriter *createRowWriter(IFile *iFile, IRowInterfaces *rowIf, unsigned fla
 {
     OwnedIFileIO iFileIO;
     if (TestRwFlag(flags, rw_compress))
+    {
+        flags &= ~rw_buffered; // if compressed, do not want buffered stream as well
         iFileIO.setown(createCompressedFileWriter(iFile, rowIf, flags, compressor, compressorBlkSz));
+    }
     else
         iFileIO.setown(iFile->open((flags & rw_extend)?IFOwrite:IFOcreate));
     if (!iFileIO)

common/thorhelper/thorsoapcall.cpp

@@ -2559,10 +2559,16 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
             {
                 checkTimeLimitExceeded(&remainingMS);
                 checkRoxieAbortMonitor(master->roxieAbortMonitor);
-                OwnedSpanScope socketOperationSpan = master->activitySpanScope->createClientSpan("Socket Write");
-                setSpanURLAttributes(socketOperationSpan, url);
 
-                Owned<IProperties> traceHeaders = ::getClientHeaders(socketOperationSpan);
+                StringBuffer spanName;
+                spanName.appendf("%s %s %s:%d", getWsCallTypeName(master->wscType), master->service.str(), url.host.str(), url.port);
+                OwnedSpanScope requestSpan = master->activitySpanScope->createClientSpan(spanName.str());
+
+                setSpanURLAttributes(requestSpan, url);
+                requestSpan->setSpanAttribute("request.type", getWsCallTypeName(master->wscType));
+                requestSpan->setSpanAttribute("service.name", master->service.str());
+
+                Owned<IProperties> traceHeaders = ::getClientHeaders(requestSpan);
                 createHttpRequest(request, url, traceHeaders);
 
                 socket->write(request.str(), request.length());
@@ -2575,30 +2581,30 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
                 bool keepAlive2;
                 StringBuffer contentType;
                 int rval = readHttpResponse(response, socket, keepAlive2, contentType);
-                socketOperationSpan->setSpanAttribute("http.response.status_code", (int64_t)rval);
+                requestSpan->setSpanAttribute("http.response.status_code", (int64_t)rval);
                 keepAlive = keepAlive && keepAlive2;
 
                 if (soapTraceLevel > 4)
                     master->logctx.CTXLOG("%s: received response (%s) from %s:%d", getWsCallTypeName(master->wscType),master->service.str(), url.host.str(), url.port);
 
                 if (rval != 200)
                 {
-                    socketOperationSpan->setSpanStatusSuccess(false);
+                    requestSpan->setSpanStatusSuccess(false);
                     if (rval == 503)
                     {
-                        socketOperationSpan->recordError(SpanError("Server Too Busy", 1001, true, true));
+                        requestSpan->recordError(SpanError("Server Too Busy", 1001, true, true));
                         throw new ReceivedRoxieException(1001, "Server Too Busy");
                     }
 
                     StringBuffer text;
                     text.appendf("HTTP error (%d) in processQuery",rval);
                     rtlAddExceptionTag(text, "soapresponse", response.str());
-                    socketOperationSpan->recordError(SpanError(text.str(), -1, true, true));
+                    requestSpan->recordError(SpanError(text.str(), -1, true, true));
                     throw MakeStringExceptionDirect(-1, text.str());
                 }
                 if (response.length() == 0)
                 {
-                    socketOperationSpan->recordError(SpanError("Zero length response in processQuery", -1, true, true));
+                    requestSpan->recordError(SpanError("Zero length response in processQuery", -1, true, true));
                     throw MakeStringException(-1, "Zero length response in processQuery");
                 }
                 checkTimeLimitExceeded(&remainingMS);
@@ -2614,7 +2620,7 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
                         persistentHandler->add(socket, &ep, proto);
                 }
 
-                socketOperationSpan->setSpanStatusSuccess(true);
+                requestSpan->setSpanStatusSuccess(true);
                 break;
             }
             catch (IReceivedRoxieException *e)

dali/daliadmin/daadmin.cpp

@@ -265,34 +265,24 @@ bool importFromFile(const char *path,const char *filename,bool add,StringBuffer
 //=============================================================================
 
 
-bool erase(const char *path,bool backup,StringBuffer &out)
+bool erase(const char *path, bool backup, StringBuffer &out)
 {
-    StringBuffer head;
-    StringBuffer tmp;
-    const char *tail=splitpath(path,head,tmp);
-    Owned<IRemoteConnection> conn = querySDS().connect(head.str(),myProcessSession(),RTM_LOCK_WRITE, daliConnectTimeoutMs);
-    if (!conn) {
+    Owned<IRemoteConnection> conn = querySDS().connect(path, myProcessSession(), RTM_LOCK_WRITE, daliConnectTimeoutMs);
+    if (!conn)
+    {
         out.appendf("Could not connect to %s",path);
         return false;
     }
-    Owned<IPropertyTree> root = conn->getRoot();
-    Owned<IPropertyTree> child = root->getPropTree(tail);
-    if (!child) {
-        out.appendf("Couldn't find %s/%s",head.str(),tail);
-        return false;
-    }
-    if (backup) {
+    IPropertyTree *root = conn->queryRoot();
+    if (backup)
+    {
         StringBuffer bakname;
-        Owned<IFileIO> io = createUniqueFile(NULL,"daliadmin", "bak", bakname);
-        out.appendf("Saving backup of %s/%s to %s",head.str(),tail,bakname.str());
+        Owned<IFileIO> io = createUniqueFile(NULL, "daliadmin", "bak", bakname);
+        out.appendf("Saving backup of %s to %s", path, bakname.str());
         Owned<IFileIOStream> fstream = createBufferedIOStream(io);
-        toXML(child, *fstream);         // formatted (default)
+        toXML(root, *fstream);         // formatted (default)
     }
-    root->removeTree(child);
-    child.clear();
-    root.clear();
-    conn->commit();
-    conn->close();
+    conn->close(true);
     return true;
 }
 

ecl/hqlcpp/hqlres.cpp

@@ -648,7 +648,8 @@ bool ResourceManager::flush(StringBuffer &filename, const char *basename, bool f
         }
         fwrite(s.data.get(), 1, s.data.length(), bin);
         fclose(bin);
-        fprintf(f, " .size %s,%u\n", label.str(), (unsigned)s.data.length());
+        if (!generateClang)
+            fprintf(f, " .size %s,%u\n", label.str(), (unsigned)s.data.length());
     }
     fclose(f);
 #endif