MonetDB: pyapi - Fixes for other compilers.

[Mark Raasveldt]

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

Fixes for other compilers.


diffs (76 lines):

diff --git a/gdk/shared_memory.c b/gdk/shared_memory.c
--- a/gdk/shared_memory.c
+++ b/gdk/shared_memory.c
@@ -358,6 +358,7 @@ int release_process_semaphore(int sem_id
 str initialize_shared_memory(void)
 {
     NOTIMPLEMENTED();
+    return NULL;
 }
 
 str create_shared_memory(int id, size_t size, void **return_ptr)
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
@@ -773,6 +773,23 @@ function install_lofar() {
 }
 
 
+function install_mongodb() {
+    wget https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.7.tgz && 
tar xvzf mongodb-linux-x86_64-3.0.7.tgz && cd mongodb-linux-x86_64-3.0.7 && cp 
-R -n bin/ $BUILD_DIR
+    mongod --dbpath=/export/scratch2/raasveld/mongodata
+}
+
+wget https://bitbucket.org/djcbeach/monary/get/5b0fb0c2de0a.zip
+
+function install_scons() {
+    wget http://prdownloads.sourceforge.net/scons/scons-2.3.6.tar.gz && tar 
xvzf scons-2.3.6.tar.gz && cd scons-2.3.6 && python setup.py install --user    
+}
+
+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
+}
+
+
 
 export PYAPI_TESTFILE=/local/raasveld/monetdb_testing.py
 export LD_LIBRARY_PATH=/local/raasveld/build/lib
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
@@ -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, 
PyList_Size(keys));
+            WARNING_MESSAGE("WARNING: Expected %d return values, but a 
dictionary with %zu values was returned instead.\n", expected_columns, (size_t) 
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
@@ -232,11 +232,11 @@ PyObject *monetdb_insert(PyObject *self,
                char *msg = NULL;
                PyObject *pResult;
                PyReturn *pyreturn_values = NULL;
-               append_data *append_bats;
+               append_data *append_bats = NULL;
                int i;
                char **column_names = NULL;
                int *column_types = NULL;
-               int columns;
+               int columns = 0;
 
                msg = monetdb_get_columns(schema_name, table_name, &columns, 
&column_names, &column_types);
 
@@ -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(ad[i].batid);
+               BAT *b = BBP_cache((int)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