Changeset: a05c428d8129 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a05c428d8129
Removed Files:
monetdb5/modules/mal/Tests/attach00.mal
monetdb5/modules/mal/Tests/attach00.stable.err
monetdb5/modules/mal/Tests/attach00.stable.out
monetdb5/modules/mal/attach.c
monetdb5/modules/mal/attach.h
monetdb5/modules/mal/attach.mal
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
debian/monetdb5-server.install
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_calc.c
gdk/gdk_storage.c
monetdb5/ChangeLog.Oct2012
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf_shredder.mx
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_recycle.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/batxml.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/pcre.mal
monetdb5/modules/mal/tokenizer.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_cluster.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_origin.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/scheduler/run_pipeline.c
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_emptyset.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_user.c
sql/common/sql_types.c
sql/scripts/09_like.sql
sql/server/Makefile.ag
sql/server/bin_optimizer.c
sql/server/rel_bin.c
sql/server/rel_bin.h
sql/server/rel_optimizer.c
sql/server/sql_rel2bin.c
sql/server/sql_rel2bin.h
sql/server/sql_statement.c
sql/server/sql_statement.h
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/storage/restrict/restrict_storage.c
sql/storage/restrict/restrict_table.c
sql/storage/sql_storage.h
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.sql
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/coalesce.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/trace.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/sql_xml/Tests/funcs.sql
Branch: lodrdf
Log Message:
Merge with the default branch
diffs (truncated from 12323 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -393,12 +393,6 @@
}
"Entry"
{
- "MsmKey" = "8:_73C1A2E428774320A035162BB0427503"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_740A0A7308D847629EAE5DA1A5A09B25"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2171,26 +2165,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_73C1A2E428774320A035162BB0427503"
- {
- "SourcePath" = "8:lib\\monetdb5\\attach.mal"
- "TargetName" = "8:attach.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_740A0A7308D847629EAE5DA1A5A09B25"
{
"SourcePath" = "8:stethoscope.bat"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -375,12 +375,6 @@
}
"Entry"
{
- "MsmKey" = "8:_7DF78105CD3F477BBF540F5878631C7D"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_7E6F0DD7ED2F472C836206FC14A644BE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2111,26 +2105,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DF78105CD3F477BBF540F5878631C7D"
- {
- "SourcePath" = "8:lib\\monetdb5\\attach.mal"
- "TargetName" = "8:attach.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7E6F0DD7ED2F472C836206FC14A644BE"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\10_math.sql"
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
@@ -200,7 +200,6 @@ BAT *BBPdescriptor(bat b);
int BBPdir(int cnt, bat *subcommit);
BATstore *BBPgetdesc(bat i);
void BBPhot(bat b);
-bat BBPimportEntry(char *nme);
int BBPin;
int BBPincref(bat b, int logical);
bat BBPindex(const char *nme);
@@ -704,7 +703,7 @@ str ALGfetchjoinestimate(int *result, in
str ALGfetchoid(int *ret, int *bid, oid *pos);
str ALGfind(ptr ret, int *bid, ptr val);
str ALGfragment(int *result, int *bid, ptr hlow, ptr hhigh, ptr tlow, ptr
thigh);
-str ALGgroupby(int *res, int *bid);
+str ALGgroupby(int *res, int *gids, int *cnts);
str ALGhashjoin(int *result, int *lid, int *rid);
str ALGhistogram(int *result, int *bid);
str ALGhistogram_rev(int *result, int *bid);
@@ -880,9 +879,6 @@ str ARRAYmultiply_sht_int(int *ret, int
str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
str ARRAYproduct(int *ret, int *bid, int *rid);
str ARRAYproject(int *ret, int *bid, int *cst);
-str ATTbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ATTbindPartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ATTlocation(str *fnme, int *bid);
str AUTHaddUser(oid *ret, Client *c, str *user, str *pass);
str AUTHchangePassword(Client *c, str *oldpass, str *passwd);
str AUTHchangeUsername(Client *c, str *olduser, str *newuser);
@@ -2571,7 +2567,6 @@ int discardBox(Box box, str name);
str disconnectRef;
int displayModule(stream *f, Module v, str fcn, int listing);
str divRef;
-str doneRef;
void dumpExceptionsToStream(stream *out, str msg);
void dumpHelpTable(stream *f, Module s, str text, int flag);
void dumpManual(stream *f, Module v, int recursive);
@@ -3012,7 +3007,7 @@ str recycleRef;
lng recycleSearchTime;
lng recycleTime;
lng recyclerUsedMemory;
-str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk, MalStkPtr env, InstrPtr pcicaller);
+str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
str refineRef;
str refine_reverseRef;
str registerRef;
@@ -3145,6 +3140,8 @@ int strWChrAt(int *res, str val, int *at
str streamsRef;
int stringLength(Client cntxt);
str stringdiff_impl(int *res, str *s1, str *s2);
+str subgroupRef;
+str subgroupdoneRef;
str sumRef;
str sunionRef;
int tableProp;
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -619,7 +619,8 @@ static void showcpu(void)
fprintf(gnudata,"set xrange [%f:%f]\n", (double)startrange,
((double)lastclktick-starttime));
fprintf(gnudata,"set yrange [0:%d.1]\n",cpus);
- fprintf(gnudata,"plot ");
+ if ( cpus)
+ fprintf(gnudata,"plot ");
for(i=0; i< cpus; i++)
fprintf(gnudata,"\"%s_cpu.dat\" using 1:($%d+%d) notitle with
lines linecolor rgb \"%s\"%s",
(inputfile?"scratch":filename), i+1, i, (i%2 == 0?
"black":"red"), (i<cpus-1?",\\\n":"\n"));
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -10,7 +10,6 @@ debian/tmp/usr/lib/monetdb5/alarm.mal us
debian/tmp/usr/lib/monetdb5/algebra.mal usr/lib/monetdb5
#debian/tmp/usr/lib/monetdb5/algebraExtensions.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/array.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/attach.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/bat*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/bbp.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/blob.mal usr/lib/monetdb5
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -807,8 +807,8 @@ typedef struct {
descdirty:1, /* bat descriptor dirty marker */
set:1, /* real set semantics */
restricted:2, /* access priviliges */
- persistence:2, /* should the BAT persist on disk? */
- unused:21; /* value=0 for now */
+ persistence:1, /* should the BAT persist on disk? */
+ unused:23; /* value=0 for now */
int sharecnt; /* incoming view count */
char map_head; /* mmap mode for head bun heap */
char map_tail; /* mmap mode for tail bun heap */
@@ -1449,13 +1449,11 @@ bat_iterator(BAT *b)
* dimensions.
*
* The persistency indicator tells the retention period of BATs. The
- * system support three modes: PERSISTENT, TRANSIENT, and SESSION.
+ * system support three modes: PERSISTENT and TRANSIENT.
* The PERSISTENT BATs are automatically saved upon session boundary
* or transaction commit. TRANSIENT BATs are removed upon transaction
- * boundary. SESSION BATs are removed at the end of a session. They
- * are normally used to maintain temporary results. All BATs are
- * initially TRANSIENT unless their mode is changed using the routine
- * BATmode.
+ * boundary. All BATs are initially TRANSIENT unless their mode is
+ * changed using the routine BATmode.
*
* The BAT properties may be changed at any time using BATkey, BATset,
* and BATmode.
@@ -1491,8 +1489,7 @@ gdk_export int BATgetaccess(BAT *b);
((b)->H->vheap?(b)->H->vheap->dirty:0) || \
((b)->T->vheap?(b)->T->vheap->dirty:0))
-#define PERSISTENT 3
-#define SESSION 2
+#define PERSISTENT 0
#define TRANSIENT 1
#define BAT_WRITE 0 /* all kinds of access allowed */
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2765,13 +2765,6 @@ BATmode(BAT *b, int mode)
}
BBPdirty(1);
- /* a SESSION bat is a TRANSIENT with one logical
- * reference added */
- if (mode == SESSION) {
- BBPincref(bid, TRUE);
- } else if (b->batPersistence == SESSION) {
- BBPdecref(bid, TRUE);
- }
if (mode == PERSISTENT && isVIEW(b)) {
VIEWreset(b);
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -779,8 +779,8 @@ vheapinit(COLrec *col, const char *buf,
return n;
}
-static BATstore *
-BBPreadEntries(FILE *fp, char *src, int *min_stamp, int *max_stamp, int
oidsize, int bbpversion)
+static void
+BBPreadEntries(FILE *fp, int *min_stamp, int *max_stamp, int oidsize, int
bbpversion)
{
bat bid = 0;
char buf[4096];
@@ -832,16 +832,13 @@ BBPreadEntries(FILE *fp, char *src, int
*s++ = DIR_SEP;
#endif
- if (src && strcmp(src, filename) != 0)
- continue;
-
bid = (bat) batid;
if ((bat) batid >= BBPsize) {
BBPsize = (bat) batid + 1;
if (BBPsize >= BBPlimit)
BBPextend(FALSE);
}
- if (src == 0 && BBP_desc(bid) != NULL)
+ if (BBP_desc(bid) != NULL)
GDKfatal("BBPinit: duplicate entry in BBP.dir.");
bs = GDKzalloc(sizeof(BATstore));
if (bs == NULL)
@@ -881,8 +878,6 @@ BBPreadEntries(FILE *fp, char *src, int
if (buf[nread] == ' ')
options = buf + nread + 1;
- if (src)
- return bs;
BBP_desc(bid) = bs;
BBP_status(bid) = BBPEXISTING; /* do we need other status
bits? */
if ((s = strchr(headname, '~')) != NULL && s == headname) {
@@ -910,62 +905,37 @@ BBPreadEntries(FILE *fp, char *src, int
BBP_refs(bid) = 0;
BBP_lrefs(bid) = 1; /* any BAT we encounter here is
persistent, so has a logical reference */
}
- return NULL;
}
static int
-BBPheader(FILE *fp, bat *limit, oid *BBPoid, int *OIDsize, int silent)
+BBPheader(FILE *fp, oid *BBPoid, int *OIDsize)
{
char buf[BUFSIZ];
int sz, bbpversion, ptrsize, oidsize;
char *s;
if (fgets(buf, sizeof(buf), fp) == NULL) {
- if (silent) {
- GDKerror("BBPinit: BBP.dir is empty");
- return -1;
- }
GDKfatal("BBPinit: BBP.dir is empty");
}
if (sscanf(buf, "BBP.dir, GDKversion %d\n", &bbpversion) != 1) {
GDKerror("BBPinit: old BBP without version number");
GDKerror("dump the database using a compatible version,");
GDKerror("then restore into new database using this
version.\n");
- if (silent)
- return -1;
exit(1);
}
if (bbpversion != GDKLIBRARY &&
bbpversion != GDKLIBRARY_SORTED_BYTE &&
bbpversion != GDKLIBRARY_CHR &&
bbpversion != GDKLIBRARY_PRE_VARWIDTH) {
- if (silent) {
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
