From 9e5b3ef1a130916aff03c2a22075cbb8c9f16444 Mon Sep 17 00:00:00 2001
From: dimitr <dimitr@users.sourceforge.net>
Date: Sun, 7 Mar 2004 15:13:53 +0000
Subject: [PATCH] Added short-circuit optimization of user-supplied plans. Call
 find_best() exactly number-of-stream times.

---
 src/jrd/opt.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp
index 6ed71ae9dd..0b2e0b6546 100644
--- a/src/jrd/opt.cpp
+++ b/src/jrd/opt.cpp
@@ -2818,7 +2818,7 @@ static void find_best(TDBB tdbb,
  *	relationships to form joins.
  *
  **************************************/
-	UCHAR *ptr, *stream_end;
+	UCHAR *ptr;
 
 	SET_TDBB(tdbb);
 	DEV_BLKCHK(opt, type_opt);
@@ -2835,14 +2835,29 @@ static void find_best(TDBB tdbb,
 	// code path for SET PLAN as for a normal optimization--it reduces 
 	// chances for bugs to be introduced, and forces the person maintaining
 	// the optimizer to think about SET PLAN when new features are added --deej
-	if (plan_node && (streams[position + 1] != stream)) {
+	if (plan_node)
+	{
+		if (streams[position + 1] == stream)
+		{
+			opt->opt_streams[position].opt_best_stream = stream;
+			++position;
+			if (position < streams[0])
+			{
+				find_best(tdbb, opt, streams[position + 1], position, streams, plan_node, 
+					(double) 0, (double) 1);
+			}
+			else
+			{
+				opt->opt_best_count = streams[0];
+			}
+		}
 		return;
 	}
 
 	// do some initializations.
 	Csb* csb = opt->opt_csb;
 	csb->csb_rpt[stream].csb_flags |= csb_active;
-	stream_end = &streams[1] + streams[0];
+	UCHAR* stream_end = &streams[1] + streams[0];
 	opt->opt_streams[position].opt_stream_number = stream;
 	++position;
 	Opt::opt_stream* order_end = opt->opt_streams.begin() + position;