You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2018/09/10 09:46:38 UTC
[1/2] hawq git commit: Fix function calls from unit tests
Repository: hawq
Updated Branches:
refs/heads/pr1369 [created] 67b8f84c9
Fix function calls from unit tests
Fix calls to 'pxf_free_expression_items_list' from unit tests (the 2nd parameter is always true)
Project: http://git-wip-us.apache.org/repos/asf/hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/hawq/commit/303cf5c0
Tree: http://git-wip-us.apache.org/repos/asf/hawq/tree/303cf5c0
Diff: http://git-wip-us.apache.org/repos/asf/hawq/diff/303cf5c0
Branch: refs/heads/pr1369
Commit: 303cf5c063037fe905a880945adafe475f0cc7a3
Parents: 472fa2b
Author: Ivan Leskin <le...@arenadata.io>
Authored: Mon Sep 3 12:47:48 2018 +0300
Committer: rlei <rl...@apache.org>
Committed: Mon Sep 10 17:07:38 2018 +0800
----------------------------------------------------------------------
src/backend/access/external/test/pxffilters_test.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hawq/blob/303cf5c0/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..132c9b1 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 @@ void test__pxf_serialize_filter_list__oneFilter(void **state)
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 @@ void test__pxf_serialize_fillter_list__nullFilter(void **state)
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);
@@ -870,7 +870,7 @@ test__pxf_serialize_filter_list__manyFilters(void **state)
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 @@ test__extractPxfAttributes_supported_function_one_arg(void **state) {
}
}
-int
-main(int argc, char* argv[])
+int
+main(int argc, char* argv[])
{
cmockery_parse_arguments(argc, argv);
[2/2] hawq git commit: Fix function calls from unit tests
Posted by rl...@apache.org.
Fix function calls from unit tests
'enrich_trivial_expression' was renamed to 'add_extra_expression_items'. The necessary changes in tests are made by this commit
Project: http://git-wip-us.apache.org/repos/asf/hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/hawq/commit/67b8f84c
Tree: http://git-wip-us.apache.org/repos/asf/hawq/tree/67b8f84c
Diff: http://git-wip-us.apache.org/repos/asf/hawq/diff/67b8f84c
Branch: refs/heads/pr1369
Commit: 67b8f84c9a65653d12b3b5dd33321812337b1066
Parents: 303cf5c
Author: Ivan Leskin <le...@arenadata.io>
Authored: Mon Sep 10 12:28:23 2018 +0300
Committer: rlei <rl...@apache.org>
Committed: Mon Sep 10 17:46:24 2018 +0800
----------------------------------------------------------------------
src/backend/access/external/test/pxffilters_test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hawq/blob/67b8f84c/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 132c9b1..6b0bd8b 100644
--- a/src/backend/access/external/test/pxffilters_test.c
+++ b/src/backend/access/external/test/pxffilters_test.c
@@ -866,9 +866,9 @@ test__pxf_serialize_filter_list__manyFilters(void **state)
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);
expressionItems = NIL;