Changeset: 7ea13a2de9a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ea13a2de9a9
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_mapreduce.c
gdk/gdk_utils.c
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_properties.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/remote.c
sql/backends/monet5/vaults/mseed.c
sql/common/sql_types.h
sql/server/sql_scan.h
sql/server/sql_semantic.h
tools/merovingian/client/monetdb.c
Branch: Feb2013
Log Message:
English.
diffs (180 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1925,7 +1925,7 @@ int GDKatomcnt = TYPE_str + 1;
* unknown atoms is kept. These can be accessed via the ATOMunknown
* interface. Adding atoms to this set is done via the ATOMunknown_add
* function. Finding an (negative) atom index can be done via
- * ATOMunknown_find, which simply adds the atom if its not in the
+ * ATOMunknown_find, which simply adds the atom if it's not in the
* unknown set. The index van be used to find the name of an unknown
* ATOM via ATOMunknown_name. Once an atom becomes known, ie the
* module defining it is loaded, it should be removed from the unknown
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1087,7 +1087,7 @@ BBPexit(void)
skipped = 1;
continue;
}
- /* NIELS ?? Why reduce share count, its
done in VIEWdestroy !! */
+ /* NIELS ?? Why reduce share count,
it's done in VIEWdestroy !! */
if (isVIEW(b)) {
bat hp = VIEWhparent(b), tp =
VIEWtparent(b);
bat vhp = VIEWvhparent(b), vtp
= VIEWvtparent(b);
@@ -2148,7 +2148,7 @@ decref(bat i, int logical, int releaseSh
BBP_lastused(i) = sec;
} else if (b || (BBP_status(i) & BBPTMP)) {
/* bat will be unloaded now. set the UNLOADING bit
- * while locked so no other thread thinks its
+ * while locked so no other thread thinks it's
* available anymore */
assert((BBP_status(i) & BBPUNLOADING) == 0);
BATDEBUG {
diff --git a/gdk/gdk_mapreduce.c b/gdk/gdk_mapreduce.c
--- a/gdk/gdk_mapreduce.c
+++ b/gdk/gdk_mapreduce.c
@@ -39,7 +39,7 @@ typedef struct MRQUEUE {
static MRqueue *mrqueue;
static int mrqsize = -1; /* size of queue */
static int mrqlast = -1;
-static MT_Lock mrqlock; /* its a shared resource, ie we need
locks */
+static MT_Lock mrqlock; /* it's a shared resource, ie we need
locks */
static MT_Sema mrqsema; /* threads wait on empty queues */
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -857,7 +857,7 @@ GDKmmap(const char *path, int mode, size
}
ALLOCDEBUG fprintf(stderr, "#GDKmmap " SZFMT " " PTRFMT "\n", len,
PTRFMTCAST ret);
if (ret != (void *) -1L) {
- /* since mmap directly have content we say its zero-ed
+ /* since mmap directly have content we say it's zero-ed
* memory */
VALGRIND_MALLOCLIKE_BLOCK(ret, len, 0, 1);
meminc(len, "GDKmmap");
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -1181,9 +1181,9 @@ dumpcomp(jc *j, Client cntxt, MalBlkPtr
} else { /* var <cmp> var */
int lv[4] = {j->j2, j->j3, j->j4, 0}, *lp = lv;
/* FIXME: we need to check that a and b have at most one value
- * per elem here, further code assumes that, because its
+ * per elem here, further code assumes that, because it's
* semantically unclear what one should do with multiple values
- * per element (e.g. $.reviews[*].rating), in fact I believe its
+ * per element (e.g. $.reviews[*].rating), in fact I believe
it's
* impossible to say something useful about it */
q = newInstruction(mb, ASSIGNsymbol);
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -59,7 +59,7 @@ typedef struct queue {
int size; /* size of queue */
int last; /* last element in the queue */
FlowEvent *data;
- MT_Lock l; /* its a shared resource, ie we need locks */
+ MT_Lock l; /* it's a shared resource, ie we need locks */
MT_Sema s; /* threads wait on empty queues */
} queue;
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
@@ -303,7 +303,7 @@ PropertyIndex(str name)
return i;
}
MT_lock_set(&mal_contextLock, "propertyIndex");
- /* small change its already added */
+ /* small change it's already added */
for (i=0; i<nr_properties; i++) {
if (strcmp(properties[i], name) == 0) {
MT_lock_unset(&mal_contextLock, "propertyIndex");
diff --git a/monetdb5/modules/mal/profiler.h b/monetdb5/modules/mal/profiler.h
--- a/monetdb5/modules/mal/profiler.h
+++ b/monetdb5/modules/mal/profiler.h
@@ -22,7 +22,7 @@
* @+ Implementation
* The commands merely encapsulate the functionality provided by
* mal_profiler, which should be explicitly compiled with the kernel, because
- * its generates a noticable overhead.
+ * it generates a noticable overhead.
*/
#ifndef _PROFILER_
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -61,7 +61,7 @@
* in errors and possibly undefined behaviour.
*
* The resolve() function can be used to query Merovingian. It returns one
- * or more databases discovered in its vincinity matching the given pattern.
+ * or more databases discovered in its vicinity matching the given pattern.
*
*/
#include "monetdb_config.h"
diff --git a/sql/backends/monet5/vaults/mseed.c
b/sql/backends/monet5/vaults/mseed.c
--- a/sql/backends/monet5/vaults/mseed.c
+++ b/sql/backends/monet5/vaults/mseed.c
@@ -88,7 +88,7 @@
* Following, a limited number of files are loaded into the vault and analysed.
* The information extracted ends up in the catalog, and remains there forever.
* The underlying mseed file is not decrypted directly, it will be done as soon
- * as a query requests its.
+ * as a query requests it.
*
* A test sequence (after the vault directory has been populated)
* to populate the mseedcatalog.
diff --git a/sql/common/sql_types.h b/sql/common/sql_types.h
--- a/sql/common/sql_types.h
+++ b/sql/common/sql_types.h
@@ -67,7 +67,7 @@ extern list *funcs;
extern int bits2digits(int b);
extern int digits2bits(int d);
-extern int sql_type_convert(int form, int to); /* return 1, convert possible
but its a down cast, 2 convert possible can be done savely */
+extern int sql_type_convert(int form, int to); /* return 1, convert possible
but it's a down cast, 2 convert possible can be done savely */
extern int is_commutative(char *fnm); /* return 1, if commutative */
extern char *sql_bind_alias(char *alias);
diff --git a/sql/server/sql_scan.h b/sql/server/sql_scan.h
--- a/sql/server/sql_scan.h
+++ b/sql/server/sql_scan.h
@@ -38,7 +38,7 @@ struct scanner {
int yysval; /* start of current token */
int yyval; /* current token */
int yycur; /* next char in the queue */
- char yybak; /* sometimes its needed to write an EOS marker
*/
+ char yybak; /* sometimes it's needed to write an EOS marker
*/
int as; /* start of query part of view's etc */
int key; /* query hash */
int started; /* found at least one token */
diff --git a/sql/server/sql_semantic.h b/sql/server/sql_semantic.h
--- a/sql/server/sql_semantic.h
+++ b/sql/server/sql_semantic.h
@@ -78,7 +78,7 @@ extern void sql_destroy_args(mvc *sql);
extern void sql_add_param(mvc *sql, char *name, sql_subtype *st);
extern sql_arg *sql_bind_param(mvc *sql, char *name);
-/* once the type of the '?' parameters is known its set using the set_type
+/* once the type of the '?' parameters is known it's set using the set_type
* function */
extern int set_type_param(mvc *sql, sql_subtype *type, int nr);
extern void sql_destroy_params(mvc *sql); /* used in backend */
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -25,7 +25,7 @@
* A group of MonetDB servers in a dbfarm can be under control of
* Merovingian, a daemon which by itself does not allow any user
* interaction. The monetdb utility is designed to be the interface for
- * the DBA to the dbfarm and its vincinity. Creating or deleting
+ * the DBA to the dbfarm and its vicinity. Creating or deleting
* databases next to retrieving status information about them are the
* primary goals of this tool.
*/
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
