Merge branch 'master' into 7.2.6.1

Dockerfile

@@ -6,11 +6,13 @@ ENV VIRTUOSO_GIT_URL https://github.com/openlink/virtuoso-opensource.git
 ENV VIRTUOSO_DIR /virtuoso-opensource
 ENV VIRTUOSO_GIT_VERSION 7.2.6.1
 
+COPY patch.diff /patch.diff
+
 # Install prerequisites, Download, Patch, compile and install
 RUN apk add --update git automake autoconf automake libtool bison flex gawk gperf openssl g++ openssl-dev make && \
     git clone -b v${VIRTUOSO_GIT_VERSION} --single-branch --depth=1 ${VIRTUOSO_GIT_URL} ${VIRTUOSO_DIR} && \
-    sed -i 's/maxrows\ \:\= 1024\*1024/maxrows\ \:\=  64\*1024\*1024\-2/' ${VIRTUOSO_DIR}/libsrc/Wi/sparql_io.sql && \
     cd ${VIRTUOSO_DIR} && \
+    patch ${VIRTUOSO_DIR}/libsrc/Wi/sparql_io.sql < /patch.diff && \
     ./autogen.sh && \
     CFLAGS="-O2 -m64" && export CFLAGS && \
     ./configure --disable-bpel-vad --enable-conductor-vad --enable-fct-vad --disable-dbpedia-vad --disable-demo-vad --disable-isparql-vad --disable-ods-vad --disable-sparqldemo-vad --disable-syncml-vad --disable-tutorial-vad --program-transform-name="s/isql/isql-v/" && \

patch.diff

@@ -0,0 +1,13 @@
+diff --git a/libsrc/Wi/sparql_io.sql b/libsrc/Wi/sparql_io.sql
+index aefcc4d..d2444b3 100644
+--- a/libsrc/Wi/sparql_io.sql
++++ b/libsrc/Wi/sparql_io.sql
+@@ -3251,7 +3251,7 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout
+   named_graphs := vector ();
+   using_graphs := vector ();
+   using_named_graphs := vector ();
+-  maxrows := 1024*1024; -- More than enough for web-interface.
++  maxrows := ((16*1024*1024)/8)-2; -- More than enough for web-interface.
+   deadl := 0;
+   http_meth := http_request_get ('REQUEST_METHOD');
+   ini_dflt_graph := virtuoso_ini_item_value ('SPARQL', 'DefaultGraph');

virtuoso.sh

@@ -27,6 +27,9 @@ if [ "$SPARQL_UPDATE" = "true" ]; then echo "GRANT SPARQL_UPDATE to \"SPARQL\";"
 virtuoso-t +wait && isql-v -U dba -P dba < /virtuoso/dump_nquads_procedure.sql && isql-v -U dba -P dba < /sql-query.sql
 kill $(ps ax | egrep '[v]irtuoso-t' | awk '{print $1}')
 
+# Make sure killing is done
+sleep 2
+
 # Load data
 if [ -d "toLoad" ] ;
 then