diff --git a/.gitignore b/.gitignore
index 50f4251320abc80358b67eab22c02672d5f26bd6..2c37aa92f77dd14bd274be94568dfe904f48c5f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 build/
+.ycm_extra_conf.py
 .vscode/
 .idea/
 cmake-build-debug/
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index a3a6c0fed40e053b33dd8c77a031ea9eabf00664..a5aabbe1f6eb60a7da30899152ab8bca3c35e4ac 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -517,6 +517,7 @@ void tdAppendMemRowToDataCol(SMemRow row, STSchema *pSchema, SDataCols *pCols, b
   }
 }
 
+//TODO: refactor this function to eliminate additional memory copy
 int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset, bool forceSetNull) {
   ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfRows);
   ASSERT(target->numOfCols == source->numOfCols);
diff --git a/src/util/src/tfunctional.c b/src/util/src/tfunctional.c
index c470a2b8aefc11141c9125e60c1c45fcbb949f09..8b20f8fc0a6b6e08bcfd501f625c4594b4dff50d 100644
--- a/src/util/src/tfunctional.c
+++ b/src/util/src/tfunctional.c
@@ -14,23 +14,24 @@
  */
 
 #include "tfunctional.h"
-#include "tarray.h"
-
 
 tGenericSavedFunc* genericSavedFuncInit(GenericVaFunc func, int numOfArgs) {
   tGenericSavedFunc* pSavedFunc = malloc(sizeof(tGenericSavedFunc) + numOfArgs * (sizeof(void*)));
+  if(pSavedFunc == NULL) return NULL;
   pSavedFunc->func = func;
   return pSavedFunc;
 }
 
 tI32SavedFunc* i32SavedFuncInit(I32VaFunc func, int numOfArgs) {
   tI32SavedFunc* pSavedFunc = malloc(sizeof(tI32SavedFunc) + numOfArgs * sizeof(void *));
+  if(pSavedFunc == NULL) return NULL;
   pSavedFunc->func = func;
   return pSavedFunc;
 }
 
 tVoidSavedFunc* voidSavedFuncInit(VoidVaFunc func, int numOfArgs) {
   tVoidSavedFunc* pSavedFunc = malloc(sizeof(tVoidSavedFunc) + numOfArgs * sizeof(void*));
+  if(pSavedFunc == NULL) return NULL;
   pSavedFunc->func = func;
   return pSavedFunc;
 }