From ee03f7996fd904b503e74ae455099d5f3a38513a Mon Sep 17 00:00:00 2001
From: Karthikeyan Jambu Rajaraman <karthi.jrk@gmail.com>
Date: Thu, 29 Sep 2016 17:35:04 -0700
Subject: [PATCH] Fix cpplint error on advance aggregate

This closes #1168
---
 src/backend/codegen/advance_aggregates_codegen.cc    | 12 +++++++-----
 .../include/codegen/advance_aggregates_codegen.h     |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/backend/codegen/advance_aggregates_codegen.cc b/src/backend/codegen/advance_aggregates_codegen.cc
index 4d93a9cd2a..7b88e9b49d 100644
--- a/src/backend/codegen/advance_aggregates_codegen.cc
+++ b/src/backend/codegen/advance_aggregates_codegen.cc
@@ -49,7 +49,8 @@ bool AdvanceAggregatesCodegen::GenerateAdvanceTransitionFunction(
     gpcodegen::GpCodegenUtils* codegen_utils,
     llvm::Value* llvm_pergroup_arg,
     int aggno,
-    gpcodegen::PGFuncGeneratorInfo& pg_func_info) {
+    gpcodegen::PGFuncGeneratorInfo* pg_func_info) {
+  assert(nullptr != pg_func_info);
   auto irb = codegen_utils->ir_builder();
   AggStatePerAgg peraggstate = &aggstate_->peragg[aggno];
 
@@ -91,9 +92,10 @@ bool AdvanceAggregatesCodegen::GenerateAdvanceTransitionFunction(
   }
 
   assert(nullptr != peraggstate->aggref);
-  assert(pg_func_info.llvm_args.size() == 1 +
+  assert(pg_func_info->llvm_args.size() == 1 +
              list_length(peraggstate->aggref->args));
-  pg_func_info.llvm_args[0] = irb->CreateLoad(llvm_pergroupstate_transValue_ptr);
+  pg_func_info->llvm_args[0] = irb->CreateLoad(
+      llvm_pergroupstate_transValue_ptr);
 
   gpcodegen::PGFuncGeneratorInterface* pg_func_gen =
       gpcodegen::OpExprTreeGenerator::GetPGFuncGenerator(
@@ -106,7 +108,7 @@ bool AdvanceAggregatesCodegen::GenerateAdvanceTransitionFunction(
 
   llvm::Value *newVal = nullptr;
   bool isGenerated = pg_func_gen->GenerateCode(codegen_utils,
-                                               pg_func_info, &newVal);
+                                               *pg_func_info, &newVal);
   if (!isGenerated) {
     elog(DEBUG1, "Function with oid = %d was not generated successfully!",
          peraggstate->transfn.fn_oid);
@@ -308,7 +310,7 @@ bool AdvanceAggregatesCodegen::GenerateAdvanceAggregates(
         llvm_in_args);
 
     bool isGenerated = GenerateAdvanceTransitionFunction(
-        codegen_utils, llvm_pergroup_arg, aggno, pg_func_info);
+        codegen_utils, llvm_pergroup_arg, aggno, &pg_func_info);
     if (!isGenerated)
       return false;
   }  // End of for loop
diff --git a/src/backend/codegen/include/codegen/advance_aggregates_codegen.h b/src/backend/codegen/include/codegen/advance_aggregates_codegen.h
index b73b794152..9b557787fb 100644
--- a/src/backend/codegen/include/codegen/advance_aggregates_codegen.h
+++ b/src/backend/codegen/include/codegen/advance_aggregates_codegen.h
@@ -94,7 +94,7 @@ class AdvanceAggregatesCodegen: public BaseCodegen<AdvanceAggregatesFn> {
       gpcodegen::GpCodegenUtils* codegen_utils,
       llvm::Value* llvm_pergroup_arg,
       int aggno,
-      gpcodegen::PGFuncGeneratorInfo& pg_func_info);
+      gpcodegen::PGFuncGeneratorInfo* pg_func_info);
 };
 
 /** @} */
-- 
GitLab