pg 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af2a36ecef18e9aefa719d6c5f4ed54e7269b598ea4e6c3e4e7794cdf596a32
-  data.tar.gz: 64318d9ae8b95888748f0e64f0269a7412b112d3d13bfdba6ddabcc7d0aec61e
+  metadata.gz: 3339718d25beca7eef4d5961b44dddceb03bcaab93d0b5b27af1e56845345513
+  data.tar.gz: 95c026d833f3e45beb4bebf1089d8d2dfe398fffa4f7353e2b42daf572384c5c
 SHA512:
-  metadata.gz: f3d7e7a6438f8fab628726c4e7e7f8b25b3f2681b7bd638eb2b2590f707d74d84ba933e2c1540398eba91355f0406a942ceb4752e22bab9a601fc8d668443c31
-  data.tar.gz: 83fdd0650a23affc911b9871ea09a316e883fb993bac74a2e62bfaf54b466a2de6de98c2245c4b85ad29e8c09b13df35569553ddf01ac429ee2353ec5254185c
+  metadata.gz: c2bdb07724af0bda7f094b6060f3653cb98d4484e9de3e03856415dd7fb357c42a93205c477491d94d6d352f5d6a97cdb66c3f437da8376d666f276aa03c5753
+  data.tar.gz: 5765400174741c48119c146ec5b7e0111b3329fb6f08f5b6cd5abab4af6beb42a06c97876a48a872a92dab23aa80bf8fce2a1ca7c3f621927deb40df0b20813a

data/History.rdoc

@@ -1,3 +1,8 @@
+== v1.1.3 [2018-09-06] Michael Granger <ged@FaerieMUD.org>
+
+- Revert opimization that was sometimes causing EBADF in rb_wait_for_single_fd().
+
+
 == v1.1.2 [2018-08-28] Michael Granger <ged@FaerieMUD.org>
 
 - Don't generate aliases for JOHAB encoding.

data/ext/pg.h

@@ -101,9 +101,6 @@ typedef struct {
 	/* Kind of PG::Coder object for casting COPY rows to ruby values */
 	VALUE decoder_for_get_copy_data;
 
-	/* The connection socket, used for rb_wait_for_single_fd() */
-	int socket;
-
 	/* enable/disable guessing size of PGresult's allocated memory */
 	int guess_result_memsize;
 } t_pg_connection;

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v be48d118eeed 2018/08/25 11:35:03 lars $
+ * $Id: pg_connection.c,v b49f54dc755b 2018/09/01 12:52:41 lars $
  *
  */
 
@@ -198,7 +198,6 @@ pgconn_s_allocate( VALUE klass )
 	this->decoder_for_get_copy_data = Qnil;
 	this->trace_stream = Qnil;
 	this->external_encoding = Qnil;
-	this->socket = -1;
 	this->guess_result_memsize = 1;
 
 	return self;
@@ -272,6 +271,7 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 	this = pg_get_connection( self );
 	conninfo = rb_funcall2( rb_cPGconn, rb_intern("parse_connect_args"), argc, argv );
 	this->pgconn = gvl_PQconnectdb(StringValueCStr(conninfo));
+
 	if(this->pgconn == NULL)
 		rb_raise(rb_ePGerror, "PQconnectdb() unable to allocate structure");
 
@@ -281,10 +281,6 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 		rb_exc_raise(error);
 	}
 
-	this->socket = PQsocket( this->pgconn );
-	if ( this->socket < 0 )
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
-
 	pgconn_set_default_encoding( self );
 
 	if (rb_block_given_p()) {
@@ -335,10 +331,6 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 		rb_exc_raise(error);
 	}
 
-	this->socket = PQsocket( this->pgconn );
-	if ( this->socket < 0 )
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
-
 	if ( rb_block_given_p() ) {
 		return rb_ensure( rb_yield, rb_conn, pgconn_finish, rb_conn );
 	}
@@ -2337,15 +2329,18 @@ pgconn_notifies(VALUE self)
 int rb_w32_wait_events( HANDLE *events, int num, DWORD timeout );
 
 static void *
-wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*is_readable)(PGconn *) )
+wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *) )
 {
-	PGconn *conn = this->pgconn;
+	int sd = PQsocket( conn );
 	void *retval;
 	struct timeval aborttime={0,0}, currtime, waittime;
 	DWORD timeout_milisec = INFINITE;
 	DWORD wait_ret;
 	WSAEVENT hEvent;
 
+	if ( sd < 0 )
+		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+
 	hEvent = WSACreateEvent();
 
 	/* Check for connection errors (PQisBusy is true on connection errors) */
@@ -2360,7 +2355,7 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 	}
 
 	while ( !(retval=is_readable(conn)) ) {
-		if ( WSAEventSelect(this->socket, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
+		if ( WSAEventSelect(sd, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
 			WSACloseEvent( hEvent );
 			rb_raise( rb_eConnectionBad, "WSAEventSelect socket error: %d", WSAGetLastError() );
 		}
@@ -2412,13 +2407,16 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 /* non Win32 */
 
 static void *
-wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
+wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
 {
-	PGconn *conn = this->pgconn;
+	int sd = PQsocket( conn );
 	int ret;
 	void *retval;
 	struct timeval aborttime={0,0}, currtime, waittime;
 
+	if ( sd < 0 )
+		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+
 	/* Check for connection errors (PQisBusy is true on connection errors) */
 	if ( PQconsumeInput(conn) == 0 )
 		rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
@@ -2437,7 +2435,7 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 		/* Is the given timeout valid? */
 		if( !ptimeout || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
 			/* Wait for the socket to become readable before checking again */
-			ret = rb_wait_for_single_fd( this->socket, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
+			ret = rb_wait_for_single_fd( sd, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
 		} else {
 			ret = 0;
 		}
@@ -2484,7 +2482,7 @@ notify_readable(PGconn *conn)
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 {
-	t_pg_connection *this = pg_get_connection_safe( self );
+	PGconn *conn = pg_get_pgconn( self );
 	PGnotify *pnotification;
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
@@ -2500,7 +2498,7 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 		ptimeout = &timeout;
 	}
 
-	pnotification = (PGnotify*) wait_socket_readable( this, ptimeout, notify_readable);
+	pnotification = (PGnotify*) wait_socket_readable( conn, ptimeout, notify_readable);
 
 	/* Return nil if the select timed out */
 	if ( !pnotification ) return Qnil;
@@ -3078,7 +3076,7 @@ get_result_readable(PGconn *conn)
  */
 static VALUE
 pgconn_block( int argc, VALUE *argv, VALUE self ) {
-	t_pg_connection *this = pg_get_connection_safe( self );
+	PGconn *conn = pg_get_pgconn( self );
 
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
@@ -3093,7 +3091,7 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 		ptimeout = &timeout;
 	}
 
-	ret = wait_socket_readable( this, ptimeout, get_result_readable);
+	ret = wait_socket_readable( conn, ptimeout, get_result_readable);
 
 	if( !ret )
 		return Qfalse;

data/lib/pg.rb

@@ -35,10 +35,10 @@ end
 module PG
 
 	# Library version
-	VERSION = '1.1.2'
+	VERSION = '1.1.3'
 
 	# VCS revision
-	REVISION = %q$Revision: bbf57bf7e583 $
+	REVISION = %q$Revision: 6f611e78845a $
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end

data/spec/pg/connection_spec.rb

@@ -228,6 +228,22 @@ describe PG::Connection do
 
 			res = @conn2.query("SELECT 4")
 		end
+
+		it "can use conn.reset_start to restart the connection" do
+			ios = IO.pipe
+			conn = described_class.connect_start( @conninfo )
+			wait_for_polling_ok(conn)
+
+			# Close the two pipe file descriptors, so that the file descriptor of
+			# newly established connection is probably distinct from the previous one.
+			ios.each(&:close)
+			conn.reset_start
+			wait_for_polling_ok(conn)
+
+			# The new connection should work even when the file descriptor has changed.
+			expect( conn.exec("SELECT 1").values ).to eq([["1"]])
+			conn.close
+		end
 	end
 
 	it "raises proper error when sending fails" do
@@ -914,6 +930,20 @@ describe PG::Connection do
 		expect { conn.finish }.to raise_error( PG::ConnectionBad, /connection is closed/i )
 	end
 
+	it "can use conn.reset to restart the connection" do
+		ios = IO.pipe
+		conn = PG.connect( @conninfo )
+
+		# Close the two pipe file descriptors, so that the file descriptor of
+		# newly established connection is probably distinct from the previous one.
+		ios.each(&:close)
+		conn.reset
+
+		# The new connection should work even when the file descriptor has changed.
+		expect( conn.exec("SELECT 1").values ).to eq([["1"]])
+		conn.close
+	end
+
 	it "closes the IO fetched from #socket_io when the connection is closed", :without_transaction, :socket_io do
 		conn = PG.connect( @conninfo )
 		io = conn.socket_io
@@ -939,7 +969,7 @@ describe PG::Connection do
 		end
 		serv.close
 		expect{ conn.block }.to raise_error(PG::ConnectionBad, /server closed the connection unexpectedly/)
-		expect{ conn.block }.to raise_error(PG::ConnectionBad, /connection not open/)
+		expect{ conn.block }.to raise_error(PG::ConnectionBad, /can't get socket descriptor/)
 	end
 
 	it "sets the fallback_application_name on new connections" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
   OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial