Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19494
Modified Files:
sql.mx sql_optimizer.mx
Log Message:
clean up of optimizer
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- sql_optimizer.mx 21 Mar 2007 15:47:26 -0000 1.145
+++ sql_optimizer.mx 21 Mar 2007 21:39:41 -0000 1.146
@@ -106,31 +106,13 @@
#include "mal_builder.h"
#include "bat5.h"
-#include "opt_prelude.h"
-#include "opt_support.h"
-#include "opt_accessmode.h"
-#include "opt_accumulators.h"
-#include "opt_aliases.h"
-#include "opt_coercion.h"
-#include "opt_commonTerms.h"
-#include "opt_costModel.h"
-#include "opt_deadcode.h"
-#include "opt_emptySet.h"
-#include "opt_crack.h"
-#include "opt_garbageCollector.h"
-#include "opt_joinpath.h"
-#include "opt_joinselect.h"
-#include "opt_macro.h"
#include "opt_multiplex.h"
-#include "opt_peephole.h"
-#include "opt_reduce.h"
#include "mal_debugger.h"
#include "mal_namespace.h"
#include "sql_mvc.h"
#include "sql_optimizer.h"
#include "sql_scenario.h"
#include "sql_gencode.h"
-#include "optimizer.h"
#define TOSMALL 10
@@ -425,7 +407,7 @@
@c
str defaultPlan=
"inline,"
- /*"evaluate,"*/
+ "evaluate,"
"costModel,"
"coercions,"
"emptySet,"
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- sql.mx 11 Mar 2007 16:48:02 -0000 1.215
+++ sql.mx 21 Mar 2007 21:39:41 -0000 1.216
@@ -2189,7 +2189,7 @@
throw(SQL, "calc.month_interval",
"wrong format (%s)", *s);
*ret = res;
- return NULL;
+ return MAL_SUCCEED;
}
str
@@ -2198,7 +2198,7 @@
if (interval_from_str( *s, *sk, *ek, res ) < 0)
throw(SQL, "calc.second_interval",
"wrong format (%s)", *s);
- return NULL;
+ return MAL_SUCCEED;
}
@= c_interval
@@ -2233,7 +2233,7 @@
case isec:
break;
default:
- throw(ILLARG, "calc.month_interval","illegal argument");
+ throw(ILLARG, "calc.second_interval","illegal argument");
}
*res = r;
return MAL_SUCCEED;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
