Changeset: 475f2c1a7b11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=475f2c1a7b11
Modified Files:
common/stream/stream.h
gdk/gdk_bat.mx
gdk/gdk_storage.c
monetdb5/mal/mal_debugger.mx
monetdb5/mal/mal_function.c
monetdb5/mal/mal_interpreter.mx
monetdb5/mal/mal_parser.mx
monetdb5/mal/mal_properties.c
monetdb5/modules/kernel/aggr.mx
monetdb5/modules/kernel/calc.mx
monetdb5/modules/mal/cluster.mx
monetdb5/modules/mal/mat.mx
monetdb5/modules/mal/replication.mx
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_joinpath.mx
monetdb5/optimizer/opt_multiplex.mx
monetdb5/optimizer/opt_pushranges.mx
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_emptyset.c
sql/backends/monet5/sql_scenario.c
sql/include/sql_list.h
sql/server/rel_select.c
sql/server/sql_semantic.c
Branch: Dec2011
Log Message:
English: sometimes you must use "then", sometimes "than".
diffs (truncated from 357 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
@@ -413,7 +413,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
@@ -1039,7 +1039,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.
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
@@ -362,7 +362,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)
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";
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.
* @-
* Post-optimization. After the join path has been constructed
* we could search for common subpaths. This heuristic is to
- * remove any pair which is used more then once.
+ * remove any pair which is used more than once.
* Inner paths are often foreign key walks.
* The heuristics is sufficient for the code produced by SQL frontend.
* The alternative is to search for all possible subpaths and materialize them.
@@ -306,7 +306,7 @@ OPTjoinPathImplementation(Client cntxt,
r= getInstrPtr(mb,pc[getArg(p,j)]);
/*
* @-
- * Don't inject a pattern when it is used more
then once.
+ * Don't inject a pattern when it is used more
than once.
*/
if (r && varcnt[getArg(p,j)] > 1){
OPTDEBUGjoinPath {
@@ -544,7 +544,7 @@ ALGjoinCost(Client cntxt, BAT *l, BAT *r
* lead to materialization of large views. This solved the earlier
* problem noticable on TPC-H that join order was producing slower
* results. Now, on TPCH-H, all queries run equal or better.
- * about 12 out of 84 joinpaths are improved with more then 10%.
+ * about 12 out of 84 joinpaths are improved with more than 10%.
* (affecting Q2, Q5, Q7, Q8,Q11,Q13)
*/
opt_export BAT * ALGjoinPathBody(Client cntxt, int top, BAT **joins, int flag);
diff --git a/monetdb5/optimizer/opt_multiplex.mx
b/monetdb5/optimizer/opt_multiplex.mx
--- a/monetdb5/optimizer/opt_multiplex.mx
+++ b/monetdb5/optimizer/opt_multiplex.mx
@@ -245,7 +245,7 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
/*
* @-
* This optimizer is directly called for the current routine.
- * It is more a code generator then an optimizer per se.
+ * It is more a code generator than an optimizer per se.
*/
opt_export int OPTmultiplexImplementation(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
opt_export str OPTmultiplexSimple(Client cntxt);
diff --git a/monetdb5/optimizer/opt_pushranges.mx
b/monetdb5/optimizer/opt_pushranges.mx
--- a/monetdb5/optimizer/opt_pushranges.mx
+++ b/monetdb5/optimizer/opt_pushranges.mx
@@ -62,7 +62,7 @@ All Rights Reserved.
*
* The range cascades should be limited to simple blocks.
* Furthermore, we should ensure that variables are not re-used
- * other then in side-effect functions.
+ * other than in side-effect functions.
*
* The aliasRemoval and constantExpression optimizers should
* have done their work. Empty scans are simply dropped,
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -493,7 +493,7 @@ BSKTthreshold(int *ret, str *tbl, int *s
if ( *sz < 0)
throw(MAL,"basket.threshold","Illegal value");
if ( *sz < baskets[bskt].winsize)
- throw(MAL,"basket.threshold","Threshold smaller then window
size");
+ throw(MAL,"basket.threshold","Threshold smaller than window
size");
baskets[bskt].threshold = *sz;
*ret = TRUE;
return MAL_SUCCEED;
diff --git a/sql/backends/monet5/datacell/petrinet.c
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -365,7 +365,7 @@ str PNtarget(int *ret, str *fcn, str *tb
}
/* check the routine for input/output relationships */
-/* Make sure we do not re-use the same source more then once */
+/* Make sure we do not re-use the same source more than once */
str
PNanalysis(Client cntxt, MalBlkPtr mb)
{
diff --git a/sql/backends/monet5/datacell/sensor.c
b/sql/backends/monet5/datacell/sensor.c
--- a/sql/backends/monet5/datacell/sensor.c
+++ b/sql/backends/monet5/datacell/sensor.c
@@ -109,7 +109,7 @@ static int delay = 1; /* intra batch del
static int batchsize = 1;
static int events = -1;
static int columns = 1;
-static int autoincrement = 1; /* if id != 0 then we increment and sent it
along */
+static int autoincrement = 1; /* if id != 0 then we increment and send it
along */
static int timestamp = 1; /*if (timestamp!=0) sensor sends also the tsmp */
static char *host = "localhost";
static int port = 50500;
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -124,7 +124,7 @@ comment "Generate an exception when b!=0
# This module also contains the definitions for managing an SQL database
schema in
# version 5. It is an adaptation of the original V4.3 code base.
# A main difference is that the global catalog is obtained from
-# the client record, rather then lookup the variable in a context stack.
+# the client record, rather than lookup the variable in a context stack.
#
# The MAL operations below are used in the SQL->MAL compiler and
# can be (sparingly) used to inspect it from a MIL console.
diff --git a/sql/backends/monet5/sql_emptyset.c
b/sql/backends/monet5/sql_emptyset.c
--- a/sql/backends/monet5/sql_emptyset.c
+++ b/sql/backends/monet5/sql_emptyset.c
@@ -37,7 +37,7 @@
* set would call for assessment on their effect.
*
* The end-result can be further optimized using alias removal.
- * However, this is less effective then in the normal pipeline, because
+ * However, this is less effective than in the normal pipeline, because
* the garbage collector has already injected additional NIL assignments.
*
* The purpose of this operation is to improve recycling, which
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1461,7 +1461,7 @@ SQLparser(Client c)
pushEndInstruction(c->curprg->def);
chkTypes(c->nspace, c->curprg->def, TRUE); /* resolve types */
- /* we know more in this case then
+ /* we know more in this case than
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
