1.Revise comment on noteTemporaryFile(...) return value

2.Ensure that CSpillingSortAlgorithm functions are not affected
by the changes to EclAgent::getTempfileBase(...)

Signed-off-by: Dave Streeter <dave.streeter@lexisnexisrisk.com>

Author: streeterd

ecl/eclagent/eclagent.cpp

@@ -654,8 +654,8 @@ const char *EclAgent::noteTemporaryFile(const char *name)
         inserted = tempFileSet.emplace(tempFilename.str());
     }
 
-    // The lock is intentionally scoped to insertion; the checks below use only
-    // the local insertion result and do not access shared state.
+    // The returned pointer refers to the std::string stored in tempFileSet and
+    // is only valid while that entry remains in the set.
 
     if (!inserted.second)
     {

ecl/hthor/hthor.cpp

@@ -4818,6 +4818,7 @@ void CHThorJoinActivity::ready()
     RoxieSortAlgorithm sortAlgorithm = isStable ? stableSpillingQuickSortAlgorithm : spillingQuickSortAlgorithm;
     StringBuffer tempBase;
     agent.getTempfileBase(tempBase);
+    tempBase.setLength(tempBase.length() - 1); // remove the path separator, as the sort does not want it
     if (helper.isLeftAlreadySorted())
         sortedLeftInput.setown(createDegroupedInputReader(&input->queryStream()));
     else
@@ -5455,6 +5456,7 @@ void CHThorSelfJoinActivity::ready()
         RoxieSortAlgorithm sortAlgorithm = isStable ? stableSpillingQuickSortAlgorithm : spillingQuickSortAlgorithm;
         StringBuffer tempBase;
         agent.getTempfileBase(tempBase);
+        tempBase.setLength(tempBase.length() - 1); // remove the path separator, as the sort does not want it
         groupedInput.setown(createSortedGroupedInputReader(&input->queryStream(), compareLeft, createSortAlgorithm(sortAlgorithm, compareLeft, *queryRowManager(), input->queryOutputMeta(), agent.queryCodeContext(), tempBase, activityId)));
     }
     leftOuterJoin = (helper.getJoinFlags() & JFleftouter) != 0;