MonetDB: pyapi - Consistent types/formatting.

[Mark Raasveldt]

Changeset: 50bbd1c28725 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50bbd1c28725
Modified Files:
        monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh
        monetdb5/extras/pyapi/pyapi.c
        tools/embeddedpy/embeddedpy.c
Branch: pyapi
Log Message:

Consistent types/formatting.


diffs (54 lines):

diff --git a/monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh 
b/monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh
--- a/monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh
+++ b/monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh
@@ -786,7 +786,7 @@ function install_scons() {
 
 function install_mongodb() {
     rm master.zip
-    wget https://github.com/mongodb/mongo/archive/master.zip && unzip 
master.zip && cd mongo-master && ~/.local/bin/scons all
+    wget https://github.com/mongodb/mongo/archive/master.zip && unzip 
master.zip && cd mongo-master && ~/.local/bin/scons mongod
 }
 
 
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -1418,7 +1418,7 @@ static char *PyError_CreateException(cha
             if (py_error_traceback == NULL) {
                 //no traceback info, this means we are dealing with a parsing 
error
                 //line information should be in the error message
-                sscanf(py_error_string, "%*[^0-9]%llu", &line_number);
+                sscanf(py_error_string, "%*[^0-9]"LLFMT, &line_number);
                 if (line_number < 0) goto finally;
             } else {
                 line_number = 
((PyTracebackObject*)py_error_traceback)->tb_lineno;
@@ -1916,7 +1916,7 @@ PyObject *PyDict_CheckForConversion(PyOb
     if (PyList_Size(keys) != expected_columns) {
 #ifdef _PYAPI_WARNINGS_
         if (PyList_Size(keys) > expected_columns) {
-            WARNING_MESSAGE("WARNING: Expected %d return values, but a 
dictionary with %zu values was returned instead.\n", expected_columns, (size_t) 
PyList_Size(keys));
+            WARNING_MESSAGE("WARNING: Expected %d return values, but a 
dictionary with "SSZFMT" values was returned instead.\n", expected_columns, 
PyList_Size(keys));
         }
 #endif
     }
diff --git a/tools/embeddedpy/embeddedpy.c b/tools/embeddedpy/embeddedpy.c
--- a/tools/embeddedpy/embeddedpy.c
+++ b/tools/embeddedpy/embeddedpy.c
@@ -36,7 +36,7 @@
 // copy paste from embedded.h
 typedef struct append_data {
        char* colname;
-       ssize_t batid;
+       bat batid;
 } append_data;
 
 str monetdb_startup(char* dir, char silent);
@@ -557,7 +557,7 @@ str monetdb_create_table(char *schema, c
        //format the CREATE TABLE query
        snprintf(query, max_length, "create table %s.%s(", schema, table_name);
        for(i = 0; i < ncols; i++) {
-               BAT *b = BBP_cache((int)ad[i].batid);
+               BAT *b = BBP_cache(ad[i].batid);
                snprintf(copy, max_length, "%s %s %s%s", query, ad[i].colname, 
BatType_ToSQLType(b->T->type), i < ncols - 1 ? "," : ");");
                strcpy(query, copy);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list