Changeset: 74cd321111c9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74cd321111c9
Added Files:
gdk/gdk_mapreduce.c
gdk/gdk_mapreduce.h
java/tests/Test_Csendthread.java
sql/jdbc/tests/Tests/Test_Csendthread.SQL.bat
sql/jdbc/tests/Tests/Test_Csendthread.SQL.sh
sql/jdbc/tests/Tests/Test_Csendthread.stable.err
sql/jdbc/tests/Tests/Test_Csendthread.stable.out
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.sql
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.err
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.sql
sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.err
sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
Removed Files:
sql/server/bin_optimizer.c
sql/server/bin_optimizer.h
Modified Files:
buildtools/autogen/autogen/am.py
clients/ChangeLog
clients/Tests/exports.stable.out
clients/mapiclient/Tests/msqldump--help.stable.err
clients/mapiclient/msqldump.1
clients/mapiclient/msqldump.c
clients/mapiclient/tomograph.c
configure.ag
debian/monetdb5-server.install
debian/monetdb5-sql.install
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_batop.c
gdk/gdk_group.c
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/tests/build.xml
monetdb5/extras/jaql/Tests/plan00.stable.out
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltests/Tests/calculations.stable.out
monetdb5/mal/Tests/tst274.stable.out
monetdb5/mal/Tests/tst601.mal
monetdb5/mal/Tests/tst601.stable.out
monetdb5/mal/mal_box.c
monetdb5/mal/mal_dataflow.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/const.mal
monetdb5/modules/mal/groups.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
monetdb5/optimizer/Tests/groups00.mal
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/LSST/lsst.h
sql/backends/monet5/LSST/lsst.mal
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/benchmarks/tpch/load.sh
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/39_analytics.sql
sql/server/rel_bin.c
sql/server/rel_select.c
sql/server/sql_rel2bin.c
sql/server/sql_statement.c
sql/server/sql_statement.h
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/Tests/trace_nogeom.stable.out
sql/test/bugs/Tests/crash_order_by.stable.err
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
testing/Mtest.py.in
Branch: rdf
Log Message:
Merge with default branch
diffs (truncated from 10621 to 300 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1133,7 +1133,7 @@ def am_includes(fd, var, values, am):
else:
incs = incs + " -I" + am_translate_dir(i, am) \
+ am_add_srcdir(i, am, " -I")
- fd.write("INCLUDES = " + incs + "\n")
+ fd.write("AM_CPPFLAGS = " + incs + "\n")
output_funcs = {'SUBDIRS': am_subdirs,
'EXTRA_DIST': am_extra_dist,
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,3 +1,8 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Nov 7 2012 Sjoerd Mullender <[email protected]>
+- msqldump: Implmented an option (--table/-t) to dump a single table.
+- Changed msqdump's trace option to be in line with mclient. In both
+ cases, the long option is --Xdebug and the short option is -X.
+
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
@@ -130,6 +130,7 @@ BAT *BAThash(BAT *b, BUN masksize);
BAT *BAThashjoin(BAT *l, BAT *r, BUN estimate);
BAT *BAThistogram(BAT *b);
BAT *BATins(BAT *b, BAT *c, bit force);
+BAT *BATintersectcand(BAT *a, BAT *b);
BAT *BATjoin(BAT *l, BAT *r, BUN estimate);
BAT *BATkdiff(BAT *b, BAT *c);
BAT *BATkey(BAT *b, int onoff);
@@ -144,6 +145,7 @@ BAT *BATmark_grp(BAT *b, BAT *g, oid *ba
BAT *BATmaterialize(BAT *b);
BAT *BATmaterializeh(BAT *b);
size_t BATmemsize(BAT *b, int dirty);
+BAT *BATmergecand(BAT *a, BAT *b);
BAT *BATmergejoin(BAT *l, BAT *r, BUN estimate);
int BATmmap(BAT *b, int hb, int tb, int hh, int th, int force);
BAT *BATmode(BAT *b, int onoff);
@@ -279,6 +281,7 @@ int HEAPextend(Heap *h, size_t size);
int HEAPfree(Heap *h);
size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
+void MRschedule(int taskcnt, void **arg, void( *cmd)(void *p));
int MT_check_nr_cores(void);
unsigned long long MT_clock(void);
int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum
MT_thr_detach d);
@@ -983,6 +986,7 @@ str BKCinsert_bat(int *r, int *bid, int
str BKCinsert_bat_force(int *r, int *bid, int *sid, bit *force);
char *BKCinsert_bun(int *r, int *bid, ptr h, ptr t);
char *BKCinsert_bun_force(int *r, int *bid, ptr h, ptr t, bit *force);
+str BKCintersectcand(bat *ret, bat *aid, bat *bid);
str BKCisCached(bit *res, int *bid);
str BKCisPersistent(bit *res, int *bid);
str BKCisSorted(bit *res, int *bid);
@@ -993,6 +997,7 @@ str BKCisaSet(bit *res, int *bid);
str BKCload(int *res, str *input);
str BKCmadvise(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp);
str BKCmadvise2(bit *res, int *bid, int *mode);
+str BKCmergecand(bat *ret, bat *aid, bat *bid);
str BKCmirror(int *ret, int *bid);
str BKCmmap(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp);
str BKCmmap2(bit *res, int *bid, int *bns);
@@ -1903,14 +1908,14 @@ str PCREexec_wrap(bit *res, pcre *patter
str PCREfromstr(str instr, int *l, pcre **val);
str PCREilike2(bit *ret, str *s, str *pat);
str PCREilike3(bit *ret, str *s, str *pat, str *esc);
-str PCREilike_join_pcre(int *ret, int *b, int *pat, str *esc);
+str PCREilike_join_pcre(int *l, int *r, int *b, int *pat, str *esc);
str PCREilike_select_pcre(int *ret, int *b, str *pat, str *esc);
str PCREilike_uselect_pcre(int *ret, int *b, str *pat, str *esc);
str PCREimatch(bit *ret, str *val, str *pat);
str PCREindex(int *ret, pcre *pat, str *val);
str PCRElike2(bit *ret, str *s, str *pat);
str PCRElike3(bit *ret, str *s, str *pat, str *esc);
-str PCRElike_join_pcre(int *ret, int *b, int *pat, str *esc);
+str PCRElike_join_pcre(int *l, int *r, int *b, int *pat, str *esc);
str PCRElike_select_pcre(int *ret, int *b, str *pat, str *esc);
str PCRElike_uselect_pcre(int *ret, int *b, str *pat, str *esc);
str PCRElikesubselect1(bat *ret, bat *bid, str *pat, str *esc, bit
*caseignore, bit *anti);
@@ -2565,7 +2570,6 @@ str deleteRef;
void deleteSymbol(Module scope, Symbol prg);
int deletesProp;
str deltaRef;
-str delta_projectRef;
str dense_rank_grpRef;
int depositBox(Box box, str name, int type, ValPtr val);
str depositRef;
@@ -2713,6 +2717,7 @@ int instrFilter(InstrPtr pci, str mod, s
str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base, size_t len);
str intRef;
+str intersectcandRef;
str ioRef;
str io_stderr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -2721,10 +2726,12 @@ int isAllScalar(MalBlkPtr mb, InstrPtr p
int isAmbiguousType(int type);
bit isBindInstr(InstrPtr p);
int isBlocking(InstrPtr p);
+int isDelta(InstrPtr q);
int isDependent(InstrPtr p, InstrPtr q);
int isDiffOp(InstrPtr q);
int isExceptionVariable(str nme);
int isFragmentGroup(InstrPtr q);
+int isFragmentGroup2(InstrPtr q);
int isIdentifier(str s);
int isInvariant(MalBlkPtr mb, int pcf, int pcl, int varid);
int isLoaded(str modulename);
@@ -2739,7 +2746,6 @@ int isOrderby(InstrPtr q);
int isPreloaded(str nme);
int isProcedure(MalBlkPtr mb, InstrPtr p);
int isProjection(InstrPtr p);
-int isSelect(InstrPtr p);
int isSideEffectFree(MalBlkPtr mb);
int isSlice(InstrPtr q);
int isTmpName(str n);
@@ -2748,7 +2754,6 @@ int isTypeName(str n);
int isUnsafeFunction(InstrPtr q);
int isUnsafeInstruction(InstrPtr q);
int isUpdateInstruction(InstrPtr p);
-int isUpdated(MalBlkPtr mb, int pc);
str iteratorRef;
str joinPathRef;
str joinRef;
@@ -2843,6 +2848,7 @@ str mdbTrap(Client cntxt, MalBlkPtr mb,
str mdbTrapClient(Client cntxt, MalBlkPtr mb1, MalStkPtr stk1, InstrPtr pc1);
int memoryclaims;
lng memorypool;
+str mergecandRef;
aggrFun minAggr;
str minRef;
str min_no_nilRef;
@@ -2979,6 +2985,7 @@ int profilerAvailable(void);
void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, int pc, int start);
str profilerRef;
str projectRef;
+str projectdeltaRef;
void promptInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
int flg);
InstrPtr pushArgument(MalBlkPtr mb, InstrPtr p, int varid);
InstrPtr pushArgumentId(MalBlkPtr mb, InstrPtr p, str name);
@@ -3004,6 +3011,7 @@ InstrPtr pushZero(MalBlkPtr mb, InstrPtr
str putName(str nme, size_t len);
str putRef;
str queryRef;
+str rankRef;
str rank_grpRef;
int rcachePolicy;
int readConsole(Client cntxt);
@@ -3153,9 +3161,17 @@ int strWChrAt(int *res, str val, int *at
str streamsRef;
int stringLength(Client cntxt);
str stringdiff_impl(int *res, str *s1, str *s2);
+str subcountRef;
+str subdeltaRef;
str subgroupRef;
str subgroupdoneRef;
+str submaxRef;
+str submedianRef;
+str subminRef;
+str subprodRef;
str subselectRef;
+str subsortRef;
+str subsumRef;
str sumRef;
str sunionRef;
int tableProp;
diff --git a/clients/mapiclient/Tests/msqldump--help.stable.err
b/clients/mapiclient/Tests/msqldump--help.stable.err
--- a/clients/mapiclient/Tests/msqldump--help.stable.err
+++ b/clients/mapiclient/Tests/msqldump--help.stable.err
@@ -18,11 +18,13 @@ Options are:
-u user | --user=user user id
-d database | --database=database database to connect to
-f | --functions dump functions
+ -t table | --table=table dump a database table
-D | --describe describe database
-N | --inserts use INSERT INTO statements
-q | --quiet don't print welcome message
- -t | --trace trace mapi network interaction
+ -X | --Xdebug trace mapi network interaction
-? | --help show this usage message
+--functions and --table are mutually exclusive
# 20:47:38 >
# 20:47:38 > Done.
diff --git a/clients/mapiclient/msqldump.1 b/clients/mapiclient/msqldump.1
--- a/clients/mapiclient/msqldump.1
+++ b/clients/mapiclient/msqldump.1
@@ -53,10 +53,13 @@ application.
\fB\-\-functions\fP (\fB\-f\fP)
Only dump functions definitions.
.TP
+\fB\-\-table=\fP\fItable\fP (\fB\-t\fP \fItable\fP)
+Only dump the specified \fItable\fP.
+.TP
\fB\-\-quiet\fP (\fB\-q\fP)
Don't print the welcome message.
.TP
-\fB\-\-trace\fP (\fB\-t\fP)
+\fB\-\-Xdebug\fP (\fB\-X\fP)
Trace network interaction between
.I mclient
and the server.
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -63,11 +63,13 @@ usage(const char *prog, int xit)
fprintf(stderr, " -u user | --user=user user id\n");
fprintf(stderr, " -d database | --database=database database to
connect to\n");
fprintf(stderr, " -f | --functions dump functions\n");
+ fprintf(stderr, " -t table | --table=table dump a database
table\n");
fprintf(stderr, " -D | --describe describe
database\n");
fprintf(stderr, " -N | --inserts use INSERT INTO
statements\n");
fprintf(stderr, " -q | --quiet don't print welcome
message\n");
- fprintf(stderr, " -t | --trace trace mapi network
interaction\n");
+ fprintf(stderr, " -X | --Xdebug trace mapi network
interaction\n");
fprintf(stderr, " -? | --help show this usage
message\n");
+ fprintf(stderr, "--functions and --table are mutually exclusive\n");
exit(xit);
}
@@ -93,14 +95,16 @@ main(int argc, char **argv)
struct stat statb;
stream *config = NULL;
char user_set_as_flag = 0;
+ char *table = NULL;
static struct option long_options[] = {
{"host", 1, 0, 'h'},
{"port", 1, 0, 'p'},
{"database", 1, 0, 'd'},
{"describe", 0, 0, 'D'},
{"functions", 0, 0, 'f'},
+ {"table", 1, 0, 't'},
{"inserts", 0, 0, 'N'},
- {"trace", 2, 0, 't'},
+ {"Xdebug", 2, 0, 'X'},
{"user", 1, 0, 'u'},
{"quiet", 0, 0, 'q'},
{"help", 0, 0, '?'},
@@ -190,12 +194,19 @@ main(int argc, char **argv)
useinserts = 1;
break;
case 'f':
+ if (table)
+ usage(argv[0], -1);
functions = 1;
break;
+ case 't':
+ if (table || functions)
+ usage(argv[0], -1);
+ table = optarg;
+ break;
case 'q':
quiet = 1;
break;
- case 't':
+ case 'X':
trace = MAPI_TRACE;
break;
case '?':
@@ -261,13 +272,16 @@ main(int argc, char **argv)
#endif
if ((p = strrchr(buf, '\n')) != NULL)
*p = 0;
- mnstr_printf(out, "-- msqldump %s %s %s\n",
+ mnstr_printf(out, "-- msqldump %s %s%s %s\n",
describe ? "describe" : "dump",
- functions ? "functions" : "database", buf);
+ functions ? "functions" : table ? "table " :
"database",
+ table ? table : "", buf);
dump_version(mid, out, "--");
}
if (functions)
c = dump_functions(mid, out, NULL, NULL);
+ else if (table)
+ c = dump_table(mid, NULL, table, out, describe, 1, useinserts);
else
c = dump_database(mid, out, describe, useinserts);
mnstr_flush(out);
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -440,8 +440,13 @@ struct COLOR{
{0,0,"mal","idle","white"},
{0,0,"mal","*","white"},
+ {0,0,"aggr","subcount","darkgreen"},
{0,0,"aggr","count","darkgreen"},
- {0,0,"aggr","sum","lawngreen"},
+ {0,0,"aggr","subsum","lawngreen"},
+ {0,0,"aggr","submin","lawngreen"},
+ {0,0,"aggr","min","lawngreen"},
+ {0,0,"aggr","submax","lawngreen"},
+ {0,0,"aggr","max","lawngreen"},
{0,0,"aggr","*","green"},
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
