MonetDB: default - Merge with Jun2010 branch.
Changeset: 419c11d5bfa7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=419c11d5bfa7
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (50 lines):
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/atoms/str.mx
--- a/MonetDB5/src/modules/atoms/str.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/atoms/str.mx Wed Jul 28 09:53:58 2010 +0200
@@ -295,6 +295,7 @@
str_export int strConcat(str *res, str s, ptr val, int t);
str_export int strLength(int *res, str s);
+str_export int strSQLLength(int *res, str s);
str_export int strBytes(int *res, str s);
str_export int strTail(str *res, str s, int *offset);
str_export int strSubString(str *res, str s, int *offset, int *length);
@@ -2183,6 +2184,16 @@
*Res = res;
return GDK_SUCCEED;
}
+int
+strSQLLength(int *res, str s)
+{
+ str r = NULL;
+ strRtrim(r, s);
+ strLength(res, r);
+ GDKfree(r);
+ return GDK_SUCCEED;
+}
+
@
@- Wrappers
Here you find the wrappers around the version 4 library code
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/kernel/batstr.mx
--- a/MonetDB5/src/modules/kernel/batstr.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batstr.mx Wed Jul 28 09:53:58 2010 +0200
@@ -37,6 +37,10 @@
address STRbatLength
comment Return the length of a string.;
+command batstr.stringlength( s:bat[:oid,:str] ) :bat[:oid,:int]
+address STRbatstringLength
+comment Return the length of a right trimed string.;
+
command batstr.nbytes( s:bat[:oid,:str] ) :bat[:oid,:int]
address STRbatBytes
comment Return the string length in bytes.;
@@ -264,6 +268,7 @@
@c
@:BATint(Length,strLength,str)@
+@:BATint(stringLength,strSQLLength,str)@
@:BATint(Bytes,strBytes,str)@
@= BATstr
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Replaced the stream_ prefix by mnstr_.
Changeset: a03cd9c551a1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a03cd9c551a1 Modified Files: MonetDB/src/common/stream.mx MonetDB/src/gdk/gdk_atoms.mx MonetDB/src/gdk/gdk_bbp.mx MonetDB/src/gdk/gdk_logger.mx MonetDB/src/gdk/gdk_posix.mx MonetDB/src/gdk/gdk_search.mx MonetDB/src/gdk/gdk_storage.mx MonetDB/src/gdk/gdk_utils.mx MonetDB4/src/mapi/mapi.mx MonetDB4/src/modules/contrib/array.mx MonetDB4/src/modules/contrib/oo7.mx MonetDB4/src/modules/contrib/vector.mx MonetDB4/src/modules/contrib/wisc.mx MonetDB4/src/modules/plain/ascii_io.mx MonetDB4/src/modules/plain/blob.mx MonetDB4/src/modules/plain/builtin.mx MonetDB4/src/modules/plain/enum.mx MonetDB4/src/modules/plain/streams.mx MonetDB4/src/monet/monet.mx MonetDB4/src/monet/monet_client.mx MonetDB4/src/monet/monet_deparse.mx MonetDB4/src/monet/monet_interpreter.mx MonetDB4/src/monet/monet_parse.mx MonetDB4/src/monet/monet_process.mx MonetDB4/src/monet/monet_queue.mx MonetDB4/src/tools/Tests/client.stable.out MonetDB4/src/tools/Tests/client.stable.out.64bit MonetDB4/src/tools/Tests/multiClientSeq.stable.out MonetDB4/src/tools/Tests/multiClientSeq.stable.out.64bit MonetDB5/src/compiler/mal_compiler.mx MonetDB5/src/mal/mal.mx MonetDB5/src/mal/mal_atom.mx MonetDB5/src/mal/mal_box.mx MonetDB5/src/mal/mal_client.mx MonetDB5/src/mal/mal_debugger.mx MonetDB5/src/mal/mal_exception.mx MonetDB5/src/mal/mal_factory.mx MonetDB5/src/mal/mal_function.mx MonetDB5/src/mal/mal_import.mx MonetDB5/src/mal/mal_instruction.mx MonetDB5/src/mal/mal_interpreter.mx MonetDB5/src/mal/mal_linker.mx MonetDB5/src/mal/mal_module.mx MonetDB5/src/mal/mal_namespace.mx MonetDB5/src/mal/mal_parser.mx MonetDB5/src/mal/mal_profiler.mx MonetDB5/src/mal/mal_readline.mx MonetDB5/src/mal/mal_recycle.mx MonetDB5/src/mal/mal_resolve.mx MonetDB5/src/mal/mal_scenario.mx MonetDB5/src/mal/mal_session.mx MonetDB5/src/modules/atoms/blob.mx MonetDB5/src/modules/atoms/streams.mx MonetDB5/src/modules/kernel/array.mx MonetDB5/src/modules/kernel/counters.mx MonetDB5/src/modules/mal/Tests/inspect05.stable.out MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows MonetDB5/src/modules/mal/bbp.mx MonetDB5/src/modules/mal/bpm.mx MonetDB5/src/modules/mal/cluster.mx MonetDB5/src/modules/mal/crackers/crackers_index.mx MonetDB5/src/modules/mal/crackers/crackers_updates.mx MonetDB5/src/modules/mal/groupby.mx MonetDB5/src/modules/mal/histogram.mx MonetDB5/src/modules/mal/language.mx MonetDB5/src/modules/mal/mal_io.mx MonetDB5/src/modules/mal/mal_mapi.mx MonetDB5/src/modules/mal/manual.mx MonetDB5/src/modules/mal/mdb.mx MonetDB5/src/modules/mal/mkey.mx MonetDB5/src/modules/mal/pcre.mx MonetDB5/src/modules/mal/rdf/rdf_shredder.mx MonetDB5/src/modules/mal/recycle.mx MonetDB5/src/modules/mal/remote.mx MonetDB5/src/modules/mal/replication.mx MonetDB5/src/modules/mal/tablet.mx MonetDB5/src/modules/mal/tablet_mk.mx MonetDB5/src/modules/mal/tablet_si.mx MonetDB5/src/modules/mal/tablet_sql.mx MonetDB5/src/modules/mal/tokenizer.mx MonetDB5/src/modules/mal/trader.mx MonetDB5/src/modules/mal/urlbox.mx MonetDB5/src/optimizer/opt_accumulators.mx MonetDB5/src/optimizer/opt_aliases.mx MonetDB5/src/optimizer/opt_coercion.mx MonetDB5/src/optimizer/opt_commonTerms.mx MonetDB5/src/optimizer/opt_constants.mx MonetDB5/src/optimizer/opt_costModel.mx MonetDB5/src/optimizer/opt_crack.mx MonetDB5/src/optimizer/opt_datacell.mx MonetDB5/src/optimizer/opt_datacyclotron.mx MonetDB5/src/optimizer/opt_dataflow.mx MonetDB5/src/optimizer/opt_deadcode.mx MonetDB5/src/optimizer/opt_derivepath.mx MonetDB5/src/optimizer/opt_dictionary.mx MonetDB5/src/optimizer/opt_emptySet.mx MonetDB5/src/optimizer/opt_evaluate.mx MonetDB5/src/optimizer/opt_garbageCollector.mx MonetDB5/src/optimizer/opt_history.mx MonetDB5/src/optimizer/opt_inline.mx MonetDB5/src/optimizer/opt_joinpath.mx MonetDB5/src/optimizer/opt_joinselect.mx MonetDB5/src/optimizer/opt_mapreduce.mx MonetDB5/src/optimizer/opt_mergetable.mx MonetDB5/src/optimizer/opt_mitosis.mx MonetDB5/src/optimizer/opt_multiplex.mx MonetDB5/src/optimizer/opt_octopus.mx
MonetDB: Jun2010 - Reduce the amount of space allocated
Changeset: 4cf4ab22910e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4cf4ab22910e
Modified Files:
MonetDB5/src/optimizer/opt_reorder.mx
Branch: Jun2010
Log Message:
Reduce the amount of space allocated
The dependency table was too large, expecting the worse.
diffs (35 lines):
diff -r b6c69da89ab1 -r 4cf4ab22910e MonetDB5/src/optimizer/opt_reorder.mx
--- a/MonetDB5/src/optimizer/opt_reorder.mx Wed Jul 28 08:15:21 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_reorder.mx Wed Jul 28 10:29:07 2010 +0200
@@ -102,11 +102,10 @@
}
for ( i=0; i mb-stop; i++){
- int cnt;
+ size_t cnt;
size_t slots;
p= getInstrPtr(mb,i);
- cnt = p-argc;
- slots = p-argc + i;
+ slots = 2 * p-argc;
block |= p-barrier != 0;
list[i]= (Node) GDKzalloc(sizeof(NodeRecord) + sizeof(int) *
slots);
if (list[i] == NULL){
@@ -116,12 +115,16 @@
GDKfree(var);
return 0;
}
- list[i]-cnt= p-argc;
+ cnt = p-argc;
if ( sqlRef == getModuleId(p) isUpdateInstruction(p)) {
int storage_read;
for ( storage_read = 0; i storage_read;
storage_read++) {
InstrPtr reading = getInstrPtr(mb,storage_read);
if ( sqlRef == getModuleId(reading) bindRef
== getFunctionId(reading)) {
+ if ( cnt == slots){
+ list[i]=
GDKrealloc(list[i],sizeof(NodeRecord) + sizeof(int) * (slots + 8));
+ slots += 8;
+ }
list[i]-stmt[cnt++] = storage_read;
}
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 696a19ff66a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=696a19ff66a7
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_align.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_setop.mx
MonetDB4/src/modules/contrib/oo7.mx
MonetDB5/src/optimizer/opt_reorder.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 323 to 300 lines):
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxWed Jul 28 13:21:44 2010 +0200
@@ -642,10 +642,13 @@
#define FATALcheck(tst,msg) if (tst) GDKfatal(msg);
#define ERRORcheck(tst,msg) if (tst) { GDKerror(msg); return 0; }
#define WARNcheck(tst, msg) if (tst) GDKwarning(msg)
-#define BATcheck(tst, msg)\
- if (tst == NULL) { \
- GDKerror(%s: BAT required.\n,msg);\
- return 0; \
+#define BATcheck(tst, msg)\
+ if (tst == NULL) { \
+ if (strchr(msg, ':')) \
+ GDKerror(%s.\n,msg); \
+ else\
+ GDKerror(%s: BAT required.\n,msg);\
+ return 0; \
}
/* needed for mel */
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_align.mx
--- a/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 13:21:44 2010 +0200
@@ -85,7 +85,7 @@
int
ALIGNcommit(BAT *b)
{
- BATcheck(b, ALIGNcommit: bat required);
+ BATcheck(b, ALIGNcommit);
if (!b-halign) {
b-halign = OIDnew(1);
}
@@ -98,7 +98,7 @@
int
ALIGNundo(BAT *b)
{
- BATcheck(b, ALIGNundo: bat required);
+ BATcheck(b, ALIGNundo);
return 0;
}
@@ -214,7 +214,7 @@
BAT *bn;
bat hp;
- BATcheck(h, VIEWhcreate: bat required);
+ BATcheck(h, VIEWhcreate);
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (bs == NULL)
bs = BATcreatedesc(h-htype, TYPE_void, FALSE);
@@ -264,8 +264,8 @@
BAT *bn;
bat hp = 0, tp = 0, vc = 0;
- BATcheck(h, VIEWcreate_: bat required);
- BATcheck(t, VIEWcreate_: bat required);
+ BATcheck(h, VIEWcreate_);
+ BATcheck(t, VIEWcreate_);
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (!bs)
bs = BATcreatedesc(h-htype, t-ttype, FALSE);
@@ -449,7 +449,7 @@
oid h, *x;
chr tshift;
- BATcheck(b, BATmaterialize: bat required);
+ BATcheck(b, BATmaterialize);
assert(!isVIEW(b));
ht = b-htype;
cnt = BATcapacity(b);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 13:21:44 2010 +0200
@@ -1149,7 +1149,7 @@
BAT *bm;
BATcheck(b, BUNins);
- BATcheck(h, BUNins: head value is nil\n);
+ BATcheck(h, BUNins: head value is nil);
countonly = (b-htype == TYPE_void b-ttype == TYPE_void);
bm = BBP_cache(-b-batCacheid);
@@ -1717,7 +1717,7 @@
BUN p;
BATcheck(b, BUNdel);
- BATcheck(x, BUNdel: head value is nil\n);
+ BATcheck(x, BUNdel: head value is nil);
if ((p = BUNlocate(b, x, y)) != BUN_NONE) {
ALIGNdel(b, BUNdel, force); /* zap alignment info */
@@ -1841,9 +1841,9 @@
{
BUN p;
- BATcheck(b, BUNreplace\n);
- BATcheck(h, BUNreplace: head value is nil\n);
- BATcheck(t, BUNreplace: tail value is nil\n);
+ BATcheck(b, BUNreplace);
+ BATcheck(h, BUNreplace: head value is nil);
+ BATcheck(t, BUNreplace: tail value is nil);
if ((p = BUNfnd(b, h)) == BUN_NONE)
return b;
@@ -1994,8 +1994,8 @@
BUN p, q;
BAT *v = NULL;
- BATcheck(b, BUNlocate: BAT parameter);
- BATcheck(x, BUNlocate: value parameter);
+ BATcheck(b, BUNlocate: BAT parameter required);
+ BATcheck(x, BUNlocate: value parameter required);
hcmp = BATatoms[b-htype].atomCmp;
tcmp = BATatoms[b-ttype].atomCmp;
p = BUNfirst(b);
@@ -3082,7 +3082,7 @@
bit isKey = FALSE;
BAT *parent;
- BATcheck(b, BATpropcheck: BAT parameter);
+ BATcheck(b, BATpropcheck);
if (b-halign == 0) {
b-batDirtydesc = 1;
b-halign = OIDnew(1);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_batop.mx
---
MonetDB: Jun2010 - fixed stable output according to changeset 85...
Changeset: 5b6cac055b7d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b6cac055b7d Modified Files: MonetDB5/src/modules/mal/Tests/mapi06.stable.out Branch: Jun2010 Log Message: fixed stable output according to changeset 85c1476037b7: normalise 'operation failed' messages diffs (12 lines): diff -r 986f42f7ac02 -r 5b6cac055b7d MonetDB5/src/modules/mal/Tests/mapi06.stable.out --- a/MonetDB5/src/modules/mal/Tests/mapi06.stable.out Wed Jul 28 13:20:29 2010 +0200 +++ b/MonetDB5/src/modules/mal/Tests/mapi06.stable.out Wed Jul 28 13:48:21 2010 +0200 @@ -25,7 +25,7 @@ io.print(done); mapi.disconnect(mid); end main; -!MALException:mapi.query:operation failed Remote error: TypeException:user.main[1]:'d' may not be used before being initialized +!MALException:mapi.query:operation failed: remote error: TypeException:user.main[1]:'d' may not be used before being initialized # 09:12:08 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merged stable output fix from Jun2010
Changeset: 8bb68df6d269 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bb68df6d269 Modified Files: Branch: default Log Message: merged stable output fix from Jun2010 diffs (12 lines): diff -r 696a19ff66a7 -r 8bb68df6d269 MonetDB5/src/modules/mal/Tests/mapi06.stable.out --- a/MonetDB5/src/modules/mal/Tests/mapi06.stable.out Wed Jul 28 13:21:44 2010 +0200 +++ b/MonetDB5/src/modules/mal/Tests/mapi06.stable.out Wed Jul 28 13:50:01 2010 +0200 @@ -25,7 +25,7 @@ io.print(done); mapi.disconnect(mid); end main; -!MALException:mapi.query:operation failed Remote error: TypeException:user.main[1]:'d' may not be used before being initialized +!MALException:mapi.query:operation failed: remote error: TypeException:user.main[1]:'d' may not be used before being initialized # 09:12:08 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Removed sql/src/benchmarks/uva directory.
Changeset: 8ea8a0911d47 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ea8a0911d47 Modified Files: sql/src/benchmarks/uva/c1.sql sql/src/benchmarks/uva/c2.sql sql/src/benchmarks/uva/c3.sql sql/src/benchmarks/uva/cees.txt sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegment_tab.txt sql/src/benchmarks/uva/cees/VxSegmentation_tab.txt sql/src/benchmarks/uva/cees/times sql/src/benchmarks/uva/count.sql sql/src/benchmarks/uva/drop.sql sql/src/benchmarks/uva/dump.sql sql/src/benchmarks/uva/j1.sql sql/src/benchmarks/uva/j2.sql sql/src/benchmarks/uva/j3.sql sql/src/benchmarks/uva/j4.sql sql/src/benchmarks/uva/journaal.txt sql/src/benchmarks/uva/journaal/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegment_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentation_tab.txt sql/src/benchmarks/uva/journaal/times sql/src/benchmarks/uva/load-cees.sql sql/src/benchmarks/uva/load-journaal.sql sql/src/benchmarks/uva/makeTables.sql sql/src/benchmarks/uva/run.all Branch: Jun2010 Log Message: Removed sql/src/benchmarks/uva directory. One of the files contains hard CR in the middle of lines which causes headaches with the Mercurial EOL extension. Also, these files have never been touched since they were initially checked in. diffs (truncated from 145745 to 300 lines): diff -r 5b6cac055b7d -r 8ea8a0911d47 sql/src/benchmarks/uva/c1.sql --- a/sql/src/benchmarks/uva/c1.sql Wed Jul 28 13:48:21 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,10 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Feyenoord'); - diff -r 5b6cac055b7d -r 8ea8a0911d47 sql/src/benchmarks/uva/c2.sql --- a/sql/src/benchmarks/uva/c2.sql Wed Jul 28 13:48:21 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,14 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0, - VxSegmentStringFeature_tab feat0_1 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Lazio Roma') AND - (feat0_1.segmentId = segment0.id) AND - (feat0_1.fieldName = 'type') AND - (feat0_1.value = 'Yellow'); - diff -r 5b6cac055b7d -r 8ea8a0911d47 sql/src/benchmarks/uva/c3.sql --- a/sql/src/benchmarks/uva/c3.sql Wed Jul 28 13:48:21 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,9 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'type') AND - (feat0_0.value = 'Goal'); diff -r 5b6cac055b7d -r 8ea8a0911d47 sql/src/benchmarks/uva/cees.txt --- a/sql/src/benchmarks/uva/cees.txt Wed Jul 28 13:48:21 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,28 +0,0 @@ -sqlplus cees/c...@csys - - -SQL @c1 - -ID --- - 20701 - 20703 - 20704 - - -SQL @c2 - -ID --- - 20711 - - -SQL @c3 - -ID --- - 20701 - 20702 - 20705 - 20709 - diff -r 5b6cac055b7d -r 8ea8a0911d47 sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt --- a/sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txtWed Jul 28 13:48:21 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,7610 +0,0 @@ - 1877,belief , .106383 - 1878,belief , .182927 - 1879,belief , .106383 - 1880,belief , .067 - 1881,belief , .0238095 - 1882,belief , .125 - 1883,belief , .272727 - 1884,belief , .486111 - 1885,belief , .0769231 - 1886,belief , .0952381 - 1887,belief , .67 - 1888,belief , .315789 - 1889,belief , .605263 - 1890,belief , .0952381 - 1891,belief ,
MonetDB: default - Merge with Jun2010 branch.
Changeset: 038a15cf73c4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038a15cf73c4 Modified Files: sql/src/benchmarks/uva/c1.sql sql/src/benchmarks/uva/c2.sql sql/src/benchmarks/uva/c3.sql sql/src/benchmarks/uva/cees.txt sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegment_tab.txt sql/src/benchmarks/uva/cees/VxSegmentation_tab.txt sql/src/benchmarks/uva/cees/times sql/src/benchmarks/uva/count.sql sql/src/benchmarks/uva/drop.sql sql/src/benchmarks/uva/dump.sql sql/src/benchmarks/uva/j1.sql sql/src/benchmarks/uva/j2.sql sql/src/benchmarks/uva/j3.sql sql/src/benchmarks/uva/j4.sql sql/src/benchmarks/uva/journaal.txt sql/src/benchmarks/uva/journaal/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegment_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentation_tab.txt sql/src/benchmarks/uva/journaal/times sql/src/benchmarks/uva/load-cees.sql sql/src/benchmarks/uva/load-journaal.sql sql/src/benchmarks/uva/makeTables.sql sql/src/benchmarks/uva/run.all Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 145745 to 300 lines): diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c1.sql --- a/sql/src/benchmarks/uva/c1.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,10 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Feyenoord'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c2.sql --- a/sql/src/benchmarks/uva/c2.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,14 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0, - VxSegmentStringFeature_tab feat0_1 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Lazio Roma') AND - (feat0_1.segmentId = segment0.id) AND - (feat0_1.fieldName = 'type') AND - (feat0_1.value = 'Yellow'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c3.sql --- a/sql/src/benchmarks/uva/c3.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,9 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'type') AND - (feat0_0.value = 'Goal'); diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees.txt --- a/sql/src/benchmarks/uva/cees.txt Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,28 +0,0 @@ -sqlplus cees/c...@csys - - -SQL @c1 - -ID --- - 20701 - 20703 - 20704 - - -SQL @c2 - -ID --- - 20711 - - -SQL @c3 - -ID --- - 20701 - 20702 - 20705 - 20709 - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt --- a/sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txtWed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,7610 +0,0 @@ - 1877,belief , .106383 - 1878,belief , .182927 - 1879,belief , .106383 - 1880,belief , .067 - 1881,belief , .0238095 - 1882,belief , .125 - 1883,belief , .272727 - 1884,belief , .486111 - 1885,belief , .0769231 - 1886,belief , .0952381 - 1887,belief , .67 - 1888,belief , .315789 - 1889,belief , .605263 - 1890,belief , .0952381 - 1891,belief , .263158 - 1892,belief , .0967742 - 1893,belief , .538462 - 1894,belief , .137931 - 1895,belief , .210526 - 1896,belief
