Changeset: 5cb57bad7497 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cb57bad7497
Modified Files:
Branch: Oct2010
Log Message:
merge
diffs (157 lines):
diff -r 613974a28452 -r 5cb57bad7497 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Wed Sep 08 21:50:37 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Wed Sep 08 21:51:17 2010 +0200
@@ -1657,9 +1657,10 @@
{
int *vars, cnt = 0, i, j;
InstrPtr q;
- int actions;
vars= (int *) GDKzalloc(mb->vtop * sizeof(int));
+ if (vars == NULL)
+ return; /* forget it if we run
out of memory */
/* build the alias table */
for (i = 0; i < mb->vtop; i++) {
@@ -1688,7 +1689,6 @@
}
cnt++;
}
- actions = mb->vtop - cnt;
#ifdef DEBUG_REDUCE
mnstr_printf(GDKout, "Variable reduction %d -> %d\n", mb->vtop, cnt);
for(i=0; i<mb->vtop;i++)
@@ -1696,7 +1696,7 @@
#endif
/* remap all variable references to their new position. */
- if (actions) {
+ if (cnt < mb->vtop) {
for (i = 0; i < mb->stop; i++) {
q = getInstrPtr(mb, i);
for (j = 0; j < q->argc; j++)
@@ -1713,8 +1713,7 @@
mnstr_printf(GDKout, "After reduction \n");
printFunction(GDKout,mb,0,0);
#endif
- if (vars)
- GDKfree(vars);
+ GDKfree(vars);
mb->vtop = cnt;
}
void
diff -r 613974a28452 -r 5cb57bad7497 buildtools/Makefile.msc
--- a/buildtools/Makefile.msc Wed Sep 08 21:50:37 2010 +0200
+++ b/buildtools/Makefile.msc Wed Sep 08 21:51:17 2010 +0200
@@ -22,13 +22,13 @@
prefix = $(MAKEDIR)\NT
all:
- cd autogen && python setup.py build
+ cd autogen && setup.py build
cd Mx && $(MAKE) /nologo /f Makefile.msc
cd mel && $(MAKE) /nologo /f Makefile.msc
cd burg && $(MAKE) /nologo /f Makefile.msc
install:
- cd autogen && python setup.py install "--prefix=$(prefix)"
+ cd autogen && setup.py install "--prefix=$(prefix)"
cd Mx && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
cd mel && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
cd burg && $(MAKE) /nologo /f Makefile.msc "prefix=$(prefix)" install
diff -r 613974a28452 -r 5cb57bad7497 buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py Wed Sep 08 21:50:37 2010 +0200
+++ b/buildtools/autogen/autogen/codegen.py Wed Sep 08 21:51:17 2010 +0200
@@ -197,7 +197,7 @@
buf = src.read()
src.close()
buf2 = ""
- if code_extract.has_key(fext):
+ if ext != 'mx' and code_extract.has_key(fext):
epat = end_code_extract[fext]
for pat,newext in code_extract[fext]:
if newext == "." + ext:
diff -r 613974a28452 -r 5cb57bad7497 buildtools/autogen/setup.py
--- a/buildtools/autogen/setup.py Wed Sep 08 21:50:37 2010 +0200
+++ b/buildtools/autogen/setup.py Wed Sep 08 21:51:17 2010 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
diff -r 613974a28452 -r 5cb57bad7497 buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst Wed Sep 08 21:50:37 2010 +0200
+++ b/buildtools/doc/windowsbuild.rst Wed Sep 08 21:51:17 2010 +0200
@@ -196,7 +196,10 @@
Windows binary distribution.
On Windows64 you can use either the 32-bit or 64-bit version of
-Python.
+Python. However, if you're going to create an installer for the
+python component using ``python setup.py bdist_msi`` or ``python
+setup.py bdist_wininst``, you should use the version of Python for
+which you're creating the installer.
__ http://www.python.org/
diff -r 613974a28452 -r 5cb57bad7497 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Wed Sep 08 21:50:37 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Wed Sep 08 21:51:17 2010 +0200
@@ -570,7 +570,7 @@
static void
freeVariables(Client c, MalBlkPtr mb, MalStkPtr glb, int start)
{
- int i;
+ int i, j;
for (i = start; i < mb->vtop;) {
if (glb) {
@@ -585,6 +585,14 @@
i++;
}
mb->vtop = start;
+ for (i = j = 0; i < mb->ptop; i++) {
+ if (mb->prps[i].var < start) {
+ if (i > j)
+ mb->prps[j] = mb->prps[i];
+ j++;
+ }
+ }
+ mb->ptop = j;
}
/* #define _SQL_COMPILE */
diff -r 613974a28452 -r 5cb57bad7497 sql/src/sql/history.sql
--- a/sql/src/sql/history.sql Wed Sep 08 21:50:37 2010 +0200
+++ b/sql/src/sql/history.sql Wed Sep 08 21:51:17 2010 +0200
@@ -31,6 +31,10 @@
parse bigint, -- time in usec
optimize bigint -- time in usec
);
+update _tables
+ set system = true
+ where name = 'queryhistory'
+ and schema_id = (select id from schemas where name = 'sys');
-- Each query call is stored in the table callHistory using 'keepCall'.
-- At regular intervals the query history table should be cleaned.
@@ -57,10 +61,18 @@
inblock bigint, -- number of physical blocks read
oublock bigint -- number of physical blocks written
);
+update _tables
+ set system = true
+ where name = 'callhistory'
+ and schema_id = (select id from schemas where name = 'sys');
create view queryLog as
select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryHistory qd, callHistory ql
where qd.id = ql.id;
+update _tables
+ set system = true
+ where name = 'querylog'
+ and schema_id = (select id from schemas where name = 'sys');
-- the signature is used in the kernel, don't change it
create procedure keepQuery(
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
