Optimizer cleanup.

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 604d00523da2f8f6724c6ed3b69fab4f74c0aed1..718e20c69b38e0922171726bcdb8c3ec97cf2129 100644 (file)
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -344,7 +344,6 @@ _equalPath(Path *a, Path *b)
                if (a->p_ordering.ord.sortop == NULL ||
                        b->p_ordering.ord.sortop == NULL)
                {
-
                        if (a->p_ordering.ord.sortop != b->p_ordering.ord.sortop)
                                return false;
                }

diff --git a/src/backend/optimizer/path/joinutils.c b/src/backend/optimizer/path/joinutils.c
index 685adc57f55c18eae39c7b8c5833ac383bd33782..a732499a0de9421136285b47d8064fb81dd1a889 100644 (file)
--- a/src/backend/optimizer/path/joinutils.c
+++ b/src/backend/optimizer/path/joinutils.c
@@ -218,8 +218,8 @@ match_paths_joinkeys(List *joinkeys,
 
                key_match = every_func(joinkeys, path->keys, which_subkey);
 
-               if (equal_path_path_ordering(ordering,
-                                                                        &path->p_ordering) &&
+               if (equal_path_ordering(ordering,
+                                                               &path->p_ordering) &&
                        length(joinkeys) == length(path->keys) &&
                        key_match)
                {

diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 636bde6ea9770810d0e3b3bf5bb37050b4e44b84..7d6bded660d813edb1f56070bf075c17325b4229 100644 (file)
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -115,7 +115,7 @@ match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list)
                xmergeorder = mergeinfo->m_ordering;
 
                if ((ordering->ordtype == MERGE_ORDER &&
-                equal_merge_merge_ordering(ordering->ord.merge, xmergeorder)) ||
+                equal_merge_ordering(ordering->ord.merge, xmergeorder)) ||
                        (ordering->ordtype == SORTOP_ORDER &&
                   equal_path_merge_ordering(ordering->ord.sortop, xmergeorder)))
                {

diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index a6547517e74e163a6e82dc0ca6145918816a7cf0..ccd2a40fd05faf876023d45bd8a4356af95569f0 100644 (file)
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -21,13 +21,13 @@
 static bool equal_sortops_order(Oid *ordering1, Oid *ordering2);
 
 /*
- * equal-path-path-ordering--
+ * equal-path-ordering--
  *       Returns t iff two path orderings are equal.
  *
  */
 bool
-equal_path_path_ordering(PathOrder *path_ordering1,
-                                                PathOrder *path_ordering2)
+equal_path_ordering(PathOrder *path_ordering1,
+                                       PathOrder *path_ordering2)
 {
        if (path_ordering1 == path_ordering2)
                return true;
@@ -83,20 +83,22 @@ equal_path_merge_ordering(Oid *path_ordering,
 }
 
 /*
- * equal-merge-merge-ordering--
+ * equal-merge-ordering--
  *       Returns t iff two merge orderings are equal.
  *
  */
 bool
-equal_merge_merge_ordering(MergeOrder *merge_ordering1,
+equal_merge_ordering(MergeOrder *merge_ordering1,
                                                   MergeOrder *merge_ordering2)
 {
        return equal(merge_ordering1, merge_ordering2);
 }
 
-/*****************************************************************************
+
+/*
+ *     sortops
  *
- *****************************************************************************/
+ */
 
 /*
  * equal_sort_ops_order -

diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 833b0f9ad8098b4d33a772a54cf219eb7ea5faba..2dbc115ec58a892aee0628701ad4b61b274f0078 100644 (file)
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -165,8 +165,8 @@ better_path(Path *new_path, List *unique_paths, bool *noOther)
                path = (Path *) lfirst(temp);
 
                if (samekeys(path->keys, new_path->keys) &&
-                       equal_path_path_ordering(&path->p_ordering,
-                                                                        &new_path->p_ordering))
+                       equal_path_ordering(&path->p_ordering,
+                                                               &new_path->p_ordering))
                {
                        old_path = path;
                        break;

diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h
index d94ff85bafe6d24fd7664f9164a50469f5de8a7e..393432b9942316ba95bf560caded4691ebb31aa5 100644 (file)
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -15,11 +15,11 @@
 
 #include <nodes/relation.h>
 
-extern bool equal_path_path_ordering(PathOrder *path_ordering1,
+extern bool equal_path_ordering(PathOrder *path_ordering1,
                                                 PathOrder *path_ordering2);
 extern bool equal_path_merge_ordering(Oid *path_ordering,
                                                  MergeOrder *merge_ordering);
-extern bool equal_merge_merge_ordering(MergeOrder *merge_ordering1,
+extern bool equal_merge_ordering(MergeOrder *merge_ordering1,
                                                   MergeOrder *merge_ordering2);
 
 #endif  /* ORDERING_H */