Merge branch 'develop-1.1' into dev-merge-up-20180202

writeengine/server/CMakeLists.txt

@@ -14,7 +14,8 @@ set(WriteEngineServer_SRCS
     we_dmlcommandproc.cpp
     we_cleartablelockcmd.cpp
     we_cpifeederthread.cpp
-    we_getfilesizes.cpp)
+    we_getfilesizes.cpp
+    ../../utils/common/crashtrace.cpp)
 
 add_executable(WriteEngineServer ${WriteEngineServer_SRCS})
 

writeengine/server/we_dmlcommandproc.cpp

@@ -2218,6 +2218,26 @@ uint8_t WE_DMLCommandProc::commitBatchAutoOn(messageqcpp::ByteStream& bs, std::s
         cacheutils::purgePrimProcFdCache(files, Config::getLocalModuleID());
 
     TableMetaData::removeTableMetaData(tableOid);
+
+    // MCOL-1160 For API bulk insert flush the PrimProc cached dictionary
+    // blocks tounched
+    std::tr1::unordered_map<TxnID, dictLBIDRec_t>::iterator mapIter;
+    mapIter = fWEWrapper.getDictMap().find(txnID);
+
+    if (mapIter != fWEWrapper.getDictMap().end())
+    {
+        std::set<BRM::LBID_t>::iterator lbidIter;
+        std::vector<BRM::LBID_t> dictFlushBlks;
+
+        for (lbidIter = (*mapIter).second.begin(); lbidIter != (*mapIter).second.end(); lbidIter++)
+        {
+            dictFlushBlks.push_back((*lbidIter));
+        }
+
+        cacheutils::flushPrimProcAllverBlocks(dictFlushBlks);
+        fWEWrapper.getDictMap().erase(txnID);
+    }
+
     return rc;
 }
 

writeengine/server/we_server.cpp

@@ -51,6 +51,8 @@ using namespace oam;
 #include "utils_utf8.h"
 #include "dbrm.h"
 
+#include "crashtrace.h"
+
 namespace
 {
 void added_a_pm(int)
@@ -103,6 +105,9 @@ int main(int argc, char** argv)
     string systemLang = "C";
     systemLang = funcexp::utf8::idb_setlocale();
 
+    // This is unset due to the way we start it
+    program_invocation_short_name = const_cast<char*>("WriteEngineServ");
+
     printf ("Locale is : %s\n", systemLang.c_str() );
 
     //set BUSY_INIT state
@@ -127,6 +132,12 @@ int main(int argc, char** argv)
     sigaction(SIGHUP, &sa, 0);
     sa.sa_handler = SIG_IGN;
     sigaction(SIGPIPE, &sa, 0);
+
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_handler = fatalHandler;
+    sigaction(SIGSEGV, &sa, 0);
+    sigaction(SIGABRT, &sa, 0);
+    sigaction(SIGFPE, &sa, 0);
 #endif
 
     // Init WriteEngine Wrapper (including Config Columnstore.xml cache)