Update flowchart.

diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 5b940ba115569351756f4daef0c014416bf2f85b..cd7c71d83f387af700521ae9ee0c4434b74ce6ee 100644 (file)
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.21 1998/07/27 19:37:37 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.22 1998/08/10 14:32:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -381,10 +381,9 @@ RelationInvokeStrategy(Relation relation,
 
        termData.degree = 1;
 
-       strategyMap =
-               IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),
-                                                                       evaluation->maxStrategy,
-                                                                       attributeNumber);
+       strategyMap = IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),
+                                                                                               evaluation->maxStrategy,
+                                                                                               attributeNumber);
 
        entry = StrategyMapGetScanKeyEntry(strategyMap, strategy);
 
@@ -393,8 +392,7 @@ RelationInvokeStrategy(Relation relation,
                termData.operatorData[0].strategy = strategy;
                termData.operatorData[0].flags = 0x0;
 
-               return
-                       StrategyTermEvaluate(&termData, strategyMap, left, right);
+               return StrategyTermEvaluate(&termData, strategyMap, left, right);
        }
 
 
@@ -409,8 +407,7 @@ RelationInvokeStrategy(Relation relation,
                        termData.operatorData[0].strategy = newStrategy;
                        termData.operatorData[0].flags = SK_NEGATE;
 
-                       return
-                               StrategyTermEvaluate(&termData, strategyMap, left, right);
+                       return StrategyTermEvaluate(&termData, strategyMap, left, right);
                }
        }
 
@@ -425,8 +422,7 @@ RelationInvokeStrategy(Relation relation,
                        termData.operatorData[0].strategy = newStrategy;
                        termData.operatorData[0].flags = SK_COMMUTE;
 
-                       return
-                               StrategyTermEvaluate(&termData, strategyMap, left, right);
+                       return StrategyTermEvaluate(&termData, strategyMap, left, right);
                }
        }
 
@@ -441,8 +437,7 @@ RelationInvokeStrategy(Relation relation,
                        termData.operatorData[0].strategy = newStrategy;
                        termData.operatorData[0].flags = SK_NEGATE | SK_COMMUTE;
 
-                       return
-                               StrategyTermEvaluate(&termData, strategyMap, left, right);
+                       return StrategyTermEvaluate(&termData, strategyMap, left, right);
                }
        }
 
@@ -466,8 +461,7 @@ RelationInvokeStrategy(Relation relation,
 
                        if (index == (*termP)->degree)
                        {
-                               return
-                                       StrategyTermEvaluate(*termP, strategyMap, left, right);
+                               return StrategyTermEvaluate(*termP, strategyMap, left, right);
                        }
 
                        termP += 1;

diff --git a/src/tools/backend/flow.fig b/src/tools/backend/flow.fig
index 0984b51258448bd9043bc99c72e6e1aa6b87a155..16c8688325b503761321d82c6eedf7ca95581759 100644 (file)
--- a/src/tools/backend/flow.fig
+++ b/src/tools/backend/flow.fig
@@ -66,9 +66,6 @@ Inches
 2 1 0 2 20 7 0 0 -1 0.000 0 0 -1 1 0 2
        0 0 2.00 150.00 180.00
         2550 2175 2550 2775
-2 1 0 2 20 7 0 0 -1 0.000 0 0 -1 1 0 2
-       0 0 2.00 150.00 180.00
-        2550 2175 6450 2775
 2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5
         7650 12600 5250 12600 5250 12000 7650 12000 7650 12600
 2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2
@@ -86,14 +83,14 @@ Inches
 2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2
        0 0 2.00 150.00 180.00
         2550 3300 2550 4275
-2 1 2 2 -1 7 0 0 -1 4.000 0 1 -1 1 1 2
-       0 0 2.00 80.00 150.00
-       0 0 2.00 80.00 150.00
-        4800 1875 5235 1317
 2 1 2 2 -1 7 0 0 -1 3.000 0 1 -1 1 1 2
        0 0 2.00 80.00 150.00
        0 0 2.00 80.00 150.00
         4584 1524 5219 1293
+2 1 2 2 -1 7 0 0 -1 4.000 0 1 -1 1 1 2
+       0 0 2.00 80.00 150.00
+       0 0 2.00 80.00 150.00
+        4800 1875 5235 1317
 3 0 0 2 8 7 0 0 -1 0.000 0 1 0 8
        0 0 2.00 150.00 150.00
         1350 9375 1050 9375 825 9000 825 4425 1050 4050 1500 3975
@@ -102,6 +99,12 @@ Inches
        0 0 2.00 150.00 150.00
         7650 5775 8250 5475 8250 4575 7725 3975 3525 3975 2850 3975
         2700 4275
+3 2 2 2 20 7 0 0 -1 6.000 1 1 0 5
+       0 0 2.00 150.00 180.00
+        2550 2175 3300 2475 5400 2475 6225 2550 6450 2775
+        0.00 0.00 2971.07 2372.76 3158.57 2447.76 3790.23 2569.41
+        4920.91 2453.27 5588.99 2483.57 6029.45 2458.41 6281.33 2576.38
+        6337.58 2632.63 0.00 0.00
 4 1 -1 0 0 16 18 0.0000 4 210 900 1560 11190 Utilities\001
 4 1 -1 0 0 16 18 0.0000 4 270 2265 7965 11190 Storage Managers\001
 4 1 -1 0 0 16 18 0.0000 4 270 960 4725 11175 Catalog\001

diff --git a/src/tools/backend/flow.jpg b/src/tools/backend/flow.jpg
index 0a17ed434bf19ef2a59cae0f8f216d76f79d3aa1..20cc0932332adb6f7e9ee2a69457bed1ab75dd86 100644 (file)
Binary files a/src/tools/backend/flow.jpg and b/src/tools/backend/flow.jpg differ