Fixed build issues III [docker_verify]

sumeetchhetri · sumeetchhetri · commit 26e345d3a31c · 2025-01-19T20:37:22.000+05:30
diff --git a/.github/workflows/ci-win-cygwin.yml b/.github/workflows/ci-win-cygwin.yml
@@ -17,8 +17,8 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip_build]')"
     strategy:
       matrix:
-        os: [windows-2019]
-        vs: [2019]
+        os: [windows-2022]
+        vs: [2022]
     steps:
     - uses: actions/checkout@v4
     - name: Install cygwin
diff --git a/.github/workflows/ci-win-mingw.yml b/.github/workflows/ci-win-mingw.yml
@@ -17,8 +17,8 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip_build]')"
     strategy:
       matrix:
-        os: [windows-2019]
-        vs: [2019]
+        os: [windows-2022]
+        vs: [2022]
     steps:
     - uses: actions/checkout@v4
     - name: Set ENV
diff --git a/docker/dockcross-build-deps.sh b/docker/dockcross-build-deps.sh
@@ -53,7 +53,7 @@ build_curl() {
 	#curl -sLo- https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz | tar xz -C ${BUILD_DIR}
 	git clone https://github.com/curl/curl && mv curl ${BUILD_DIR}/curl-${CURL_VERSION}
 	pushd ${BUILD_DIR}/curl-${CURL_VERSION}
-		cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .
+		cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .
 		make install
 	popd
 }
diff --git a/docker/te/benchmark_config.json b/docker/te/benchmark_config.json
@@ -8,7 +8,6 @@
 			"query_url": "/t3/quem?queries=",
 			"fortune_url": "/t3/fortu",
 			"update_url": "/t3/updt?queries=",
-			"cached_query_url": "/t3/cached-wld?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -47,27 +46,6 @@
 			"versus": "",
 			"tags": []
 		},
-		"v-picov-postgresql-wire": {
-			"db_url": "/t6/d",
-			"query_url": "/t6/quem?queries=",
-			"fortune_url": "/t6/fortu",
-			"update_url": "/t6/updm?queries=",
-			"port": 8080,
-			"approach": "Realistic",
-			"classification": "Fullstack",
-			"database": "postgres",
-			"framework": "ffead-cpp",
-			"language": "C++",
-			"orm": "Raw",
-			"platform": "None",
-			"webserver": "picov",
-			"os": "Linux",
-			"database_os": "Linux",
-			"display_name": "ffead-cpp [v-picov-pg-wire]",
-			"notes": "picov sync wire",
-			"versus": "",
-			"tags": []
-		},
 		"postgresql-wire": {
 			"db_url": "/t6/d",
 			"query_url": "/t6/quem?queries=",
@@ -173,27 +151,6 @@
 			"notes": "async pipelined",
 			"versus": ""
 		},
-		"v-picov-postgresql-wire-async": {
-			"db_url": "/t7/d",
-			"query_url": "/t7/quer?queries=",
-			"fortune_url": "/t7/fortu",
-			"update_url": "/t7/updt?queries=",
-			"port": 8080,
-			"approach": "Realistic",
-			"classification": "Fullstack",
-			"database": "postgres",
-			"framework": "ffead-cpp",
-			"language": "C++",
-			"orm": "Raw",
-			"platform": "None",
-			"webserver": "picov",
-			"os": "Linux",
-			"database_os": "Linux",
-			"display_name": "ffead-cpp [v-picov-pg-wire-async]",
-			"notes": "picov async wire",
-			"versus": "",
-			"tags": []
-		},
 		"postgresql-wire-async": {
 			"db_url": "/t7/d",
 			"query_url": "/t7/quer?queries=",
diff --git a/docker/te/ffead-cpp-v-picov-postgresql-async.dockerfile b/docker/te/ffead-cpp-v-picov-postgresql-async.dockerfile
@@ -4,4 +4,4 @@ ENV IROOT=/installs
 
 WORKDIR /
 
-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async memory
+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async none
diff --git a/docker/te/ffead-cpp-v-picov-postgresql-pipelined-async.dockerfile b/docker/te/ffead-cpp-v-picov-postgresql-pipelined-async.dockerfile
@@ -4,4 +4,4 @@ ENV IROOT=/installs
 
 WORKDIR /
 
-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async memory batch
+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async none batch
diff --git a/docker/te/ffead-cpp-v-picov-postgresql-wire-async.dockerfile b/docker/te/ffead-cpp-v-picov-postgresql-wire-async.dockerfile
@@ -4,4 +4,4 @@ ENV IROOT=/installs
 
 WORKDIR /
 
-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-wire-async memory
+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-wire-async none
diff --git a/docker/te/ffead-cpp-v-picov-postgresql-wire.dockerfile b/docker/te/ffead-cpp-v-picov-postgresql-wire.dockerfile
@@ -4,4 +4,4 @@ ENV IROOT=/installs
 
 WORKDIR /
 
-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-wire memory
+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-wire none
diff --git a/docker/te/ffead-cpp-v-picov-postgresql.dockerfile b/docker/te/ffead-cpp-v-picov-postgresql.dockerfile
@@ -4,4 +4,4 @@ ENV IROOT=/installs
 
 WORKDIR /
 
-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw memory
+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw none
diff --git a/src/modules/client-util/Client.cpp b/src/modules/client-util/Client.cpp
@@ -53,7 +53,7 @@ int Client::conn(const std::string& host, const int& port) {
 	if(host!="localhost" && host!="0.0.0.0" && host!="127.0.0.1") {
 		if(!isIPAddress(host.c_str())) {
 			char* ip = get_ip((char*)host.c_str());
-			fprintf(stderr, "IP is %s\n", ip);
+			//fprintf(stderr, "IP is %s\n", ip);
 			int tmpres = inet_pton(AF_INET, ip, (void *)(&(remote->sin_addr.s_addr)));
 			if( tmpres < 0)
 			{
@@ -144,7 +144,7 @@ bool Client::connection(const std::string& host, const int& port)
 
 	if(host!="localhost" && host!="0.0.0.0" && host!="127.0.0.1") {
 		char* ip = get_ip((char*)host.c_str());
-		fprintf(stderr, "IP is %s\n", ip);
+		//fprintf(stderr, "IP is %s\n", ip);
 		int tmpres = inet_pton(AF_INET, ip, (void *)(&(remote->sin_addr.s_addr)));
 		if( tmpres < 0)
 		{
diff --git a/src/modules/client-util/ssl/SSLClient.cpp b/src/modules/client-util/ssl/SSLClient.cpp
@@ -144,7 +144,7 @@ bool SSLClient::connection(const std::string& host, const int& port)
 
 	if(host!="localhost" && host!="0.0.0.0" && host!="127.0.0.1") {
 		char* ip = get_ip((char*)host.c_str());
-		fprintf(stderr, "IP is %s\n", ip);
+		//fprintf(stderr, "IP is %s\n", ip);
 		int tmpres = inet_pton(AF_INET, ip, (void *)(&(remote->sin_addr.s_addr)));
 		if( tmpres < 0)
 		{
diff --git a/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp b/src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp
@@ -853,6 +853,7 @@ void LibpqDataSourceImpl::executeMultiQuery(LibpqQuery* q) {
 		q->isPrepared = false;
 		wire->q = q;
 		wire->selectQuery(*q);
+		wire->q = NULL;
 		return;
 	}
 #ifdef HAVE_LIBPQ
@@ -973,6 +974,7 @@ void LibpqDataSourceImpl::executeUpdateMultiQuery(LibpqQuery* q) {
 		q->isPrepared = false;
 		wire->q = q;
 		wire->selectQuery(*q);
+		wire->q = NULL;
 		return;
 	}
 #ifdef HAVE_LIBPQ
@@ -1009,6 +1011,7 @@ void LibpqDataSourceImpl::executeQuery(LibpqQuery* q) {
 		q->isSelect = true;
 		wire->q = q;
 		wire->selectQuery(*q);
+		wire->q = NULL;
 		return;
 	}
 #ifdef HAVE_LIBPQ
@@ -1104,7 +1107,9 @@ bool LibpqDataSourceImpl::executeUpdateQuery(LibpqQuery* q) {
 	if(isWire) {
 		if(isAsync) return false;
 		wire->q = q;
-		return wire->updateQuery(*q);
+		bool fl = wire->updateQuery(*q);
+		wire->q = NULL;
+		return fl;
 	}
 #ifdef HAVE_LIBPQ
 	PGresult *res = executeSync(q);

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ build_curl() {`
`53`	`53`	`#curl -sLo- https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz \| tar xz -C ${BUILD_DIR}`
`54`	`54`	`git clone https://github.com/curl/curl && mv curl ${BUILD_DIR}/curl-${CURL_VERSION}`
`55`	`55`	`pushd ${BUILD_DIR}/curl-${CURL_VERSION}`
`56`		`- cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .`
	`56`	`+ cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .`
`57`	`57`	`make install`
`58`	`58`	`popd`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ ENV IROOT=/installs`
`4`	`4`
`5`	`5`	`WORKDIR /`
`6`	`6`
`7`		`-CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async memory`
	`7`	`+CMD ./run_ffead.sh ffead-cpp-7.0-sql v-picov postgresql-raw-async none`