HPCC-11545 Updated based on review

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -386,17 +386,16 @@ void QueryFilesInUse::loadTargets(IPropertyTree *t, unsigned flags)
     }
 }
 
-IPropertyTreeIterator *QueryFilesInUse::findQueriesUsingFile(const char *target, const char *lfn)
+IPropertyTreeIterator *QueryFilesInUse::findQueriesUsingFile(const char *target, const char *lfn, StringAttr &pmid)
 {
-    checkDirtyReload();
-
-    CriticalBlock b(crit);
-
     if (!target || !*target || !lfn || !*lfn)
         return NULL;
-    IPropertyTree *targetTree = tree->queryPropTree(target);
+
+    Owned<IPropertyTree> t = getTree();
+    IPropertyTree *targetTree = t->queryPropTree(target);
     if (!targetTree)
         return NULL;
+    pmid.set(targetTree->queryProp("@pmid"));
 
     VStringBuffer xpath("Query[File/@lfn='%s']", lfn);
     return targetTree->getElements(xpath);
@@ -1343,11 +1342,11 @@ bool CWsWorkunitsEx::onWUListQueriesUsingFile(IEspContext &context, IEspWUListQu
         target = targets.item(i);
         Owned<IEspTargetQueriesUsingFile> respTarget = createTargetQueriesUsingFile();
         respTarget->setTarget(target);
-        const char *pmid = filesInUse.getPackageMap(target);
-        if (pmid && *pmid)
-            respTarget->setPackageMap(pmid);
 
-        Owned<IPropertyTreeIterator> queries = filesInUse.findQueriesUsingFile(target, lfn);
+        StringAttr pmid;
+        Owned<IPropertyTreeIterator> queries = filesInUse.findQueriesUsingFile(target, lfn, pmid);
+        if (!pmid.isEmpty())
+            respTarget->setPackageMap(pmid);
         if (queries)
         {
             IArrayOf<IEspQueryUsingFile> respQueries;

esp/services/ws_workunits/ws_workunitsService.hpp

@@ -44,13 +44,14 @@ class QueryFilesInUse : public CInterface, implements ISDSSubscription
     mutable CriticalSection dirtyCrit; //if there were an atomic_or I would just use atomic
     unsigned dirty;
     bool aborting;
-
-public:
-    IMPLEMENT_IINTERFACE;
-    QueryFilesInUse() : aborting(false), qsChange(0), pmChange(0), psChange(0), dirty(0)
+private:
+    void loadTarget(IPropertyTree *tree, const char *target, unsigned flags);
+    void loadTargets(IPropertyTree *tree, unsigned flags);
+    void load(unsigned flags)
     {
-        tree.setown(createPTree("QueryFilesInUse"));
-        updateUsers();
+        Owned<IPropertyTree> t = createPTreeFromIPT(tree);
+        loadTargets(t, flags);
+        tree.setown(t.getClear());
     }
 
     void updateUsers()
@@ -69,29 +70,12 @@ public:
         }
     }
 
-    const char *getPackageMap(const char *target)
-    {
-        VStringBuffer xpath("%s/@pmid", target);
-        return tree->queryProp(xpath);
-    }
-
-    void loadTarget(IPropertyTree *tree, const char *target, unsigned flags);
-    void loadTargets(IPropertyTree *tree, unsigned flags);
-    void reload(unsigned flags)
-    {
-        CriticalBlock b(crit);
-        loadTargets(tree, flags);
-    }
-    void checkDirtyReload()
+public:
+    IMPLEMENT_IINTERFACE;
+    QueryFilesInUse() : aborting(false), qsChange(0), pmChange(0), psChange(0), dirty(0)
     {
-        unsigned flags;
-        {
-            CriticalBlock b(dirtyCrit);
-            flags = dirty;
-            dirty = 0;
-        }
-        if (flags)
-            reload(flags);
+        tree.setown(createPTree("QueryFilesInUse"));
+        updateUsers();
     }
 
     virtual void notify(SubscriptionId subid, const char *xpath, SDSNotifyFlags flags, unsigned valueLen, const void *valueData)
@@ -146,14 +130,33 @@ public:
         aborting=true;
         CriticalBlock b(crit);
     }
-    IPropertyTreeIterator *findQueriesUsingFile(const char *target, const char *lfn);
-    StringBuffer &toStr(StringBuffer &s)
+
+    void init()
+    {
+        CriticalBlock b(crit);
+        load(0);
+    }
+
+    IPropertyTree *getTree()
     {
-        checkDirtyReload();
         CriticalBlock b(crit);
-        return toXML(tree, s);
+        unsigned flags;
+        {
+            CriticalBlock b(dirtyCrit);
+            flags = dirty;
+            dirty = 0;
+        }
+        if (flags)
+            load(flags);
+        return LINK(tree);
     }
 
+    IPropertyTreeIterator *findQueriesUsingFile(const char *target, const char *lfn, StringAttr &pmid);
+    StringBuffer &toStr(StringBuffer &s)
+    {
+        Owned<IPropertyTree> t = getTree();
+        return toXML(t, s);
+    }
 };
 
 class QueryFilesInUseUpdateThread : public Thread
@@ -165,7 +168,7 @@ public:
 
     virtual int run()
     {
-        filesInUse.reload(0);
+        filesInUse.init();
         return 0;
     }
     virtual void start()