Merge remote-tracking branch 'origin/candidate-9.4.x'

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Feb 2, 2024 · b40ec6c · b40ec6c
2 parents 8dcff14 + 5538d9b
commit b40ec6c
Show file tree

Hide file tree

Showing 22 changed files with 724 additions and 394 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -130,8 +130,22 @@ jobs:
 
     steps:
       - name: Free additional disk space (remove Android SDK + Tools)
+        continue-on-error: true
         run: |
-          sudo rm -rf /usr/local/lib/android
+          df -h
+          sudo rm -rf ${ANDROID_HOME}
+          sudo rm -rf ${JAVA_HOME_8_X64}
+          sudo rm -rf ${JAVA_HOME_11_X64}
+          sudo rm -rf ${JAVA_HOME_17_X64}
+          sudo rm -rf ${JAVA_HOME_21_X64}
+          sudo rm -rf ${CHROMEWEBDRIVER}
+          sudo rm -rf ${EDGEWEBDRIVER}
+          sudo rm -rf ${GECKOWEBDRIVER}
+          sudo rm -rf ${SELENIUM_JAR_PATH}
+
+      - name: Display disk space (post free)
+        run: |
+          df -h
 
       - name: Checkout HPCC-Platform
         uses: actions/checkout@v3

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -68,8 +68,22 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Free additional disk space (remove Android SDK + Tools)
+        continue-on-error: true
         run: |
-          sudo rm -rf /usr/local/lib/android
+          df -h
+          sudo rm -rf ${ANDROID_HOME}
+          sudo rm -rf ${JAVA_HOME_8_X64}
+          sudo rm -rf ${JAVA_HOME_11_X64}
+          sudo rm -rf ${JAVA_HOME_17_X64}
+          sudo rm -rf ${JAVA_HOME_21_X64}
+          sudo rm -rf ${CHROMEWEBDRIVER}
+          sudo rm -rf ${EDGEWEBDRIVER}
+          sudo rm -rf ${GECKOWEBDRIVER}
+          sudo rm -rf ${SELENIUM_JAR_PATH}
+
+      - name: Display disk space (post free)
+        run: |
+          df -h
 
       - name: Checkout HPCC-Platform
         uses: actions/checkout@v3

diff --git a/dali/base/dautils.cpp b/dali/base/dautils.cpp
@@ -121,7 +121,28 @@ IPropertyTree * getDropZonePlane(const char * name)
 
 bool isPathInPlane(IPropertyTree *plane, const char *path)
 {
-    return isEmptyString(path) || startsWith(path, plane->queryProp("@prefix"));
+    if (isEmptyString(path))
+        return true;
+
+    const char *prefix = plane->queryProp("@prefix");
+    if (isEmptyString(prefix))
+        return false; //prefix is empty, path is not - can't match.
+
+    while (*prefix && *prefix == *path)
+    {
+        path++;
+        prefix++;
+    }
+    if (0 == *prefix)
+    {
+        if (0 == *path || isPathSepChar(*path))
+            return true;
+        if (isPathSepChar(*(path - 1))) //implies both last characters of prefix and path were '/'
+            return true;
+    }
+    else if (0 == *path && isPathSepChar(*prefix) && (0 == *(prefix + 1)))
+        return true;
+    return false;
 }
 
 bool validateDropZone(IPropertyTree * plane, const char * path, const char * host, bool ipMatch)

diff --git a/docs/BuildTools/fo.xsl b/docs/BuildTools/fo.xsl
@@ -110,7 +110,7 @@
 
 <xsl:template match="programlisting[@role='tab']">
   <fo:block xsl:use-attribute-sets="monospace.verbatim.properties">
-   <xsl:attribute name="font-family">serif</xsl:attribute>
+   <xsl:attribute name="font-family">sans-serif</xsl:attribute>
    <xsl:attribute name="font-size">10pt</xsl:attribute>
     <xsl:apply-templates/>
   </fo:block>
@@ -123,6 +123,12 @@
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
+<xsl:template match="para[@role='serif']">
+  <fo:block>
+   <xsl:attribute name="font-family">serif</xsl:attribute>
+    <xsl:apply-templates/>
+  </fo:block>
+</xsl:template>
 
 <xsl:template match="para[@role='wsig']">
   <fo:block xsl:use-attribute-sets="monospace.verbatim.properties">

diff --git a/docs/BuildTools/fo.xsl.in b/docs/BuildTools/fo.xsl.in
@@ -110,7 +110,7 @@
 
 <xsl:template match="programlisting[@role='tab']">
   <fo:block xsl:use-attribute-sets="monospace.verbatim.properties">
-   <xsl:attribute name="font-family">serif</xsl:attribute>
+   <xsl:attribute name="font-family">sans-serif </xsl:attribute>
    <xsl:attribute name="font-size">10pt</xsl:attribute>
     <xsl:apply-templates/>
   </fo:block>
@@ -123,6 +123,12 @@
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
+<xsl:template match="para[@role='serif']">
+  <fo:block>
+   <xsl:attribute name="font-family">serif</xsl:attribute>
+    <xsl:apply-templates/>
+  </fo:block>
+</xsl:template>
 
 <xsl:template match="para[@role='wsig']">
   <fo:block xsl:use-attribute-sets="monospace.verbatim.properties">

diff --git a/docs/EN_US/HPCCSystemAdmin/SA-Mods/WUTool.xml b/docs/EN_US/HPCCSystemAdmin/SA-Mods/WUTool.xml
@@ -17,16 +17,15 @@
 
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
-      <colspec align="left" colwidth="125.55pt" />
+      <colspec align="left" colwidth="175.55pt" />
 
       <colspec />
 
       <tbody>
         <row>
-          <entry><emphasis role="bold">Actions</emphasis></entry>
+          <entry colsep="0"><emphasis role="bold">Actions</emphasis></entry>
 
-          <entry><ns:textPlaceholder
-          xmlns:ns="http://www.xmlmind.com/xmleditor/namespace/clipboard" /></entry>
+          <entry></entry>
         </row>
 
         <row>
@@ -53,6 +52,21 @@
           <entry>Dump results from specified workunits.</entry>
         </row>
 
+        <row>
+          <entry>info &lt;workunits&gt; &lt;filter&gt;</entry>
+
+          <entry>This command provides filtered access to statistics and other
+          information from a workunit. <para>See the following table for
+          additional info parameter information. </para></entry>
+        </row>
+
+        <row>
+          <entry>analyze &lt;workunit&gt;</entry>
+
+          <entry>Analyze the workunit to highlight potential cost
+          savings</entry>
+        </row>
+
         <row>
           <entry>archive &lt;workunits&gt;</entry>
 
@@ -81,10 +95,10 @@
         </row>
 
         <row>
-          <entry>validate</entry>
+          <entry>validate [FIX=1]</entry>
 
-          <entry>Check contents of workunit repository for errors. [FIX=1]
-          will try to repair any issues found.</entry>
+          <entry>Check contents of workunit repository for errors. With
+          [FIX=1] will try to repair any issues found.</entry>
         </row>
 
         <row>
@@ -99,6 +113,218 @@
 
           <entry>Initialize new workunit repository</entry>
         </row>
+
+        <row>
+          <entry>graph &lt;wu&gt;</entry>
+
+          <entry>Generate an alternative representation of the graph with
+          execution details</entry>
+        </row>
+
+        <row>
+          <entry>activity &lt;wu&gt;</entry>
+
+          <entry><para>What activities are executed between a range of times
+          (in time order)</para><para>&lt;wu&gt; ["&gt;scope|mintime"]
+          ["&lt;scope|maxtime"] [threshold=n%]</para></entry>
+        </row>
+
+        <row>
+          <entry>hotspot &lt;wu&gt; [&lt;activity&gt;]</entry>
+
+          <entry>Find the hotspots for workunit (or one particular
+          activity)</entry>
+        </row>
+
+        <row>
+          <entry>critical &lt;wu&gt; &lt;activity&gt;</entry>
+
+          <entry>What activities are executed in order to execute
+          activity</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">depend &lt;wu&gt; &lt;activity&gt; 
+&lt;activity&gt;</programlisting></entry>
+
+          <entry>Find the common paths between two activities</entry>
+        </row>
+
+        <row>
+          <entry>depend &lt;wu&gt; ?&lt;activity&gt;:startTime</entry>
+
+          <entry>Which dependencies take a large % of the start time for this
+          activity</entry>
+        </row>
+
+        <row>
+          <entry>help &lt;command&gt;</entry>
+
+          <entry>More help on a command</entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+
+  <para>The following table provides further information for the wutool
+  utility issued with the action=info parameter:</para>
+
+  <informaltable colsep="1" frame="all" rowsep="1">
+    <tgroup cols="2">
+      <colspec align="left" colwidth="175.55pt" />
+
+      <colspec />
+
+      <tbody>
+        <row>
+          <entry colsep="0"><emphasis role="bold">info
+          parameters</emphasis></entry>
+
+          <entry></entry>
+        </row>
+
+        <row>
+          <entry>info &lt;workunits&gt; &lt;filter&gt;</entry>
+
+          <entry>This command provides filtered access to statistics and other
+          information from a workunit. <para>The filter can include the
+          following elements (those denoted by * can be repeated):
+          </para></entry>
+        </row>
+
+        <row>
+          <entry colsep="0"></entry>
+
+          <entry><emphasis role="bold">Which scopes are
+          matched</emphasis>:</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  
+          scope[&lt;scope-id&gt;]*</programlisting></entry>
+
+          <entry>scope to match</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  
+          stype[&lt;scope-type&gt;]*</programlisting></entry>
+
+          <entry>scope type to match</entry>
+        </row>
+
+        <row rowsep="0">
+          <entry><programlisting role="tab">  id[&lt;id&gt;]*</programlisting></entry>
+
+          <entry>the id of a scope to to match</entry>
+        </row>
+
+        <row>
+          <entry></entry>
+
+          <entry><emphasis role="bold">NOTE</emphasis>: scope, stype and id
+          cannot be specified in the same filter</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  depth[n |
+          low..high]</programlisting></entry>
+
+          <entry>range of depths to search for a match</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  source[global|stats|graph|all]*</programlisting></entry>
+
+          <entry>which sources within the workunit to search. Defaults to the
+          optimal sources for the rest of the filter</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  where[&lt;statistickind&gt; | &lt;statistickind&gt; 
+(=|&lt;|&lt;=|&gt;|&gt;=) value | 
+&lt;statistickind&gt;=low..high]</programlisting></entry>
+
+          <entry>filter by statistic existence or value range</entry>
+        </row>
+
+        <row rowsep="0">
+          <entry colsep="0"></entry>
+
+          <entry><emphasis role="bold">Which scopes are include in the
+          results:</emphasis></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  matched[true|false]</programlisting></entry>
+
+          <entry>are the matched scopes returned?</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  nested[&lt;depth&gt;|all]</programlisting></entry>
+
+          <entry>what nesting of scopes within a matched scope are in the
+          results (defaults to '0' if matched[true] and 'all' if
+          matched[false])</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  includetype[&lt;scope-type&gt;]*</programlisting></entry>
+
+          <entry>which scope types should be included?</entry>
+        </row>
+
+        <row>
+          <entry colsep="0"></entry>
+
+          <entry><emphasis role="bold">Which information about a scope is
+          reported:</emphasis></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  properties[statistics|hints|
+attributes|scope|all]*</programlisting></entry>
+
+          <entry></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  statistic[&lt;statistic-kind&gt;|none|all]*</programlisting></entry>
+
+          <entry></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  attribute[&lt;attribute-name&gt;|none|all]*</programlisting></entry>
+
+          <entry></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  hint[&lt;hint-name&gt;]*</programlisting></entry>
+
+          <entry></entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  property[&lt;statistic-kind&gt;|
+&lt;attribute-name&gt;|&lt;hint-name&gt;]*</programlisting></entry>
+
+          <entry>include property (category is deduced)</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  measure[&lt;measure&gt;]</programlisting></entry>
+
+          <entry>all statistics with a particular measure</entry>
+        </row>
+
+        <row>
+          <entry><programlisting role="tab">  version[&lt;version&gt;]</programlisting></entry>
+
+          <entry>minimum version to return</entry>
+        </row>
       </tbody>
     </tgroup>
   </informaltable>