pg 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe333d872d6b92992e5e25bf9cbcef4ca5a1b6d80d844d71f65bd3e4939a318
-  data.tar.gz: 5befd787deeb31a87ff578f64b88b793337d05c2c09a3b11b94acbb140ea9718
+  metadata.gz: 4978742f10cf7b28bae9bb25698563f13a116bbf2aebd503063dd28f2b3e128b
+  data.tar.gz: '076801209c5d5e3f49e7bebe46a2bf86c806d8150313a0248649942b81b932bc'
 SHA512:
-  metadata.gz: 4ce4ae607591a8b549a4443e3531e3c538ddcfaf3da40478e30fc04413f7864dc52d95ae3a7e94b3891adfd384e44474e0a8035f6e9b7be2f19143c5d9150657
-  data.tar.gz: 4f74125642ee9ed370b679703fac32d286732d27001b66af5c09460f054b0729a5c19d31e449b3807d4d6176e803e63d1d32a6bd1944ee0a34ff3c4527836c2a
+  metadata.gz: c9e28051c8929433b47b41aaf1fbabf2b708f28044307b66d133da0f6fc2192582a7dda52e4b23ffc9cf2d22bec0a5c7456265331ba1a885828eac99496e0d6d
+  data.tar.gz: e5a99bb04b80c6dc2628c72f79b6ce07aa1f15b10dc53ab71f1a5d667bf349171e31611c6217075f3475d611e905db4103f3f5553f2b9bf9a576d857b346f1f2

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: ruby
 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.