pg 1.4.2-x64-mingw-ucrt → 1.4.3-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e314b891dc2ddfcb46fd85b01aa5867af39fba5fea4d349921e487b1b5190319
-  data.tar.gz: 96820e836cdccdb3d961a1a9ab16fd254ce977e95bcdc78d73649ad94f26e5c2
+  metadata.gz: 24cb477c8691dae6695f0b8a6b7a547d2b8bfadf16c181f63e75b6daf859397e
+  data.tar.gz: 1606b0631b85a5fcb9ff7a5f0d2990c5cc92932a18204b7a5d827eef8db45159
 SHA512:
-  metadata.gz: bd853ba3e8b1012fa1a37746d87763e795f53eed74b85341b5050308d4c69ff0129bfe13fd5e05f9548e0fdbe932c904b0a30c0646a8b036ea29e87222b0fcb5
-  data.tar.gz: 87b218527cfb921065de9561fe42dea9f082c1c924658ced529d222cc51aba439ce186c2fb6901aab13241647ecfcbe1ec2c3f30ed0b8160f2dea7e8fc3e8a17
+  metadata.gz: 21a22e9dd8cab1006b3a744c80f315b6215c1d0f3a109a1ec5bd951c39476f4dc3122ddeef855c7e03cb606659abd8daaba9057b49a5756e3ad0f1b65f53ae2a
+  data.tar.gz: cd6e45df28b45506fb88d734fe436513ecb74101eac6f02eacde29c731fbe5cccf3616d88a03343df941f8f308f8ec030b3c5ca3f896b201bd9037325c22005e

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-mingw-ucrt
 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.