Merge pull request #152 from aerospike/stage

C client 6.6.2

.build.yml

@@ -9,13 +9,15 @@ container:
       - docker.qe.aerospike.com/build/aerospike-client-c:debian-12
       - docker.qe.aerospike.com/build/aerospike-client-c:ubuntu-20.04
       - docker.qe.aerospike.com/build/aerospike-client-c:ubuntu-22.04
+      - docker.qe.aerospike.com/build/aerospike-client-c:ubuntu-24.04
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-rhel-8
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-rhel-9
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-amazonlinux-2023 
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-debian-11
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-debian-12
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-ubuntu-20.04
       - docker.qe.aerospike.com/build/aerospike-client-c:arm-ubuntu-22.04
+      - docker.qe.aerospike.com/build/aerospike-client-c:arm-ubuntu-24.04
 
 build:
   - name: default

src/include/aerospike/version.h

@@ -3,6 +3,6 @@
 // N: minor
 // P: patch
 // B: build id
-#define AEROSPIKE_CLIENT_VERSION 606010000L
+#define AEROSPIKE_CLIENT_VERSION 606020000L
 
 extern char* aerospike_client_version;

src/main/aerospike/as_event_uv.c

@@ -642,21 +642,22 @@ as_uv_tls_try_send_pending(as_event_connection* conn)
 
 		// Put remaining buffer on heap.
 		as_uv_tls* tls = conn->tls;
-		pending -= rv;
-
-		if (pending > tls->capacity) {
-			tls->buf = cf_realloc(tls->buf, pending);
-			tls->capacity = pending;
+		tls->len = pending - rv;
+		
+		if (tls->len > tls->capacity) {
+			tls->buf = cf_realloc(tls->buf, tls->len);
+			tls->capacity = tls->len;
 		}
-		memcpy(tls->buf, buf.base + rv, buf.len - rv);
-
-		int len = pending - rv;
-		rv = BIO_read(tls->nbio, tls->buf + rv, len);
-
-		if (rv != len) {
+
+		int unsent_len = buf.len - rv;
+		memcpy(tls->buf, buf.base + rv, unsent_len);
+
+		int read_len = pending - buf.len;
+		rv = BIO_read(tls->nbio, tls->buf + unsent_len, read_len);
+
+		if (rv != read_len) {
 			return -2;
 		}
-		tls->len = pending;
 		return 1;
 	}
 	return 0;

src/main/aerospike/version.c

@@ -1 +1 @@
-char* aerospike_client_version = "6.6.1";
+char* aerospike_client_version = "6.6.2";

vs/aerospike-client-c-libevent.nuspec

@@ -2,20 +2,22 @@
 <package>
   <metadata>
     <id>aerospike-client-c-libevent</id>
-    <version>6.6.1</version>
+    <version>6.6.2</version>
     <title>Aerospike C Client with libevent</title>
     <authors>Aerospike</authors>
     <owners>Aerospike</owners>
     <license type="expression">Apache-2.0</license>
     <projectUrl>https://www.aerospike.com/download/client/c</projectUrl>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Aerospike C client library for sync and async database commands using the libevent event framework.</description>
     <copyright>Copyright 2008-2024 Aerospike, Inc.</copyright>
     <tags>Aerospike database C client native libevent</tags>
   </metadata>
   <files>
     <file src="icon.png" target="" />
+    <file src="README.md" target="" />
     <file src="aerospike-client-c-libevent.targets" target="build\native" />
     <file src="..\modules\common\src\include\aerospike\*.h" exclude="**\ssl_util.h" target="build\native\include\aerospike" />
     <file src="..\modules\common\src\include\citrusleaf\*.h" exclude="**\cf_crypto.h;**\cf_digest.h" target="build\native\include\citrusleaf" />

vs/aerospike-client-c-libuv.nuspec

@@ -2,20 +2,22 @@
 <package>
   <metadata>
     <id>aerospike-client-c-libuv</id>
-    <version>6.6.1</version>
+    <version>6.6.2</version>
     <title>Aerospike C Client with libuv</title>
     <authors>Aerospike</authors>
     <owners>Aerospike</owners>
     <license type="expression">Apache-2.0</license>
     <projectUrl>https://www.aerospike.com/download/client/c</projectUrl>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Aerospike C client library for sync and async database commands using the libuv event framework.</description>
     <copyright>Copyright 2008-2024 Aerospike, Inc.</copyright>
     <tags>Aerospike database C client native libuv</tags>
   </metadata>
   <files>
     <file src="icon.png" target="" />
+    <file src="README.md" target="" />
     <file src="aerospike-client-c-libuv.targets" target="build\native" />
     <file src="..\modules\common\src\include\aerospike\*.h" exclude="**\ssl_util.h" target="build\native\include\aerospike" />
     <file src="..\modules\common\src\include\citrusleaf\*.h" exclude="**\cf_crypto.h;**\cf_digest.h" target="build\native\include\citrusleaf" />

vs/aerospike-client-c.nuspec

@@ -2,20 +2,22 @@
 <package>
   <metadata>
     <id>aerospike-client-c</id>
-    <version>6.6.1</version>
+    <version>6.6.2</version>
     <title>Aerospike C Client</title>
     <authors>Aerospike</authors>
     <owners>Aerospike</owners>
     <license type="expression">Apache-2.0</license>
     <projectUrl>https://www.aerospike.com/download/client/c</projectUrl>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Aerospike C client library for synchronous database commands.</description>
     <copyright>Copyright 2008-2024 Aerospike, Inc.</copyright>
     <tags>Aerospike database C client native</tags>
   </metadata>
   <files>
     <file src="icon.png" target="" />
+    <file src="README.md" target="" />
     <file src="aerospike-client-c.targets" target="build\native" />
     <file src="..\modules\common\src\include\aerospike\*.h" exclude="**\ssl_util.h" target="build\native\include\aerospike" />
     <file src="..\modules\common\src\include\citrusleaf\*.h" exclude="**\cf_crypto.h;**\cf_digest.h" target="build\native\include\citrusleaf" />