Changeset: 952bce38bee3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=952bce38bee3
Modified Files:
clients/Tests/exports.stable.out
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/SQLConnect.c
sql/common/sql_types.c
sql/common/sql_types.h
sql/server/sql_mvc.c
sql/server/sql_mvc.h
testing/Mtest.py.in
Branch: Apr2019
Log Message:
Some cosmetic changes.
diffs (161 lines):
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
@@ -574,7 +574,7 @@ int64_t mapi_rows_affected(MapiHdl hdl);
MapiMsg mapi_seek_row(MapiHdl hdl, int64_t rowne, int whence);
MapiHdl mapi_send(Mapi mid, const char *cmd);
MapiMsg mapi_setAutocommit(Mapi mid, bool autocommit);
-MapiMsg mapi_set_size_header(Mapi mid, int value);
+MapiMsg mapi_set_size_header(Mapi mid, bool value);
void mapi_setfilecallback(Mapi mid, char *(*getfunc)(void *priv, const char
*filename, bool binary, uint64_t offset, size_t *size), char *(*putfunc)(void
*priv, const char *filename, const void *data, size_t size), void *priv);
int mapi_split_line(MapiHdl hdl);
MapiMsg mapi_start_talking(Mapi mid);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -3568,7 +3568,7 @@ mapi_setAutocommit(Mapi mid, bool autoco
}
MapiMsg
-mapi_set_size_header(Mapi mid, int value)
+mapi_set_size_header(Mapi mid, bool value)
{
if (mid->languageId != LANG_SQL) {
mapi_setError(mid, "size header only supported in SQL",
"mapi_set_size_header", MERROR);
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -148,7 +148,7 @@ mapi_export bool mapi_get_trace(Mapi mid
mapi_export bool mapi_get_autocommit(Mapi mid);
mapi_export MapiMsg mapi_log(Mapi mid, const char *nme);
mapi_export MapiMsg mapi_setAutocommit(Mapi mid, bool autocommit);
-mapi_export MapiMsg mapi_set_size_header(Mapi mid, int value);
+mapi_export MapiMsg mapi_set_size_header(Mapi mid, bool value);
mapi_export MapiMsg mapi_release_id(Mapi mid, int id);
mapi_export const char *mapi_result_error(MapiHdl hdl);
mapi_export const char *mapi_result_errorcode(MapiHdl hdl);
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -261,7 +261,7 @@ MNDBConnect(ODBCDbc *dbc,
mapi_setAutocommit(mid, dbc->sql_attr_autocommit ==
SQL_AUTOCOMMIT_ON);
set_timezone(mid);
get_serverinfo(dbc);
- mapi_set_size_header(mid, 1);
+ mapi_set_size_header(mid, true);
/* set timeout after we're connected */
mapi_timeout(mid, dbc->sql_attr_connection_timeout * 1000);
}
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -121,18 +121,15 @@ static int convert_matrix[EC_MAX][EC_MAX
/* EC_EXTERNAL*/{ 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
-int sql_type_convert (int from, int to)
+int sql_type_convert (int from, int to)
{
- int c = convert_matrix[from][to];
- return c;
+ return convert_matrix[from][to];
}
-int is_commutative(const char *fnm)
+bool is_commutative(const char *fnm)
{
- if (strcmp("sql_add", fnm) == 0 ||
- strcmp("sql_mul", fnm) == 0)
- return 1;
- return 0;
+ return strcmp("sql_add", fnm) == 0 ||
+ strcmp("sql_mul", fnm) == 0;
}
void
@@ -169,7 +166,7 @@ sql_create_subtype(sql_allocator *sa, sq
return res;
}
-static int
+static bool
localtypes_cmp(int nlt, int olt)
{
if (nlt == TYPE_flt || nlt == TYPE_dbl) {
@@ -183,9 +180,7 @@ localtypes_cmp(int nlt, int olt)
nlt = TYPE_lng;
#endif
}
- if (nlt == olt)
- return 1;
- return 0;
+ return nlt == olt;
}
sql_subtype *
@@ -214,7 +209,7 @@ sql_find_numeric(sql_subtype *r, int loc
sql_type *t = n->data;
if (localtypes_cmp(t->localtype, localtype)) {
- if ((digits && t->digits > digits) || (!digits &&
digits == t->digits)) {
+ if (digits == 0 ? t->digits == 0 : t->digits > digits) {
sql_init_subtype(r, t, digits, 0);
return r;
}
@@ -224,7 +219,7 @@ sql_find_numeric(sql_subtype *r, int loc
break;
}
n = m;
- if ((digits && t->digits > digits) || (!digits
&& digits == t->digits)) {
+ if (digits == 0 ? t->digits == 0 : t->digits >
digits) {
sql_init_subtype(r, t, digits, 0);
return r;
}
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
@@ -64,7 +64,7 @@ extern int bits2digits(int b);
extern int digits2bits(int d);
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(const char *fnm); /* return 1, if commutative */
+extern bool is_commutative(const char *fnm); /* return true if commutative */
extern char *sql_bind_alias(const char *alias);
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -95,7 +95,7 @@ mvc_init(int debug, store_type store, in
/* disable caching */
m->caching = 0;
/* disable size header */
- m->sizeheader = 0;
+ m->sizeheader = false;
if (first || catalog_version) {
if(mvc_trans(m) < 0) {
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -127,7 +127,7 @@ typedef struct mvc {
int cache; /* some queries should not be cached ! */
int caching; /* cache current query ? */
int reply_size; /* reply size */
- int sizeheader; /* print size header in result set */
+ bool sizeheader; /* print size header in result set */
int debug;
lng Topt; /* timer for optimizer phase */
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2985,7 +2985,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
Srvr.extend(['--set', 'embedded_py=3'])
elif (not all_tests or (COND != None and "HAVE_LIBPY" in COND))
and CONDITIONALS['HAVE_LIBPY']:
# enable Python integration in server
- Srvr.extend(['--set', 'embedded_py=true'])
+ Srvr.extend(['--set', 'embedded_py=2'])
# enable C integration in server
Srvr.extend(['--set', 'embedded_c=true'])
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
