yugabytedb-ysql 0.3 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701ee635042a1b90dbe1a42b7807bf2513367f952cf993dd46c6af829331c2b2
-  data.tar.gz: efdb7fe09baebbc4458e497f7b4f0633d3b25637029a4ca5dc03492601367f40
+  metadata.gz: d9347ec836b745a18b8488faaa92531bc2e5a11fd03bb3c663768a447ee6fd85
+  data.tar.gz: cb090813d96a65fdcbcfa99f0bcb19e45eaf9e642efc8f1d05db7ac546779d4b
 SHA512:
-  metadata.gz: 8fb602e5083170acc7105454af2e0c699eaf68a904ec8de291794b178de4474f0f49f2470969fabc2bec5ebc5ba2aa563c86af868b050564b2df90aeafd45274
-  data.tar.gz: 816d02e79e0ce31f2f36a0ac27d1872d78d66323913e16fac8e6b4ebdf4f585eb927745b86e27718eef929bab61a615ee02845e8752576fbf8b57dd9bec70906
+  metadata.gz: aacb77ed16eb757206c6aa9541e54edd1639f5da2b2f5351ac707ad5fb07583a820ebc08ef7be439108f4d7deedf39e68a5202a2d4094fddbc4ef4bd5420bcaf
+  data.tar.gz: 5c82688254d30c875d44696174c5928496404d518300c6de0f709bc28d924b13f4c394d501f993018f1b4f1d2eacabc12427959e6ff25d80ad28e1affec26daa

data/.gitignore

@@ -19,6 +19,6 @@
 /tmp_test_*/
 /vendor/
 /lib/libpq.dll
-/lib/pg/postgresql_lib_path.rb
+/lib/ysql/postgresql_lib_path.rb
 /.idea/
 .irb_history

data/Manifest.txt

@@ -43,18 +43,18 @@ ext/vc/pg.sln
 ext/vc/pg_18/pg.vcproj
 ext/vc/pg_19/pg_19.vcproj
 lib/pg.rb
-lib/pg/basic_type_mapping.rb
-lib/pg/binary_decoder.rb
-lib/pg/coder.rb
-lib/pg/connection.rb
-lib/pg/constants.rb
-lib/pg/exceptions.rb
-lib/pg/result.rb
-lib/pg/text_decoder.rb
-lib/pg/text_encoder.rb
-lib/pg/tuple.rb
-lib/pg/type_map_by_column.rb
-lib/pg/load_balance_service.rb
+lib/ysql/basic_type_mapping.rb
+lib/ysql/binary_decoder.rb
+lib/ysql/coder.rb
+lib/ysql/connection.rb
+lib/ysql/constants.rb
+lib/ysql/exceptions.rb
+lib/ysql/result.rb
+lib/ysql/text_decoder.rb
+lib/ysql/text_encoder.rb
+lib/ysql/tuple.rb
+lib/ysql/type_map_by_column.rb
+lib/ysql/load_balance_service.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
 spec/helpers.rb

data/Rakefile

@@ -22,15 +22,15 @@ TMPDIR  = BASEDIR + 'tmp'
 TESTDIR = BASEDIR + "tmp_test_*"
 
 DLEXT   = RbConfig::CONFIG['DLEXT']
-EXT     = LIBDIR + "pg_ext.#{DLEXT}"
+EXT     = LIBDIR + "ysql_ext.#{DLEXT}"
 
 GEMSPEC = 'yugabytedb-ysql.gemspec'
 
 CLEAN.include( TESTDIR.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
 CLEAN.include "lib/*/libpq.dll"
-CLEAN.include "lib/pg_ext.*"
-CLEAN.include "lib/pg/postgresql_lib_path.rb"
+CLEAN.include "lib/ysql_ext.*"
+CLEAN.include "lib/ysql/postgresql_lib_path.rb"
 
 load 'Rakefile.cross'
 
@@ -44,7 +44,7 @@ end
 
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
-	ext.name           = 'pg_ext'
+	ext.name           = 'ysql_ext'
 	ext.gem_spec       = $gem_spec
 	ext.ext_dir        = 'ext'
 	ext.lib_dir        = 'lib'

data/ext/extconf.rb

@@ -11,7 +11,7 @@ if ENV['MAINTAINER_MODE']
 		' -pedantic'
 end
 
-if pgdir = with_config( 'pg' )
+if pgdir = with_config( 'ysql' )
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
@@ -26,7 +26,7 @@ if enable_config("windows-cross")
 	# Avoid dependency to external libgcc.dll on x86-mingw32
 	$LDFLAGS << " -static-libgcc"
 	# Don't use pg_config for cross build, but --with-pg-* path options
-	dir_config 'pg'
+	dir_config 'ysql'
 
 else
 	# Native build
@@ -39,7 +39,7 @@ else
 		$stderr.puts "Using config values from %s" % [ pgconfig ]
 		incdir = IO.popen([pgconfig, "--includedir"], &:read).chomp
 		libdir = IO.popen([pgconfig, "--libdir"], &:read).chomp
-		dir_config 'pg', incdir, libdir
+		dir_config 'ysql', incdir, libdir
 
 		# Windows traditionally stores DLLs beside executables, not in libdir
 		dlldir = RUBY_PLATFORM=~/mingw|mswin/ ? IO.popen([pgconfig, "--bindir"], &:read).chomp : libdir
@@ -50,7 +50,7 @@ else
 		end
 
 	else
-		incdir, libdir = dir_config 'pg'
+		incdir, libdir = dir_config 'ysql'
 		dlldir = libdir
 	end
 
@@ -74,7 +74,7 @@ module YSQL
 end
 EOT
 $INSTALLFILES = {
-	"./postgresql_lib_path.rb" => "$(RUBYLIBDIR)/pg/"
+	"./postgresql_lib_path.rb" => "$(RUBYLIBDIR)/ysql/"
 }
 
 if RUBY_VERSION >= '2.3.0' && /solaris/ =~ RUBY_PLATFORM
@@ -170,5 +170,5 @@ checking_for "C99 variable length arrays" do
 end
 
 create_header()
-create_makefile( "pg_ext" )
+create_makefile( "ysql_ext" )
 

data/ext/pg.c

@@ -332,7 +332,7 @@ pg_s_init_ssl(VALUE self, VALUE do_ssl)
  **************************************************************************/
 
 void
-Init_pg_ext(void)
+Init_ysql_ext(void)
 {
 
 #ifdef HAVE_RB_EXT_RACTOR_SAFE

data/ext/pg.h

@@ -259,7 +259,6 @@ extern VALUE rb_eInvalidChangeOfResultFields;
 extern VALUE rb_mPGconstants;
 extern VALUE rb_cPGconn;
 extern VALUE rb_cPGresult;
-extern VALUE rb_cPGlbs;
 extern VALUE rb_hErrors;
 extern VALUE rb_cTypeMap;
 extern VALUE rb_cTypeMapAllStrings;
@@ -293,7 +292,7 @@ extern VALUE pg_typemap_all_strings;
 /***************************************************************************
  * PROTOTYPES
  **************************************************************************/
-void Init_pg_ext                                       _(( void ));
+void Init_ysql_ext                                     _(( void ));
 
 void init_pg_connection                                _(( void ));
 void init_pg_result                                    _(( void ));

data/ext/pg_connection.c

@@ -11,7 +11,6 @@
 
 
 VALUE rb_cPGconn;
-VALUE rb_cPGlbs;
 static ID s_id_encode;
 static ID s_id_autoclose_set;
 static VALUE sym_type, sym_format, sym_value;
@@ -533,9 +532,6 @@ static VALUE
 pgconn_finish( VALUE self )
 {
 	t_pg_connection *this = pg_get_connection_safe( self );
-	char *host = PQhost(this->pgconn);
-	rb_cPGlbs = rb_define_class_under( rb_mPG, "LoadBalanceService", rb_cObject );
-	if (host) rb_funcall(rb_cPGlbs, rb_intern("decrement_connection_count"), 1, rb_str_new2(host));
 
 	pgconn_close_socket_io( self );
 	PQfinish( this->pgconn );
@@ -2457,6 +2453,15 @@ wait_socket_readable( VALUE self, struct timeval *ptimeout, void *(*is_readable)
 			pgconn_close_socket_io(self);
 			pg_raise_conn_error(rb_eConnectionBad, self, "PQconsumeInput() %s", PQerrorMessage(conn));
 		}
+
+		if (PQsslInUse(conn)) {
+			for (int i = 0; i < 15; i++) {
+				if ( PQconsumeInput(conn) == 0 ) {
+					pgconn_close_socket_io(self);
+					pg_raise_conn_error(rb_eConnectionBad, self, "PQconsumeInput() #%d - %s", i, PQerrorMessage(conn));
+				}
+			}
+		}
 	}
 
 	return retval;
@@ -4502,7 +4507,6 @@ init_pg_connection(void)
 	rb_define_method(rb_cPGconn, "reset_start", pgconn_reset_start, 0);
 	rb_define_private_method(rb_cPGconn, "reset_start2", pgconn_reset_start2, 1);
 	rb_define_method(rb_cPGconn, "reset_poll", pgconn_reset_poll, 0);
-	rb_define_alias(rb_cPGconn, "close", "finish");
 
 	/******     PG::Connection INSTANCE METHODS: Connection Status     ******/
 	rb_define_method(rb_cPGconn, "db", pgconn_db, 0);

data/lib/{pg → ysql}/connection.rb

@@ -304,6 +304,20 @@ class YSQL::Connection
 		end
 	end
 
+	def close
+		h = host
+		h_addr = hostaddr
+		begin
+			finish()
+		ensure
+			if h
+				YSQL::LoadBalanceService.decrement_connection_count(h)
+			elsif h_addr
+				YSQL::LoadBalanceService.decrement_connection_count(h_addr)
+			end
+		end
+	end
+
 	# Backward-compatibility aliases for stuff that's moved into PG.
 	class << self
 		define_method( :isthreadsafe, &YSQL.method(:isthreadsafe) )

data/lib/{pg → ysql}/version.rb

@@ -1,5 +1,5 @@
 module YSQL
 	# Library version
 	PG_VERSION = '1.5.6'
-	VERSION = '0.3'
+	VERSION = '0.5'
 end

data/lib/ysql.rb

@@ -13,10 +13,10 @@ module YSQL
 		bundled_libpq_path = nil
 		# Try to load libpq path as found by extconf.rb
 		begin
-			require "pg/postgresql_lib_path"
+			require "ysql/postgresql_lib_path"
 		rescue LoadError
 			# rake-compiler doesn't use regular "make install", but uses it's own install tasks.
-			# It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
+			# It therefore doesn't copy ysql/postgresql_lib_path.rb in case of "rake compile".
 			POSTGRESQL_LIB_PATH = false
 		end
 	end
@@ -44,9 +44,9 @@ module YSQL
 			# It's a Windows binary gem, try the <major>.<minor> subdirectory
 			major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
 				raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-			require "#{major_minor}/pg_ext"
+			require "#{major_minor}/ysql_ext"
 		else
-			require 'pg_ext'
+			require 'ysql_ext'
 		end
 	end
 
@@ -75,46 +75,46 @@ module YSQL
 
 	module BinaryDecoder
 		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_decoder/timestamp'
+			autoload klass, 'ysql/binary_decoder/timestamp'
 		end
-		autoload :Date, 'pg/binary_decoder/date'
+		autoload :Date, 'ysql/binary_decoder/date'
 	end
 	module BinaryEncoder
 		%i[ TimestampUtc TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_encoder/timestamp'
+			autoload klass, 'ysql/binary_encoder/timestamp'
 		end
 	end
 	module TextDecoder
 		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_decoder/timestamp'
+			autoload klass, 'ysql/text_decoder/timestamp'
 		end
-		autoload :Date, 'pg/text_decoder/date'
-		autoload :Inet, 'pg/text_decoder/inet'
-		autoload :JSON, 'pg/text_decoder/json'
-		autoload :Numeric, 'pg/text_decoder/numeric'
+		autoload :Date, 'ysql/text_decoder/date'
+		autoload :Inet, 'ysql/text_decoder/inet'
+		autoload :JSON, 'ysql/text_decoder/json'
+		autoload :Numeric, 'ysql/text_decoder/numeric'
 	end
 	module TextEncoder
 		%i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_encoder/timestamp'
+			autoload klass, 'ysql/text_encoder/timestamp'
 		end
-		autoload :Date, 'pg/text_encoder/date'
-		autoload :Inet, 'pg/text_encoder/inet'
-		autoload :JSON, 'pg/text_encoder/json'
-		autoload :Numeric, 'pg/text_encoder/numeric'
+		autoload :Date, 'ysql/text_encoder/date'
+		autoload :Inet, 'ysql/text_encoder/inet'
+		autoload :JSON, 'ysql/text_encoder/json'
+		autoload :Numeric, 'ysql/text_encoder/numeric'
 	end
 
-	autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
-	autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
-	autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
-	autoload :BasicTypeRegistry, 'pg/basic_type_registry'
-	require 'pg/exceptions'
-	require 'pg/coder'
-	require 'pg/type_map_by_column'
-	require 'pg/connection'
-	require 'pg/result'
-	require 'pg/tuple'
-	require 'pg/load_balance_service'
-	autoload :VERSION, 'pg/version'
+	autoload :BasicTypeMapBasedOnResult, 'ysql/basic_type_map_based_on_result'
+	autoload :BasicTypeMapForQueries, 'ysql/basic_type_map_for_queries'
+	autoload :BasicTypeMapForResults, 'ysql/basic_type_map_for_results'
+	autoload :BasicTypeRegistry, 'ysql/basic_type_registry'
+	require 'ysql/exceptions'
+	require 'ysql/coder'
+	require 'ysql/type_map_by_column'
+	require 'ysql/connection'
+	require 'ysql/result'
+	require 'ysql/tuple'
+	require 'ysql/load_balance_service'
+	autoload :VERSION, 'ysql/version'
 
 
 	# Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1

data/yugabytedb-ysql.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # -*- encoding: utf-8 -*-
 
-require_relative 'lib/pg/version'
+require_relative 'lib/ysql/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "yugabytedb-ysql"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yugabytedb-ysql
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.5'
 platform: ruby
 authors:
 - Michael Granger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies: []
 description: Pg_YugabyteDB is the Ruby interface to the PostgreSQL-compatible YugabyteDB.
   It works with YugabyteDB 2.20 and later.
@@ -52,32 +52,32 @@ extra_rdoc_files:
 - ext/pg_type_map_in_ruby.c
 - ext/pg_util.c
 - ext/pg_util.h
-- lib/pg/basic_type_map_based_on_result.rb
-- lib/pg/basic_type_map_for_queries.rb
-- lib/pg/basic_type_map_for_results.rb
-- lib/pg/basic_type_registry.rb
-- lib/pg/binary_decoder/date.rb
-- lib/pg/binary_decoder/timestamp.rb
-- lib/pg/binary_encoder/timestamp.rb
-- lib/pg/coder.rb
-- lib/pg/connection.rb
-- lib/pg/exceptions.rb
-- lib/pg/load_balance_service.rb
-- lib/pg/result.rb
-- lib/pg/text_decoder/date.rb
-- lib/pg/text_decoder/inet.rb
-- lib/pg/text_decoder/json.rb
-- lib/pg/text_decoder/numeric.rb
-- lib/pg/text_decoder/timestamp.rb
-- lib/pg/text_encoder/date.rb
-- lib/pg/text_encoder/inet.rb
-- lib/pg/text_encoder/json.rb
-- lib/pg/text_encoder/numeric.rb
-- lib/pg/text_encoder/timestamp.rb
-- lib/pg/tuple.rb
-- lib/pg/type_map_by_column.rb
-- lib/pg/version.rb
 - lib/ysql.rb
+- lib/ysql/basic_type_map_based_on_result.rb
+- lib/ysql/basic_type_map_for_queries.rb
+- lib/ysql/basic_type_map_for_results.rb
+- lib/ysql/basic_type_registry.rb
+- lib/ysql/binary_decoder/date.rb
+- lib/ysql/binary_decoder/timestamp.rb
+- lib/ysql/binary_encoder/timestamp.rb
+- lib/ysql/coder.rb
+- lib/ysql/connection.rb
+- lib/ysql/exceptions.rb
+- lib/ysql/load_balance_service.rb
+- lib/ysql/result.rb
+- lib/ysql/text_decoder/date.rb
+- lib/ysql/text_decoder/inet.rb
+- lib/ysql/text_decoder/json.rb
+- lib/ysql/text_decoder/numeric.rb
+- lib/ysql/text_decoder/timestamp.rb
+- lib/ysql/text_encoder/date.rb
+- lib/ysql/text_encoder/inet.rb
+- lib/ysql/text_encoder/json.rb
+- lib/ysql/text_encoder/numeric.rb
+- lib/ysql/text_encoder/timestamp.rb
+- lib/ysql/tuple.rb
+- lib/ysql/type_map_by_column.rb
+- lib/ysql/version.rb
 files:
 - ".appveyor.yml"
 - ".gems"
@@ -140,32 +140,32 @@ files:
 - ext/vc/pg.sln
 - ext/vc/pg_18/pg.vcproj
 - ext/vc/pg_19/pg_19.vcproj
-- lib/pg/basic_type_map_based_on_result.rb
-- lib/pg/basic_type_map_for_queries.rb
-- lib/pg/basic_type_map_for_results.rb
-- lib/pg/basic_type_registry.rb
-- lib/pg/binary_decoder/date.rb
-- lib/pg/binary_decoder/timestamp.rb
-- lib/pg/binary_encoder/timestamp.rb
-- lib/pg/coder.rb
-- lib/pg/connection.rb
-- lib/pg/exceptions.rb
-- lib/pg/load_balance_service.rb
-- lib/pg/result.rb
-- lib/pg/text_decoder/date.rb
-- lib/pg/text_decoder/inet.rb
-- lib/pg/text_decoder/json.rb
-- lib/pg/text_decoder/numeric.rb
-- lib/pg/text_decoder/timestamp.rb
-- lib/pg/text_encoder/date.rb
-- lib/pg/text_encoder/inet.rb
-- lib/pg/text_encoder/json.rb
-- lib/pg/text_encoder/numeric.rb
-- lib/pg/text_encoder/timestamp.rb
-- lib/pg/tuple.rb
-- lib/pg/type_map_by_column.rb
-- lib/pg/version.rb
 - lib/ysql.rb
+- lib/ysql/basic_type_map_based_on_result.rb
+- lib/ysql/basic_type_map_for_queries.rb
+- lib/ysql/basic_type_map_for_results.rb
+- lib/ysql/basic_type_registry.rb
+- lib/ysql/binary_decoder/date.rb
+- lib/ysql/binary_decoder/timestamp.rb
+- lib/ysql/binary_encoder/timestamp.rb
+- lib/ysql/coder.rb
+- lib/ysql/connection.rb
+- lib/ysql/exceptions.rb
+- lib/ysql/load_balance_service.rb
+- lib/ysql/result.rb
+- lib/ysql/text_decoder/date.rb
+- lib/ysql/text_decoder/inet.rb
+- lib/ysql/text_decoder/json.rb
+- lib/ysql/text_decoder/numeric.rb
+- lib/ysql/text_decoder/timestamp.rb
+- lib/ysql/text_encoder/date.rb
+- lib/ysql/text_encoder/inet.rb
+- lib/ysql/text_encoder/json.rb
+- lib/ysql/text_encoder/numeric.rb
+- lib/ysql/text_encoder/timestamp.rb
+- lib/ysql/tuple.rb
+- lib/ysql/type_map_by_column.rb
+- lib/ysql/version.rb
 - misc/openssl-pg-segfault.rb
 - misc/postgres/History.txt
 - misc/postgres/Manifest.txt