Просмотр исходного кода

HPCC-14665 Updates following code review

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 9 лет назад
Родитель
Сommit
fc559410b8
2 измененных файлов с 7 добавлено и 2 удалено
  1. 6 1
      roxie/ccd/ccdkey.cpp
  2. 1 1
      tools/esdlcmd/CMakeLists.txt

+ 6 - 1
roxie/ccd/ccdkey.cpp

@@ -1220,7 +1220,12 @@ public:
         }
         if (preload && !loadedIntoMemory) // loaded but NOT originally seen as preload, lets try to generate keys...
         {
-            assertex((size_t)totalSize == totalSize);
+            if ((size_t)totalSize != totalSize)
+            {
+                IException *E = makeStringException(ROXIE_MEMORY_ERROR, "Preload file is larger than maximum object size");
+                EXCLOG(MCoperatorError, E);
+                throw E;
+            }
             if (traceLevel > 2)
                 DBGLOG("Loading in-memory file, size %" I64F "d", totalSize);
             // MORE - 32-bit systems could wrap here if totalSize > 2^32

+ 1 - 1
tools/esdlcmd/CMakeLists.txt

@@ -63,7 +63,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
-    ADD_DEFINITIONS( -D_CONSOLE -O0 )
+    ADD_DEFINITIONS( -O0 )
 endif ()
 
 HPCC_ADD_EXECUTABLE ( esdl ${SRCS} )