pg 1.4.2-x86-mingw32 → 1.4.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7a63a506afa6472f3664914858259c59caf05c9eaac6e1adf00acf453dff26
-  data.tar.gz: 8dfdb41d719ea6d34693ad251e2a0fd00ebd0b613ad04ef67e9d41fcf896c424
+  metadata.gz: 37bf3351b7b854bc57f691233165990cb0b0bb44f754e98ee1b5e2cc55a04941
+  data.tar.gz: bfa5125ec694d6666a1941abf45a40c076179c2b2976441ae9adfce21e35290a
 SHA512:
-  metadata.gz: 96c838a5b5eaa22cf18e7f4a7d35b8572b64548b0961073b0df1f8d343292dff89671e98a01ed1aba82d98c49771d04596e029b85f767266dcbc19488e393d1b
-  data.tar.gz: b3fdb5f2724b35481d944db3bf87eff999daeaf33eaa86d81e66ee91b3c73825b330dc7e3586bd96a2f1c355a2394397650542adaead22a01a2cbf4157132f05
+  metadata.gz: 1f2781d8fb3801d5db87604d388893753d06103e3bc4a7383f34db9e468c1a957e5ef29569a712c268c08b31d8b184c664038e152457320988c564a097e1a77b
+  data.tar.gz: 937cde573008eb45d1daffc000a7474841d394d993f7be565da5be476755367a3dd1f7b064312961b0716aa4a926d7c693441e08a573cb05378b70cf8a8181ac

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