Pg capi fixes

PullRequest: truffleruby/699

Author: aardvark179

lib/cext/include/ruby/intern.h

@@ -731,7 +731,7 @@ VALUE rb_str_buf_append(VALUE, VALUE);
 VALUE rb_str_buf_cat(VALUE, const char*, long);
 VALUE rb_str_buf_cat2(VALUE, const char*);
 VALUE rb_str_buf_cat_ascii(VALUE, const char*);
-#define rb_obj_as_string(object) rb_any_to_s(object)
+VALUE rb_obj_as_string(VALUE object);
 VALUE rb_check_string_type(VALUE);
 void rb_must_asciicompat(VALUE);
 #define rb_str_dup(string) rb_obj_dup(string)

lib/cext/include/ruby/ruby.h

@@ -225,8 +225,8 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
 # endif
 #endif
 
-#define RUBY_FIXNUM_MAX (LONG_MAX>>1)
-#define RUBY_FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
+#define RUBY_FIXNUM_MAX LONG_MAX
+#define RUBY_FIXNUM_MIN LONG_MIN
 #define FIXNUM_MAX RUBY_FIXNUM_MAX
 #define FIXNUM_MIN RUBY_FIXNUM_MIN
 
@@ -346,7 +346,7 @@ rb_fix2ulong(VALUE x)
     return RB_FIX2ULONG(x);
 }
 int RB_FIXNUM_P(VALUE value);
-#define RB_POSFIXABLE(f) ((f) < RUBY_FIXNUM_MAX+1)
+#define RB_POSFIXABLE(f) ((f) <= RUBY_FIXNUM_MAX)
 #define RB_NEGFIXABLE(f) ((f) >= RUBY_FIXNUM_MIN)
 #define RB_FIXABLE(f) (RB_POSFIXABLE(f) && RB_NEGFIXABLE(f))
 #define FIX2LONG(x) RB_FIX2LONG(x)

lib/cext/patches/pg_patches.rb

@@ -15,6 +15,21 @@ class PgPatches
         case Qfalse_int_const : mybool = 0; break;
 EOF
 
+  PG_TEXT_DECODER_FREE_OLD = <<-EOF
+static VALUE
+pg_text_dec_bytea(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
+EOF
+
+  PG_TEXT_DECODER_FREE_NEW = <<-EOF
+static VALUE pg_tr_pq_freemem(VALUE mem) {
+  PQfreemem((void *)mem);
+  return Qfalse;
+}
+
+static VALUE
+pg_text_dec_bytea(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
+EOF
+
   PATCHES = {
     gem: 'pg',
     patches: {
@@ -24,6 +39,34 @@ class PgPatches
           replacement: PG_BINARY_ENCODER_PATCH
         }
       ],
+      'pg_result.c' => [
+        {
+          match: 'xmalloc(',
+          replacement: 'calloc(1,'
+        },
+      ],
+      'pg_tuple.c' => [
+        {
+          match: 'xmalloc(',
+          replacement: 'calloc(1,'
+        },
+      ],
+      'pg_text_decoder.c' => [
+        {
+          match: PG_TEXT_DECODER_FREE_OLD,
+          replacement: PG_TEXT_DECODER_FREE_NEW
+        },
+        {
+          match: '(VALUE(*)())PQfreemem',
+          replacement: 'pg_tr_pq_freemem'
+        }
+      ],
+      'pg_text_encoder.c' => [
+        {
+          match: 'if(TYPE(*intermediate) == T_FIXNUM)',
+          replacement: 'if(TYPE(*intermediate) == T_FIXNUM && NUM2LL(*intermediate) != -(NUM2LL(*intermediate)))'
+        },
+      ],
       'pg_type_map_by_class.c' => [
         {
           match: '#define CACHE_LOOKUP(this, klass) ( &this->cache_row[(klass >> 8) & 0xff] )',

lib/truffle/truffle/cext.rb

@@ -1662,6 +1662,10 @@ def rb_any_to_s(object)
     Truffle::Type.rb_any_to_s(object)
   end
 
+  def rb_obj_as_string(object)
+    Truffle::Type.rb_obj_as_string(object)
+  end
+
   def rb_class_inherited_p(ruby_module, object)
     if object.is_a?(Module)
       ruby_module <= object

src/main/c/cext/ruby.c

@@ -438,6 +438,10 @@ VALUE rb_obj_dup(VALUE object) {
   return RUBY_INVOKE(object, "dup");
 }
 
+VALUE rb_obj_as_string(VALUE object) {
+  return RUBY_CEXT_INVOKE("rb_obj_as_string", object);
+}
+
 VALUE rb_any_to_s(VALUE object) {
   return RUBY_CEXT_INVOKE("rb_any_to_s", object);
 }
@@ -475,7 +479,12 @@ void rb_obj_call_init(VALUE object, int argc, const VALUE *argv) {
 }
 
 const char *rb_obj_classname(VALUE object) {
-  return RSTRING_PTR(RUBY_CEXT_INVOKE("rb_obj_classname", object));
+  VALUE str = RUBY_CEXT_INVOKE("rb_obj_classname", object);
+  if (str != Qnil) {
+    return RSTRING_PTR(str);
+  } else {
+    return NULL;
+  }
 }
 
 VALUE rb_obj_id(VALUE object) {

src/main/java/org/truffleruby/core/rope/NativeRope.java

@@ -80,7 +80,7 @@ public NativeRope resize(FinalizationService finalizationService, int newByteLen
         pointer.writeBytes(0, this.pointer, 0, Math.min(byteLength(), newByteLength));
         pointer.writeByte(newByteLength, (byte) 0); // Like MRI
         pointer.enableAutorelease(finalizationService);
-        return new NativeRope(pointer, newByteLength, ASCIIEncoding.INSTANCE, UNKNOWN_CHARACTER_LENGTH, CodeRange.CR_UNKNOWN);
+        return new NativeRope(pointer, newByteLength, getEncoding(), UNKNOWN_CHARACTER_LENGTH, CodeRange.CR_UNKNOWN);
     }
 
     @Override
@@ -178,7 +178,7 @@ public String toString() {
 
     @Override
     public Rope withEncoding(Encoding newEncoding, CodeRange newCodeRange) {
-        return RopeOperations.create(getBytes(), newEncoding, newCodeRange);
+        return new NativeRope(pointer, byteLength(), newEncoding, UNKNOWN_CHARACTER_LENGTH, CodeRange.CR_UNKNOWN);
     }
 
     public Pointer getNativePointer() {

src/main/java/org/truffleruby/core/rope/RopeNodes.java

@@ -976,7 +976,7 @@ protected Rope withEncodingSameEncoding(Rope rope, Encoding encoding) {
 
         @Specialization(guards = "rope.getEncoding() != encoding")
         protected Rope nativeRopeWithEncoding(NativeRope rope, Encoding encoding) {
-            return rescanBytesForEncoding(rope, encoding);
+            return rope.withEncoding(encoding, rope.getCodeRange());
         }
 
         @Specialization(guards = {