瀏覽代碼

HPCC-11195 Suppress creation of unread spill files in Roxie

Code generator should not be creating them, but this should render them
harmless if it does.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 年之前
父節點
當前提交
c629952e3c
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      roxie/ccd/ccdserver.cpp

+ 3 - 1
roxie/ccd/ccdserver.cpp

@@ -11038,11 +11038,13 @@ public:
 class CRoxieServerDiskWriteActivityFactory : public CRoxieServerMultiOutputFactory
 {
     bool isRoot;
+    bool isTemp;
 public:
     CRoxieServerDiskWriteActivityFactory(unsigned _id, unsigned _subgraphId, IQueryFactory &_queryFactory, HelperFactory *_helperFactory, ThorActivityKind _kind, bool _isRoot)
         : CRoxieServerMultiOutputFactory(_id, _subgraphId, _queryFactory, _helperFactory, _kind), isRoot(_isRoot)
     {
         Owned<IHThorDiskWriteArg> helper = (IHThorDiskWriteArg *) helperFactory();
+        isTemp = (helper.getFlags() & TDXtemporary) != 0;
         setNumOutputs(helper->getTempUsageCount());
         if (_kind!=TAKdiskwrite)
             assertex(numOutputs == 0);
@@ -11069,7 +11071,7 @@ public:
 
     virtual bool isSink() const
     {
-        return numOutputs == 0; // MORE - check with Gavin if this is right if not a temp but reread in  same job...
+        return numOutputs == 0 && !isTemp; // MORE - check with Gavin if this is right if not a temp but reread in  same job...
     }
 
 };