pg 1.3.0.rc3-x64-mingw-ucrt → 1.3.0.rc4-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e59ae7755b98c3eada0f2a75207c56cf1ad27a385de83222eab84905ac9ba53
-  data.tar.gz: 5cdd62bf34333d6709fe289ceefd692585477d97524dc12af8763e8e4240d724
+  metadata.gz: fa1b071a1fdcfcb24c81fd87556ffe0c50bd75ad1d2f0a92b4f2e7765d564a7d
+  data.tar.gz: cdbe9264132f6488865e9c76fd26492904c4eeb1df4a8ac78ea8da850b1f25d8
 SHA512:
-  metadata.gz: bd94425c700174ebee51626564ab42567424191e2c2a789fffe77201616249fa702c6014b92dbd251678170325168289110c7723b2a56cf47f9fa774a082d549
-  data.tar.gz: 9c2ff5c001548f7c7f85f64199cbf2648c32029564bd758c99b7b93135894599d75dcc8a8dfd96ffa2e2f893d49ad176dd4d83248b721bd6c6134ba0cfc5c3fb
+  metadata.gz: 9ec58af33bfb04b7f11ec1fe342a80bb7268798e98b2ef151b72cafdd718a25ffb5c812e60d8898b00142e84fc7edea0eb9499fe535a21eb3acc0faeb444d411
+  data.tar.gz: c24a63530a1572742a659eb5c9d14fec47aa7560a22fce909d0f3cb4d44a19a45fabb973cea66596df6602c4c6e4972c61b379698ebbbc8612762d3a67afd2df

data/.github/workflows/binary-gems.yml

@@ -79,6 +79,7 @@ jobs:
           echo "PGUSER=$env:USERNAME"  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "PGPASSWORD="  | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
+      - run: gem update --system
       - run: bundle install
       - run: gem install --local pg-*${{ matrix.platform }}.gem --verbose
       - name: Run specs

data/.github/workflows/source-gem.yml

@@ -110,6 +110,7 @@ jobs:
           unzip postgresql-$PGVERSION-binaries.zip && \
           echo `pwd`/pgsql/bin >> $GITHUB_PATH
 
+      - run: gem update --system
       - run: bundle install
 
       - run: gem install --local *.gem --verbose

data/ext/extconf.rb

@@ -155,6 +155,7 @@ have_func 'rb_io_wait' # since ruby-3.0
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'
 have_header 'inttypes.h'
+have_header('ruby/fiber/scheduler.h') if RUBY_PLATFORM=~/mingw|mswin/
 
 checking_for "C99 variable length arrays" do
 	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')

data/ext/pg_connection.c

@@ -2207,8 +2207,110 @@ pgconn_notifies(VALUE self)
 	return hash;
 }
 
+#if defined(_WIN32)
+
+/* We use a specialized implementation of rb_io_wait() on Windows.
+ * This is because rb_io_wait() and rb_wait_for_single_fd() are very slow on Windows.
+ */
+
+#if defined(HAVE_RUBY_FIBER_SCHEDULER_H)
+#include <ruby/fiber/scheduler.h>
+#endif
+
+typedef enum {
+    PG_RUBY_IO_READABLE = RB_WAITFD_IN,
+    PG_RUBY_IO_WRITABLE = RB_WAITFD_OUT,
+    PG_RUBY_IO_PRIORITY = RB_WAITFD_PRI,
+} pg_rb_io_event_t;
+
+int rb_w32_wait_events( HANDLE *events, int num, DWORD timeout );
+
+static VALUE
+pg_rb_thread_io_wait(VALUE io, VALUE events, VALUE timeout) {
+	rb_io_t *fptr;
+	struct timeval ptimeout;
+
+	struct timeval aborttime={0,0}, currtime, waittime;
+	DWORD timeout_milisec = INFINITE;
+	HANDLE hEvent = WSACreateEvent();
+
+	long rb_events = NUM2UINT(events);
+	long w32_events = 0;
+	DWORD wait_ret;
+
+	GetOpenFile((io), fptr);
+	if( !NIL_P(timeout) ){
+		ptimeout.tv_sec = (time_t)(NUM2DBL(timeout));
+		ptimeout.tv_usec = (time_t)(NUM2DBL(timeout) - (double)ptimeout.tv_sec);
+
+		gettimeofday(&currtime, NULL);
+		timeradd(&currtime, &ptimeout, &aborttime);
+	}
+
+	if(rb_events & PG_RUBY_IO_READABLE) {
+		w32_events |= FD_READ | FD_ACCEPT | FD_CLOSE;
+	} else if(rb_events & PG_RUBY_IO_WRITABLE) {
+		w32_events |= FD_WRITE | FD_CONNECT;
+	} else if(rb_events & PG_RUBY_IO_PRIORITY) {
+		w32_events |= FD_OOB;
+	}
+
+	for(;;) {
+		if ( WSAEventSelect(_get_osfhandle(fptr->fd), hEvent, w32_events) == SOCKET_ERROR ) {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_eConnectionBad, "WSAEventSelect socket error: %d", WSAGetLastError() );
+		}
+
+		if ( !NIL_P(timeout) ) {
+			gettimeofday(&currtime, NULL);
+			timersub(&aborttime, &currtime, &waittime);
+			timeout_milisec = (DWORD)( waittime.tv_sec * 1e3 + waittime.tv_usec / 1e3 );
+		}
+
+		if( NIL_P(timeout) || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
+			/* Wait for the socket to become readable before checking again */
+			wait_ret = rb_w32_wait_events( &hEvent, 1, timeout_milisec );
+		} else {
+			wait_ret = WAIT_TIMEOUT;
+		}
+
+		if ( wait_ret == WAIT_TIMEOUT ) {
+			WSACloseEvent( hEvent );
+			return UINT2NUM(0);
+		} else if ( wait_ret == WAIT_OBJECT_0 ) {
+			WSACloseEvent( hEvent );
+			/* The event we were waiting for. */
+			return UINT2NUM(rb_events);
+		} else if ( wait_ret == WAIT_OBJECT_0 + 1) {
+			/* This indicates interruption from timer thread, GC, exception
+			 * from other threads etc... */
+			rb_thread_check_ints();
+		} else if ( wait_ret == WAIT_FAILED ) {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_eConnectionBad, "Wait on socket error (WaitForMultipleObjects): %lu", GetLastError() );
+		} else {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_eConnectionBad, "Wait on socket abandoned (WaitForMultipleObjects)" );
+		}
+	}
+}
+
+static VALUE
+pg_rb_io_wait(VALUE io, VALUE events, VALUE timeout) {
+#if defined(HAVE_RUBY_FIBER_SCHEDULER_H)
+	/* We don't support Fiber.scheduler on Windows ruby-3.0 because there is no fast way to check whether a scheduler is active.
+	 * Fortunatelly ruby-3.1 offers a C-API for it.
+	 */
+	VALUE scheduler = rb_fiber_scheduler_current();
+
+	if (!NIL_P(scheduler)) {
+		return rb_io_wait(io, events, timeout);
+	}
+#endif
+	return pg_rb_thread_io_wait(io, events, timeout);
+}
 
-#if defined(HAVE_RB_IO_WAIT)
+#elif defined(HAVE_RB_IO_WAIT)
 
 /* Use our own function and constants names, to avoid conflicts with truffleruby-head on its road to ruby-3.0 compatibility. */
 #define pg_rb_io_wait rb_io_wait

data/ext/pg_record_coder.c

@@ -134,7 +134,7 @@ pg_recordcoder_type_map_get(VALUE self)
  *   tm = PG::TypeMapByColumn.new([PG::TextEncoder::Float.new]*2)
  *   # Use this type map to encode the record:
  *   PG::TextEncoder::Record.new(type_map: tm).encode([1,2])
- *   # => "(\"1.0000000000000000E+00\",\"2.0000000000000000E+00\")"
+ *   # => "(\"1.0\",\"2.0\")"
  *
  * Records can also be encoded and decoded directly to and from the database.
  * This avoids intermediate string allocations and is very fast.

data/lib/pg/connection.rb

@@ -7,7 +7,7 @@ require 'io/wait'
 require 'socket'
 
 # The PostgreSQL connection class. The interface for this class is based on
-# {libpq}[http://www.postgresql.org/docs/9.2/interactive/libpq.html], the C
+# {libpq}[http://www.postgresql.org/docs/current/libpq.html], the C
 # application programmer's interface to PostgreSQL. Some familiarity with libpq
 # is recommended, but not necessary.
 #

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.3.0.rc3'
+	VERSION = '1.3.0.rc4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc3
+  version: 1.3.0.rc4
 platform: x64-mingw-ucrt
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   d5T9wAD7jW/0seVujw+76/YOJWO3Dft+FQmMBbdd8s3J47HbN9R2mDt6fl6he+X/
   gw==
   -----END CERTIFICATE-----
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.2.dev