commit c6c79889bda534e3039f6f642076c21ed80fc2d5
author Ivan Leskin <leskin.in@arenadata.io> Mon Sep 03 12:47:48 2018 +0300
committer rlei <rlei@apache.org> Tue Sep 11 10:35:57 2018 +0800
tree 1383e27a3c683ee49a54827e2fe54abe3cdc1705
parent 472fa2b74679a5d2b6fb08dd107b292a95e577b7

HAWQ-1617. Fix function calls from unit tests

Fix calls to 'pxf_free_expression_items_list' from unit tests (the 2nd parameter is always true)
'enrich_trivial_expression' was renamed to 'add_extra_expression_items'. The necessary changes in tests are made by this commit

src/backend/access/external/test/pxffilters_test.c

diff --git a/src/backend/access/external/test/pxffilters_test.c b/src/backend/access/external/test/pxffilters_test.c
index 8e28890..6b0bd8b 100644
--- a/src/backend/access/external/test/pxffilters_test.c
+++ b/src/backend/access/external/test/pxffilters_test.c
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -814,7 +814,7 @@
 	char* result = pxf_serialize_filter_list(expressionItems);
 	assert_string_equal(result, "a0c25s4d1984o5");
 
-	pxf_free_expression_items_list(expressionItems, true);
+	pxf_free_expression_items_list(expressionItems);
 	expressionItems = NIL;
 	pfree(result);
 
@@ -832,7 +832,7 @@
 	char* result = pxf_serialize_filter_list(expressionItems);
 	assert_string_equal(result, "a0o8");
 
-	pxf_free_expression_items_list(expressionItems, true);
+	pxf_free_expression_items_list(expressionItems);
 	expressionItems = NIL;
 	pfree(result);
 
@@ -866,11 +866,11 @@
 	pfree(result);
 
 	int trivialExpressionItems = expressionItems->length;
-	enrich_trivial_expression(expressionItems);
+	add_extra_and_expression_items(expressionItems, trivialExpressionItems - 1);
 
-	assert_int_equal(expressionItems->length, 2*trivialExpressionItems - 1);
+	assert_int_equal(expressionItems->length, 2 * trivialExpressionItems - 1);
 
-	pxf_free_expression_items_list(expressionItems, true);
+	pxf_free_expression_items_list(expressionItems);
 	expressionItems = NIL;
 }
 
@@ -931,8 +931,8 @@
 	}
 }
 
-int 
-main(int argc, char* argv[]) 
+int
+main(int argc, char* argv[])
 {
 	cmockery_parse_arguments(argc, argv);