pg 1.4.2-x64-mingw32 → 1.4.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45485412182c53245f93ecd054d99492a1199f5aa010320b6257489e7a5327e0
-  data.tar.gz: 64f5f01068d545b1dcfc900ecda7f564aff1bf7093be976457c85910d1674e89
+  metadata.gz: 52e08f22554d6e896f4d9520eb1156cd1c53bf488d0b53da3cdcc5ef01d94188
+  data.tar.gz: 9b29f4cbe7ff3d2dc22855c830d37a8a9f318f1f0247f855aee951c4b94300d2
 SHA512:
-  metadata.gz: e8b467df56bb1be0234c870efd1b6781f21cd3f3a83b18c81379d5d50d9c053a32dc060cb639ea456ca1ada5525d3b99f6ce33757ac47aa97650cbaf8998ac2e
-  data.tar.gz: ba5829d79ecd4b3d075b18ce8bc907d865eae06fe97de3dfc3df08182735d4b576552540957ee042af49a577a9ad2a7950ae33e2fd38d236c642bd5167541a92
+  metadata.gz: 1fdd8bdf52937839653a7af10d923e7f4af9f7a04e3318e0944137a8bb3da50f8cae64d9d082728a8d13ebc76b2651723c1cad6c5c0c600d57c70e5fba387ccc
+  data.tar.gz: b63f26d392939efacad1c2f76a40456668edeb729a1b26243558d5baf4d188eb46cbd80095573c467ff612cf8387164fbf018c8f769a5b54d4fa79e54a95f7f4

data/History.rdoc

@@ -1,3 +1,9 @@
+== v1.4.3 [2022-08-09] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Avoid memory bloat possible in put_copy_data in pg-1.4.0 to 1.4.2. #473
+- Use Encoding::BINARY for JOHAB, removing some useless code. #472
+
+
 == v1.4.2 [2022-07-27] Lars Kanis <lars@greiz-reinsdorf.de>
 
 Bugfixes:

data/ext/pg.c

@@ -127,26 +127,6 @@ const char * const (pg_enc_pg2ruby_mapping[][2]) = {
 static struct st_table *enc_pg2ruby;
 
 
-/*
- * Look up the JOHAB encoding, creating it as a dummy encoding if it's not
- * already defined.
- */
-static rb_encoding *
-pg_find_or_create_johab(void)
-{
-	static const char * const aliases[] = { "JOHAB", "Windows-1361", "CP1361" };
-	int enc_index;
-	size_t i;
-
-	for (i = 0; i < sizeof(aliases)/sizeof(aliases[0]); ++i) {
-		enc_index = rb_enc_find_index(aliases[i]);
-		if (enc_index > 0) return rb_enc_from_index(enc_index);
-	}
-
-	enc_index = rb_define_dummy_encoding(aliases[0]);
-	return rb_enc_from_index(enc_index);
-}
-
 /*
  * Return the given PostgreSQL encoding ID as an rb_encoding.
  *
@@ -187,10 +167,6 @@ pg_get_pg_encname_as_rb_encoding( const char *pg_encname )
 			return rb_enc_find( pg_enc_pg2ruby_mapping[i][1] );
 	}
 
-	/* JOHAB isn't a builtin encoding, so make up a dummy encoding if it's seen */
-	if ( strncmp(pg_encname, "JOHAB", 5) == 0 )
-		return pg_find_or_create_johab();
-
 	/* Fallthrough to ASCII-8BIT */
 	return rb_ascii8bit_encoding();
 }

data/ext/pg_connection.c

@@ -266,6 +266,7 @@ pgconn_s_allocate( VALUE klass )
 	this->encoder_for_put_copy_data = Qnil;
 	this->decoder_for_get_copy_data = Qnil;
 	this->trace_stream = Qnil;
+	rb_ivar_set(self, rb_intern("@calls_to_put_copy_data"), INT2FIX(0));
 
 	return self;
 }

data/lib/pg/connection.rb

@@ -408,7 +408,17 @@ class PG::Connection
 	# See also #copy_data.
 	#
 	def put_copy_data(buffer, encoder=nil)
+		# sync_put_copy_data does a non-blocking attept to flush data.
 		until res=sync_put_copy_data(buffer, encoder)
+			# It didn't flush immediately and allocation of more buffering memory failed.
+			# Wait for all data sent by doing a blocking flush.
+			res = flush
+		end
+
+		# And do a blocking flush every 100 calls.
+		# This is to avoid memory bloat, when sending the data is slower than calls to put_copy_data happen.
+		if (@calls_to_put_copy_data += 1) > 100
+			@calls_to_put_copy_data = 0
 			res = flush
 		end
 		res
@@ -431,6 +441,7 @@ class PG::Connection
 		until sync_put_copy_end(*args)
 			flush
 		end
+		@calls_to_put_copy_data = 0
 		flush
 	end
 	alias async_put_copy_end put_copy_end

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.4.2'
+	VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: x64-mingw32
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
   nA==
   -----END CERTIFICATE-----
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.