Changeset: 7a1f3d09b34a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a1f3d09b34a
Added Files:
clients/python2/test/run.cmd
clients/python3/test/run.cmd
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out
Removed Files:
sql/Changelog.Feb2013
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/exports.stable.out
clients/mapiclient/Tests/tomograph--help.stable.err
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
debian/rules
gdk/gdk_bat.c
gdk/gdk_join.c
gdk/libbat.rc
libversions
monetdb5/mal/mal_client.h
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_stack.h
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.mal
monetdb5/modules/mal/recycle.c
monetdb5/optimizer/Tests/cst01.mal
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Feb2013
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.err
testing/Mtest.py.in
vertoo.data
Branch: rdf
Log Message:
Merge with default branch
diffs (truncated from 3215 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -521,3 +521,6 @@ fc0c9b319d2275215c283a7ece1d389e55b43217
0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root
7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5
df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+cb55e859a50e0d06a50cc9e4f6e377ddea7cc3aa Feb2013_7
+df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+e0139450d66e4fc02c7f5d1d9e6f92fc22d862df Feb2013_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -722,6 +722,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Apr 26 2013 Sjoerd Mullender <[email protected]> - 11.15.7-20130426
+- Rebuilt.
+
+* Sat Apr 13 2013 Niels Nes <[email protected]> - 11.15.7-20130426
+- sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
* Fri Apr 12 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
- Rebuilt.
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1258,6 +1258,7 @@ str CMDbbptoStr(Client cntxt, MalBlkPtr
str CMDbbptruncate(int *ret, int *bid, str *fnme);
str CMDcalcavg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcleanup(int *ret);
str CMDclearEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1298,7 +1299,6 @@ str CMDgetDiskReads(lng *ret);
str CMDgetDiskWrites(lng *ret);
str CMDgetEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetFootprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDgetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetPageSize(int *ret);
str CMDgetSystemTime(lng *ret);
str CMDgetTrace(int *res, str *ev);
@@ -1320,14 +1320,9 @@ str CMDsetAllProfiler(Client cntxt, MalB
str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
str CMDsetFootprintFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDsetIOTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetMemoryFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetMemoryTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDsetNoneProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetProfilerFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDsetThreadTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetTimerTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDsetoid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstartPointProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1603,16 +1598,9 @@ str MDBlist3(Client cntxt, MalBlkPtr mb,
str MDBlist3Detail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetBigfoot(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetDebug(int *ret, int *flg);
str MDBsetDebugStr(int *ret, str *nme);
-str MDBsetFlow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetIO(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetThread(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetTimer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBshowFlowGraph(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2012,16 +2000,16 @@ sht PropertyIndex(str name);
str PropertyName(sht idx);
prop_op_t PropertyOperator(str s);
str PropertyOperatorString(prop_op_t op);
-str QLOGcall(int *ret, oid *idx, lng *tick1, lng *tick2, str *arg, wrd
*tuples, lng *xtime, lng *rtime, int *cpu, int *iowait, lng *space);
+str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
void QLOGcalls(BAT **r);
void QLOGcatalog(BAT **r);
-str QLOGdefine(oid *ret, oid *idx, str *q, str *pipe, lng *optimize, str *usr,
lng *tick, int *mal);
-str QLOGdone(int *ret);
-str QLOGinit(int *ret);
-str QLOGinitThreshold(int *ret, int *threshold);
+str QLOGdefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str QLOGdisable(int *ret);
+str QLOGempty(int *ret);
+str QLOGenable(int *ret);
+str QLOGenableThreshold(int *ret, int *threshold);
int QLOGisset(void);
str QLOGissetFcn(int *ret);
-str QLOGreset(int *ret);
str QOTclrdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str QOTdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str QOTgetStatistics(int *ret, str *nme);
@@ -2030,6 +2018,7 @@ str QOTshowFlowGraph(Client cntxt, MalBl
str QOTshowPlan(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
void QOTstatisticsExit(void);
void QOTupdateStatistics(str nme, int prop, lng val);
+QueryQueue QRYqueue;
str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2251,6 +2240,10 @@ str STRsubstring(str *ret, str *s, int *
str STRsubstringTail(str *ret, str *s, int *start);
str STRsuffix(str *ret, str *s, int *l);
str STRtostr(str *res, str *src);
+str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SYScpuStatistics(int *ret, int *ret2);
str SYSgdkEnv(int *ret, int *ret2);
str SYSgdkThread(int *ret, int *ret2);
@@ -2599,6 +2592,7 @@ str getName(str nme, size_t len);
int getPC(MalBlkPtr mb, InstrPtr p);
str getPipeCatalog(int *nme, int *def, int *stat);
str getPipeDefinition(str name);
+int getProfileCounter(int idx);
stream *getProfilerStream(void);
str getRef;
str getRefName(MalBlkPtr mb, int i);
@@ -2796,6 +2790,7 @@ str mergecandRef;
aggrFun minAggr;
str minRef;
str min_no_nilRef;
+str minusRef;
str mirrorRef;
str mitosisRef;
str mkeyRef;
@@ -2999,6 +2994,7 @@ str replicatorRef;
void resetMalBlk(MalBlkPtr mb, int stop);
void resetScenario(Client c);
void resetVarName(MalBlkPtr mb, int i);
+void resizeMalBlk(MalBlkPtr mb, int maxstmt, int maxvar);
int resolveType(int dsttype, int srctype);
str resultSetRef;
int reusePolicy;
@@ -3019,7 +3015,8 @@ str runScenario(Client c);
int runonceProp;
void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int stkpc,
RuntimeProfile prof, int start);
void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, RuntimeProfile prof);
-void runtimeProfileInit(MalBlkPtr mb, RuntimeProfile prof, int initmemory);
+void runtimeProfileFinish(Client cntxt, MalBlkPtr mb);
+void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int safetyBarrier(InstrPtr p, InstrPtr q);
int saveBox(Box box, int flag);
@@ -3084,7 +3081,6 @@ str sqlRef;
int sqlblob_fromstr(char *instr, int *l, blob **val);
int sqlblob_tostr(str *tostr, int *l, blob *p);
int sqlfunctionProp;
-str sqlplusRef;
str srvpoolRef;
int stableProp;
str startProfiling(void);
diff --git a/clients/mapiclient/Tests/tomograph--help.stable.err
b/clients/mapiclient/Tests/tomograph--help.stable.err
--- a/clients/mapiclient/Tests/tomograph--help.stable.err
+++ b/clients/mapiclient/Tests/tomograph--help.stable.err
@@ -20,6 +20,7 @@ tomograph [options]
-s | --sql=<single sql expression>
-t | --trace=<tomograph trace filename>
-r | --range=<starttime>-<endtime>[ms,s]
+ -i | --input=<profiler event file >
-o | --output=<file prefix > (default 'tomograph'
-b | --beat=<delay> in milliseconds (default 50)
-B | --batch=<number> of combined queries
diff --git a/clients/python2/test/run.cmd b/clients/python2/test/run.cmd
new file mode 100644
--- /dev/null
+++ b/clients/python2/test/run.cmd
@@ -0,0 +1,8 @@
+set TSTDB=demo
+set TSTHOSTNAME=localhost
+set TSTUSERNAME=monetdb
+set TSTPASSWORD=monetdb
+set TSTDEBUG=no
+
+nosetests ./runtests.py
+nosetests ./test_control.py
diff --git a/clients/python3/test/run.cmd b/clients/python3/test/run.cmd
new file mode 100644
--- /dev/null
+++ b/clients/python3/test/run.cmd
@@ -0,0 +1,8 @@
+set TSTDB=demo
+set TSTHOSTNAME=localhost
+set TSTUSERNAME=monetdb
+set TSTPASSWORD=monetdb
+set TSTDEBUG=no
+
+nosetests ./runtests.py
+nosetests ./test_control.py
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Fri, 26 Apr 2013 13:09:55 +0200
+
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
+ -- Niels Nes <[email protected]> Sat, 13 Apr 2013 13:09:54 +0200
+
monetdb (11.15.5-20130412) unstable; urgency=low
* Rebuilt.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -48,13 +48,13 @@ override_dh_auto_configure:
# currently the test suite fails
override_dh_auto_test:
-override_dh_auto_install:
- dh_auto_install
- cd clients/python2 && python setup.py install
--root=$(CURDIR)/debian/tmp --install-layout=deb
- cd clients/python3 && python3 setup.py install
--root=$(CURDIR)/debian/tmp --install-layout=deb
-
override_dh_clean:
dh_clean
cd clients/python2 && python setup.py clean
cd clients/python3 && python3 setup.py clean
+override_dh_python2:
+ dh_python2 clients/python2
+
+override_dh_python3:
+ dh_python3 clients/python3
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2812,6 +2812,7 @@ BATassertHeadProps(BAT *b)
q = BUNlast(b);
assert(b->H->heap.size <= b->H->heap.maxsize);
+ assert(b->H->heap.free >= headsize(b, BUNlast(b)));
if (b->htype != TYPE_void) {
assert(b->batCount <= b->batCapacity);
assert(b->H->heap.size >= b->H->heap.free);
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -84,11 +84,13 @@ joininitresults(BAT **r1p, BAT **r2p, BU
r1->tkey = 1;
r1->tsorted = 1;
r1->trevsorted = 1;
+ r1->tdense = 1;
r2->T->nil = 0;
r2->T->nonil = 1;
r2->tkey = 1;
r2->tsorted = 1;
r2->trevsorted = 1;
+ r2->tdense = 1;
*r1p = r1;
*r2p = r2;
return GDK_SUCCEED;
@@ -102,38 +104,64 @@ joininitresults(BAT **r1p, BAT **r2p, BU
* (lo inclusive, hi not inclusive) in rvals/rvars.
* If last is set, return the index of the first value > v; if last is
* not set, return the index of the first value >= v.
- * If reverse is -1, the values are sorted in reverse order and hence
+ * If ordering is -1, the values are sorted in reverse order and hence
* all comparisons are reversed.
*/
static BUN
binsearch(const oid *rcand, oid offset,
const char *rvals, const char *rvars,
int rwidth, BUN lo, BUN hi, const char *v,
- int (*cmp)(const void *, const void *), int reverse, int last)
+ int (*cmp)(const void *, const void *), int ordering, int last)
{
BUN mid;
int c;
- assert(reverse == 1 || reverse == -1);
+ assert(ordering == 1 || ordering == -1);
assert(lo < hi);
--hi; /* now hi is inclusive */
- if ((c = reverse * cmp(VALUE(r, rcand ? rcand[lo] - offset : lo), v)) >
0 ||
+ if ((c = ordering * cmp(VALUE(r, rcand ? rcand[lo] - offset : lo), v))
> 0 ||
(!last && c == 0))
return lo;
- if ((c = reverse * cmp(VALUE(r, rcand ? rcand[hi] - offset : hi), v)) <
0 ||
+ if ((c = ordering * cmp(VALUE(r, rcand ? rcand[hi] - offset : hi), v))
< 0 ||
(last && c == 0))
return hi + 1;
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
