Pārlūkot izejas kodu

HPCC-12677 Fixed wrong static defaults used in a couple of places

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Jake Smith 10 gadi atpakaļ
vecāks
revīzija
6a6cc28a0d
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      roxie/ccd/ccdactivities.cpp
  2. 2 2
      roxie/ccd/ccdserver.cpp

+ 2 - 2
roxie/ccd/ccdactivities.cpp

@@ -1187,7 +1187,7 @@ public:
     CRoxieCsvReadActivityFactory(IPropertyTree &_graphNode, unsigned _subgraphId, IQueryFactory &_queryFactory, HelperFactory *_helperFactory)
         : CRoxieDiskBaseActivityFactory(_graphNode, _subgraphId, _queryFactory, _helperFactory)
     {
-        maxRowSize = defaultDaliResultLimit * 1024 * 1024;
+        maxRowSize = defaultMaxCsvRowSize * 1024 * 1024;
         IConstWorkUnit *workunit = _queryFactory.queryWorkUnit();
         if (workunit)
             maxRowSize = workunit->getDebugValueInt(OPT_MAXCSVROWSIZE, defaultMaxCsvRowSize) * 1024 * 1024;
@@ -4558,7 +4558,7 @@ public:
         maxColumns = helper->getMaxColumns();
         ICsvParameters *csvInfo = helper->queryCsvParameters();
         assertex(!csvInfo->queryEBCDIC());
-        maxRowSize = defaultDaliResultLimit * 1024 * 1024;
+        maxRowSize = defaultMaxCsvRowSize * 1024 * 1024;
         IConstWorkUnit *workunit = _queryFactory.queryWorkUnit();
         if (workunit)
             maxRowSize = workunit->getDebugValueInt(OPT_MAXCSVROWSIZE, defaultMaxCsvRowSize) * 1024 * 1024;

+ 2 - 2
roxie/ccd/ccdserver.cpp

@@ -21416,10 +21416,10 @@ public:
         {
             case TAKcsvread:
             {
-                maxCsvRowSize = defaultDaliResultLimit * 1024 * 1024;
+                maxCsvRowSize = defaultMaxCsvRowSize * 1024 * 1024;
                 IConstWorkUnit *workunit = _queryFactory.queryWorkUnit();
                 if (workunit)
-                    maxCsvRowSize = workunit->getDebugValueInt(OPT_MAXCSVROWSIZE, defaultDaliResultLimit) * 1024 * 1024;
+                    maxCsvRowSize = workunit->getDebugValueInt(OPT_MAXCSVROWSIZE, defaultMaxCsvRowSize) * 1024 * 1024;
                 break;
             }
             default: