Changeset: 1166bee3d1ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1166bee3d1ae
Modified Files:
gdk/gdk_bat.mx
monetdb5/mal/mal_function.c
monetdb5/mal/mal_interpreter.mx
monetdb5/optimizer/opt_joinpath.mx
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_scenario.c
sql/server/rel_select.c
Branch: default
Log Message:
Merge from Dec2011 branch.
diffs (truncated from 520 to 300 lines):
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -199,7 +199,7 @@ stream_export buffer *mnstr_get_buffer(s
Block stream is a stream which sends data in blocks of a known
size (BLOCK size or dynamically changed using CHANGE_BLOCK_SIZE msg).
- A block is written once more then BLOCK size data has been written using
+ A block is written once more than BLOCK size data has been written using
the write commands or when the flush command is sent.
All full blocks together with a single not full block form a major
diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -412,7 +412,7 @@ BATclone(BAT *b, BUN cap)
* it is rather difficult to give a precise estimate of the required space.
* The routine BATguess is used internally for this purpose.
* It balances the cost of small BATs with their probability of occurrence.
- * Small results BATs are more likely then 100M BATs.
+ * Small results BATs are more likely than 100M BATs.
*
* Likewise, the routines Hgrows and Tgrows provides a heuristic to enlarge
the space.
*/
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -261,7 +261,7 @@ GDKsave(const char *nme, const char *ext
* updating the image on disk.
*
* Maybe it is better to make use of MT_msync(). But
- * then, we would need to bring in a backup mechanism,
+ * then we would need to bring in a backup mechanism,
* in which stable images of the BATs are created at
* commit-time.
*/
@@ -693,7 +693,7 @@ BATload_intern(bat i, int lock)
* @- BAT preload
* To avoid random disk access to large (memory-mapped) BATs it may
* help to issue a preload request. Of course, it does not make sense
- * to touch more then we can physically accomodate (budget).
+ * to touch more than we can physically accomodate (budget).
*/
/* quick and probabilistic test for a sequentially correlated heap */
static int
diff --git a/monetdb5/mal/mal_debugger.mx b/monetdb5/mal/mal_debugger.mx
--- a/monetdb5/mal/mal_debugger.mx
+++ b/monetdb5/mal/mal_debugger.mx
@@ -2036,7 +2036,7 @@ if(h && h->mask){
* the usage of memory by BAT information. The characters are interpreted
* as follows:
* .=unused, X=completely used, [0-9]=small elements within the granule
- * More then 9 elements makes it full.
+ * More than 9 elements makes it full.
@= setVector
start= (((long)@1)-min)/granule;
lim= (((long)@1)-min + @2)/granule;
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -96,7 +96,7 @@ InstrPtr newCall(Module scope, str fcnna
/*
* @-
* Optimizers may be interested in the function definition
- * for obtaining properties. Rather then polution of the
+ * for obtaining properties. Rather than polution of the
* instruction record with a scope reference, we use a lookup function until it
* becomes a performance hindrance.
*/
diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -547,7 +547,24 @@ workslow:
@:endProfile(stk)@
}
}
- @:MALwrapup@
+ if (exceptionVar >= 0) {
+ if (ret) {
+ str oldret = ret;
+ ret = createScriptException(mb, mb->stop - 1,
+ getExceptionType(getVarName(mb, exceptionVar)),
+ ret, "Exception not caught");
+ FREE_EXCEPTION(oldret);
+ } else {
+ if (stk->stk[exceptionVar].vtype == TYPE_str) {
+ ret = createScriptException(mb, mb->stop - 1,
MAL,
+ stk->stk[exceptionVar].val.sval,
+ "Exception not caught");
+ } else {
+ ret = createScriptException(mb, mb->stop - 1,
MAL,
+ NULL, "Exception not caught");
+ }
+ }
+ }
GDKfree(backup);
GDKfree(sbackup);
GDKfree(garbage);
@@ -1039,7 +1056,7 @@ DFLOWstep(FlowTask *t, FlowStatus fs)
/*
* @-
* A consequence of multiple threads is that they may claim more
- * space then available. This may cause GDKmalloc to fail.
+ * space than available. This may cause GDKmalloc to fail.
* In many cases this situation will be temporary, because
* threads will ultimately release resources.
* Therefore, we wait for it.
@@ -1517,26 +1534,6 @@ str runMALprocess(Client cntxt, MalBlkPt
return MAL_SUCCEED;
}
-@= MALwrapup
- if (exceptionVar >= 0) {
- if (ret) {
- str oldret = ret;
- ret = createScriptException(mb, mb->stop - 1,
- getExceptionType(getVarName(mb, exceptionVar)),
- ret, "Exception not caught");
- FREE_EXCEPTION(oldret);
- } else {
- if (stk->stk[exceptionVar].vtype == TYPE_str) {
- ret = createScriptException(mb, mb->stop - 1,
MAL,
- stk->stk[exceptionVar].val.sval,
- "Exception not caught");
- } else {
- ret = createScriptException(mb, mb->stop - 1,
MAL,
- NULL, "Exception not caught");
- }
- }
- }
-@
@h
/*
* @+ Safeguarding
diff --git a/monetdb5/mal/mal_parser.mx b/monetdb5/mal/mal_parser.mx
--- a/monetdb5/mal/mal_parser.mx
+++ b/monetdb5/mal/mal_parser.mx
@@ -98,10 +98,6 @@ mal_export long position(Client cntxt);
#define FATALINPUT MAXERRORS+1
#define NL(X) ((X)=='\n' || (X)=='\r')
-static str idCopy(Client cntxt, int len);
-static str strCopy(Client cntxt, int len);
-
-
void echoInput(Client cntxt)
{
if (cntxt->listing == 1) {
@@ -223,7 +219,7 @@ typeidLength(Client cntxt)
return l;
}
-str idCopy(Client cntxt, int length){
+static str idCopy(Client cntxt, int length){
str s= GDKmalloc(length+1);
if ( s == NULL)
return NULL;
@@ -346,7 +342,7 @@ stringLength(Client cntxt)
* Beware, the idcmp routine uses a short cast to compare multiple bytes
* at once. This may cause problems when the net string length is zero.
*/
-str strCopy(Client cntxt, int length){
+static str strCopy(Client cntxt, int length){
str s;
int i;
@@ -362,7 +358,7 @@ str strCopy(Client cntxt, int length){
* @-
* And a similar approach is used for operator names.
* A lookup table is considered, because it generally is
- * faster then a non-dense switch.
+ * faster than a non-dense switch.
*/
int
operatorLength(Client cntxt)
@@ -621,8 +617,6 @@ handleInts:
return 0;
}
-#define cstCopy(C,I) idCopy(C,I)
-
/*
* @- Type qualifier
* Types are recognized as identifiers preceded by a colon.
diff --git a/monetdb5/mal/mal_properties.c b/monetdb5/mal/mal_properties.c
--- a/monetdb5/mal/mal_properties.c
+++ b/monetdb5/mal/mal_properties.c
@@ -175,7 +175,7 @@
* ]
*
* Aside, it may be valuable to collect information on e.g. the execution time
- * of functions as a basis for future optimizations. Rather then cluttering the
+ * of functions as a basis for future optimizations. Rather than cluttering the
* property section, it makes sense to explicitly update this information in
* a catalog.
* @+ Properties at the MAL level
diff --git a/monetdb5/modules/kernel/aggr.mx b/monetdb5/modules/kernel/aggr.mx
--- a/monetdb5/modules/kernel/aggr.mx
+++ b/monetdb5/modules/kernel/aggr.mx
@@ -176,7 +176,7 @@ address AX3count_no_nil3;
/*
* @-
* In case the group OIDs span a range of more than SMALL_AGGR_MAX,
- * but the number of groups is less then SCAN_AGGR_MAX,
+ * but the number of groups is less than SCAN_AGGR_MAX,
* we use (backward-) "scan"-lookup (unrolled implementation exploiting
* fall-through in C's switch statment) instead of hash-lookup,
* as the latter turned out to be rather expensive ...
diff --git a/monetdb5/modules/kernel/calc.mx b/monetdb5/modules/kernel/calc.mx
--- a/monetdb5/modules/kernel/calc.mx
+++ b/monetdb5/modules/kernel/calc.mx
@@ -1648,7 +1648,7 @@ str @1SetoidImpl(str *ret, @1 *v){
/*
* @-
- * Type conversion template. Only allowed then no information is lost.
+ * Type conversion template. Only allowed when no information is lost.
*/
@= coercionImpl
calc_export str @1From@2Impl(@1 *res, @2 *val);
diff --git a/monetdb5/modules/mal/cluster.mx b/monetdb5/modules/mal/cluster.mx
--- a/monetdb5/modules/mal/cluster.mx
+++ b/monetdb5/modules/mal/cluster.mx
@@ -945,7 +945,7 @@ CLS_map2(bat *RB, bat *PSUM, bat *CMAP,
}
if (cmap->tsorted) {
/* input to cluster was sorted, ie nothing to do here
- then to return the input */
+ than to return the input */
BBPunfix(*PSUM);
BBPunfix(*CMAP);
BBPkeepref(*RB = b->batCacheid);
diff --git a/monetdb5/modules/mal/mat.mx b/monetdb5/modules/mal/mat.mx
--- a/monetdb5/modules/mal/mat.mx
+++ b/monetdb5/modules/mal/mat.mx
@@ -36,7 +36,7 @@ All Rights Reserved.
* Normally all mat.new() operations are removed by the
* mergetable optimizer.
* In case a mat.new() is retained in the code, then it will
- * behaves as a mat.pack();
+ * behave as a mat.pack();
*
* The primitives below are chosen to accomodate the SQL
* front-end to produce reasonable efficient code.
diff --git a/monetdb5/modules/mal/replication.mx
b/monetdb5/modules/mal/replication.mx
--- a/monetdb5/modules/mal/replication.mx
+++ b/monetdb5/modules/mal/replication.mx
@@ -72,7 +72,7 @@ All Rights Reserved.
* table it closed the log stream.
*
* The function freezeSlaves() removes the log files and makes sure that all
- * existing slaves won't be able to catch up other then by re-initializing the
+ * existing slaves won't be able to catch up other than by re-initializing the
* database using e.g. a checkpoint.
* @verbatim
* CREATE PROCEDURE suspendSync() EXTERNAL NAME slave."stop";
@@ -942,7 +942,7 @@ The master has to assume that the slave
*/
static struct MASTERrecord {
str uri;
- oid tag; /* next one to sent */
+ oid tag; /* next one to send */
Mapi m;
time_t last_connect;
time_t last_disconnect;
@@ -964,7 +964,7 @@ MASTERsend(void *arg)
/* find the last replication log file */
master = GDKgetenv_istrue("replication_master") &&
GDKgetenv("replication_slave") == NULL;
- /* If the slave starts from scratch, it will sent the 0-tag.
+ /* If the slave starts from scratch, it will send the 0-tag.
* This can simply be replaced by the lowest number known. But,
* then the slave should use the BATmax option instead of the
* BATcount to determine the tag. */
@@ -1012,7 +1012,7 @@ MASTERsend(void *arg)
mal_set_lock(repLck, "replication");
if (repFile)
mnstr_flush(repFile);
- /* The tricky part of the block wise read is to ensure we sent
+ /* The tricky part of the block wise read is to ensure we send
* proper newline terminated commands. Moreover, we would not
* like to block due to sending for old files. */
/* read the complete file [now trimmed to 64KB]*/
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1570,7 +1570,7 @@ tablet_read_more(bstream *in, stream *ou
* positioned correctly at the reading position. The start and limit
* indicates the byte range to search for tuples.
* If start> 0 then we first skip to the next record separator.
- * If necessary we read more then 'limit' bytes to ensure parsing a complete
+ * If necessary we read more than 'limit' bytes to ensure parsing a complete
* record and stop at the record boundary.
* Beware, we should allocate Tablet descriptors for each file segment,
* otherwise we end up with a gross concurrency control problem.
diff --git a/monetdb5/optimizer/opt_joinpath.mx
b/monetdb5/optimizer/opt_joinpath.mx
--- a/monetdb5/optimizer/opt_joinpath.mx
+++ b/monetdb5/optimizer/opt_joinpath.mx
@@ -130,7 +130,7 @@ comment "Routine to handle join paths.
* @-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
