Merge pull request #5811 from richardkchapman/compulsory-query-hash

HPCC-11287 Avoid including files in query hash if package resolves everything

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

common/workunit/package.h

@@ -38,6 +38,7 @@ interface IHpccPackage : extends IInterface
 
     virtual const char *queryEnv(const char *varname) const = 0;
     virtual bool getEnableFieldTranslation() const = 0;
+    virtual bool isCompulsory() const = 0;
     virtual const IPropertyTree *queryTree() const = 0;
     virtual hash64_t queryHash() const = 0;
     virtual const char *queryId() const = 0;

roxie/ccd/ccdquery.cpp

@@ -904,7 +904,7 @@ public:
         if (dll)
         {
             hashValue = rtlHash64VStr(dll->queryDll()->queryName(), hashValue);
-            if (!allFilesDynamic && !isDynamic)
+            if (!allFilesDynamic && !isDynamic && !package.isCompulsory())
             {
                 IConstWorkUnit *wu = dll->queryWorkUnit();
                 if (wu) // wu may be null in some unit test cases

roxie/ccd/ccdstate.cpp

@@ -682,6 +682,10 @@ public:
     {
         return CPackageNode::getEnableFieldTranslation();
     }
+    virtual bool isCompulsory() const
+    {
+        return CPackageNode::isCompulsory();
+    }
     virtual const IPropertyTree *queryTree() const
     {
         return CPackageNode::queryTree();