ruby-oci8 2.2.6.1 → 2.2.7

data/ext/oci8/bind.c

@@ -11,6 +11,7 @@
 #endif
 
 static ID id_bind_type;
+static ID id_charset_form;
 static VALUE sym_length;
 static VALUE sym_length_semantics;
 static VALUE sym_char;
@@ -25,6 +26,29 @@ typedef struct {
     ub1 csfrm;
 } oci8_bind_string_t;
 
+static ub4 initial_chunk_size = 32 * 1024;
+static ub4 max_chunk_size = 8 * 1024 * 1024;
+
+typedef struct chunk {
+    struct chunk *next;
+    ub4 alloc_len;
+    ub4 used_len;
+    char buf[1];
+} chunk_t;
+
+typedef struct {
+    chunk_t *head;
+    chunk_t **tail;
+    chunk_t **inpos;
+} chunk_buf_t;
+
+typedef struct {
+    oci8_bind_t obind;
+    ub1 csfrm;
+} oci8_bind_long_t;
+
+#define IS_BIND_LONG(obind) (((oci8_bind_data_type_t*)obind->base.data_type)->dty == SQLT_CHR)
+
 const oci8_handle_data_type_t oci8_bind_data_type = {
     {
         "OCI8::BindType::Base",
@@ -306,6 +330,296 @@ static VALUE bind_boolean_alloc(VALUE klass)
     return oci8_allocate_typeddata(klass, &bind_boolean_data_type.base);
 }
 
+/*
+ * bind_long
+ */
+static chunk_t *next_chunk(chunk_buf_t *cb)
+{
+   chunk_t *chunk;
+
+   if (*cb->tail != NULL) {
+       chunk = *cb->tail;
+   } else {
+       ub4 alloc_len;
+       if (cb->head == NULL) {
+           alloc_len = initial_chunk_size;
+       } else {
+           alloc_len = ((chunk_t*)((size_t)cb->tail - offsetof(chunk_t, next)))->alloc_len * 2;
+           if (alloc_len > max_chunk_size) {
+               alloc_len = max_chunk_size;
+           }
+       }
+       chunk = xmalloc(offsetof(chunk_t, buf) + alloc_len);
+       chunk->next = NULL;
+       chunk->alloc_len = alloc_len;
+       *cb->tail = chunk;
+   }
+   cb->tail = &chunk->next;
+   return chunk;
+}
+
+static sb4 define_callback(void *octxp, OCIDefine *defnp, ub4 iter, void **bufpp, ub4 **alenp, ub1 *piecep, void **indp, ub2 **rcodep)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)octxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+    chunk_t *chunk;
+
+    if (*piecep == OCI_FIRST_PIECE) {
+        cb->tail = &cb->head;
+    }
+    chunk = next_chunk(cb);
+    chunk->used_len = chunk->alloc_len;
+    *bufpp = chunk->buf;
+    *alenp = &chunk->used_len;
+    *indp = (void*)&obind->u.inds[iter];
+    *rcodep = NULL;
+    return OCI_CONTINUE;
+}
+
+static sb4 in_bind_callback(void *ictxp, OCIBind *bindp, ub4 iter, ub4 index, void **bufpp, ub4 *alenp, ub1 *piecep, void **indp)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)ictxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+
+    if (cb->tail == &cb->head) {
+        /* empty string */
+        *bufpp = "";
+        *alenp = 0;
+        *piecep = OCI_ONE_PIECE;
+    } else {
+        chunk_t *chunk = *cb->inpos;
+        *bufpp = chunk->buf;
+        *alenp = chunk->used_len;
+        if (cb->tail == &cb->head->next) {
+            *piecep = OCI_ONE_PIECE;
+        } else if (cb->inpos == &cb->head) {
+            *piecep = OCI_FIRST_PIECE;
+            cb->inpos = &chunk->next;
+        } else if (&chunk->next != cb->tail) {
+            *piecep = OCI_NEXT_PIECE;
+            cb->inpos = &chunk->next;
+        } else {
+            *piecep = OCI_LAST_PIECE;
+            cb->inpos = &cb->head;
+        }
+    }
+    *indp = (void*)&obind->u.inds[iter];
+    return OCI_CONTINUE;
+}
+
+static sb4 out_bind_callback(void *octxp, OCIBind *bindp, ub4 iter, ub4 index, void **bufpp, ub4 **alenp, ub1 *piecep, void **indp, ub2 **rcodep)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)octxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+    chunk_t *chunk;
+
+    if (*piecep == OCI_ONE_PIECE) {
+        *piecep = OCI_FIRST_PIECE;
+        cb->tail = &cb->head;
+    }
+    chunk = next_chunk(cb);
+    chunk->used_len = chunk->alloc_len;
+    *bufpp = chunk->buf;
+    *alenp = &chunk->used_len;
+    *indp = (void*)&obind->u.inds[iter];
+    *rcodep = NULL;
+    return OCI_CONTINUE;
+}
+
+static void bind_long_free(oci8_base_t *base)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)base;
+    chunk_buf_t *cb = (chunk_buf_t *)obind->valuep;
+
+    if (cb != NULL) {
+        ub4 idx = 0;
+        do {
+            chunk_t *chunk, *chunk_next;
+            for (chunk = cb[idx].head; chunk != NULL; chunk = chunk_next) {
+                chunk_next = chunk->next;
+                xfree(chunk);
+            }
+        } while (++idx < obind->maxar_sz);
+    }
+    oci8_bind_free(base);
+}
+
+static VALUE bind_long_get(oci8_bind_t *obind, void *data, void *null_struct)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)data;
+    chunk_t *chunk;
+    long len = 0;
+    VALUE str;
+    char *buf;
+
+    for (chunk = cb->head; chunk != *cb->tail; chunk = chunk->next) {
+        len += chunk->used_len;
+    }
+    str = rb_str_buf_new(len);
+    buf = RSTRING_PTR(str);
+    for (chunk = cb->head; chunk != *cb->tail; chunk = chunk->next) {
+        memcpy(buf, chunk->buf, chunk->used_len);
+        buf += chunk->used_len;
+    }
+    rb_str_set_len(str, len);
+    if (IS_BIND_LONG(obind)) {
+        rb_encoding *enc = rb_default_internal_encoding();
+
+        rb_enc_associate(str, oci8_encoding);
+        if (enc != NULL) {
+            str = rb_str_conv_enc(str, oci8_encoding, enc);
+        }
+    }
+    OBJ_TAINT(str);
+    return str;
+}
+
+static void bind_long_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)data;
+    long len;
+    const char *buf;
+
+    if (IS_BIND_LONG(obind)) {
+        OCI8StringValue(val);
+    } else {
+        StringValue(val);
+    }
+    len = RSTRING_LEN(val);
+    buf = RSTRING_PTR(val);
+    cb->tail = &cb->head;
+    while (1) {
+        chunk_t *chunk = next_chunk(cb);
+        if (len <= chunk->alloc_len) {
+            memcpy(chunk->buf, buf, len);
+            chunk->used_len = len;
+            break;
+        }
+        memcpy(chunk->buf, buf, chunk->alloc_len);
+        chunk->used_len = chunk->alloc_len;
+        len -= chunk->alloc_len;
+        buf += chunk->alloc_len;
+    }
+}
+
+static void bind_long_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE param)
+{
+    if (IS_BIND_LONG(obind)) {
+        oci8_bind_long_t *obl = (oci8_bind_long_t *)obind;
+        VALUE nchar;
+
+        if (rb_respond_to(param, id_charset_form)) {
+            VALUE csfrm = rb_funcall(param, id_charset_form, 0);
+            nchar = (csfrm == sym_nchar) ? Qtrue : Qfalse;
+        } else {
+            Check_Type(param, T_HASH);
+            nchar = rb_hash_aref(param, sym_nchar);
+        }
+
+        if (RTEST(nchar)) {
+            obl->csfrm = SQLCS_NCHAR; /* bind as NCHAR/NVARCHAR2 */
+        } else {
+            obl->csfrm = SQLCS_IMPLICIT; /* bind as CHAR/VARCHAR2 */
+        }
+    }
+    obind->value_sz = SB4MAXVAL;
+    obind->alloc_sz = sizeof(chunk_buf_t);
+}
+
+static void bind_long_init_elem(oci8_bind_t *obind, VALUE svc)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)obind->valuep;
+    ub4 idx = 0;
+
+    do {
+        cb[idx].tail = &cb[idx].head;
+        cb[idx].inpos = &cb[idx].head;
+    } while (++idx < obind->maxar_sz);
+}
+
+static void bind_long_post_bind_hook(oci8_bind_t *obind)
+{
+    oci8_bind_long_t *ds = (oci8_bind_long_t *)obind;
+
+    if (IS_BIND_LONG(obind)) {
+        chker2(OCIAttrSet(obind->base.hp.ptr, obind->base.type, (void*)&ds->csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp),
+               &obind->base);
+    }
+    switch (obind->base.type) {
+    case OCI_HTYPE_DEFINE:
+        chker2(OCIDefineDynamic(obind->base.hp.dfn, oci8_errhp, obind, define_callback),
+               &obind->base);
+        break;
+    case OCI_HTYPE_BIND:
+        chker2(OCIBindDynamic(obind->base.hp.bnd, oci8_errhp, obind, in_bind_callback,
+                              obind, out_bind_callback),
+               &obind->base);
+        break;
+    }
+}
+
+static const oci8_bind_data_type_t bind_long_data_type = {
+    {
+        {
+            "OCI8::BindType::Long",
+            {
+                NULL,
+                oci8_handle_cleanup,
+                oci8_handle_size,
+            },
+            &oci8_bind_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+            RUBY_TYPED_WB_PROTECTED,
+#endif
+        },
+        bind_long_free,
+        sizeof(oci8_bind_long_t)
+    },
+    bind_long_get,
+    bind_long_set,
+    bind_long_init,
+    bind_long_init_elem,
+    NULL,
+    SQLT_CHR,
+    bind_long_post_bind_hook,
+};
+
+static VALUE bind_long_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_long_data_type.base);
+}
+
+static const oci8_bind_data_type_t bind_long_raw_data_type = {
+    {
+        {
+            "OCI8::BindType::LongRaw",
+            {
+                NULL,
+                oci8_handle_cleanup,
+                oci8_handle_size,
+            },
+            &oci8_bind_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+            RUBY_TYPED_WB_PROTECTED,
+#endif
+        },
+        bind_long_free,
+        sizeof(oci8_bind_long_t)
+    },
+    bind_long_get,
+    bind_long_set,
+    bind_long_init,
+    bind_long_init_elem,
+    NULL,
+    SQLT_BIN,
+    bind_long_post_bind_hook,
+};
+
+static VALUE bind_long_raw_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_long_raw_data_type.base);
+}
+
 static VALUE oci8_bind_get(VALUE self)
 {
     oci8_bind_t *obind = TO_BIND(self);
@@ -320,11 +634,20 @@ static VALUE oci8_bind_get(VALUE self)
     return data_type->get(obind, (void*)((size_t)obind->valuep + obind->alloc_sz * idx), null_structp);
 }
 
-static VALUE oci8_bind_get_data(VALUE self)
+static VALUE oci8_bind_get_data(int argc, VALUE *argv, VALUE self)
 {
     oci8_bind_t *obind = TO_BIND(self);
+    VALUE index;
 
-    if (obind->maxar_sz == 0) {
+    rb_scan_args(argc, argv, "01", &index);
+    if (!NIL_P(index)) {
+        ub4 idx = NUM2UINT(index);
+        if (idx >= obind->maxar_sz) {
+            rb_raise(rb_eRuntimeError, "data index is too big. (%u for %u)", idx, obind->maxar_sz);
+        }
+        obind->curar_idx = idx;
+        return rb_funcall(self, oci8_id_get, 0);
+    } else if (obind->maxar_sz == 0) {
         obind->curar_idx = 0;
         return rb_funcall(self, oci8_id_get, 0);
     } else {
@@ -391,6 +714,36 @@ static VALUE oci8_bind_set_data(VALUE self, VALUE val)
     return self;
 }
 
+static VALUE get_initial_chunk_size(VALUE klass)
+{
+    return UINT2NUM(initial_chunk_size);
+}
+
+static VALUE set_initial_chunk_size(VALUE klass, VALUE arg)
+{
+    ub4 size = NUM2UINT(arg);
+    if (size == 0) {
+        rb_raise(rb_eArgError, "Could not set zero");
+    }
+    initial_chunk_size = size;
+    return arg;
+}
+
+static VALUE get_max_chunk_size(VALUE klass)
+{
+    return UINT2NUM(max_chunk_size);
+}
+
+static VALUE set_max_chunk_size(VALUE klass, VALUE arg)
+{
+    ub4 size = NUM2UINT(arg);
+    if (size == 0) {
+        rb_raise(rb_eArgError, "Could not set zero");
+    }
+    max_chunk_size = size;
+    return arg;
+}
+
 static VALUE oci8_bind_initialize(VALUE self, VALUE svc, VALUE val, VALUE length, VALUE max_array_size)
 {
     oci8_bind_t *obind = TO_BIND(self);
@@ -456,6 +809,7 @@ void Init_oci8_bind(VALUE klass)
 {
     cOCI8BindTypeBase = klass;
     id_bind_type = rb_intern("bind_type");
+    id_charset_form = rb_intern("charset_form");
     sym_length = ID2SYM(rb_intern("length"));
     sym_length_semantics = ID2SYM(rb_intern("length_semantics"));
     sym_char = ID2SYM(rb_intern("char"));
@@ -464,9 +818,14 @@ void Init_oci8_bind(VALUE klass)
     rb_define_method(cOCI8BindTypeBase, "initialize", oci8_bind_initialize, 4);
     rb_define_method(cOCI8BindTypeBase, "get", oci8_bind_get, 0);
     rb_define_method(cOCI8BindTypeBase, "set", oci8_bind_set, 1);
-    rb_define_private_method(cOCI8BindTypeBase, "get_data", oci8_bind_get_data, 0);
+    rb_define_private_method(cOCI8BindTypeBase, "get_data", oci8_bind_get_data, -1);
     rb_define_private_method(cOCI8BindTypeBase, "set_data", oci8_bind_set_data, 1);
 
+    rb_define_singleton_method(klass, "initial_chunk_size", get_initial_chunk_size, 0);
+    rb_define_singleton_method(klass, "initial_chunk_size=", set_initial_chunk_size, 1);
+    rb_define_singleton_method(klass, "max_chunk_size", get_max_chunk_size, 0);
+    rb_define_singleton_method(klass, "max_chunk_size=", set_max_chunk_size, 1);
+
     /* register primitive data types. */
     oci8_define_bind_class("String", &bind_string_data_type, bind_string_alloc);
     oci8_define_bind_class("RAW", &bind_raw_data_type, bind_raw_alloc);
@@ -474,4 +833,6 @@ void Init_oci8_bind(VALUE klass)
     if (oracle_client_version >= ORAVER_12_1) {
         oci8_define_bind_class("Boolean", &bind_boolean_data_type, bind_boolean_alloc);
     }
+    klass = oci8_define_bind_class("Long", &bind_long_data_type, bind_long_alloc);
+    klass = oci8_define_bind_class("LongRaw", &bind_long_data_type, bind_long_raw_alloc);
 }

data/ext/oci8/lob.c

@@ -639,10 +639,9 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 {
     oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
-    ub8 lob_length;
-    ub8 read_len;
     ub8 pos = lob->pos;
-    long strbufsiz;
+    long strbufsiz = 512;
+    ub8 sz;
     ub8 byte_amt;
     ub8 char_amt;
     sword rv;
@@ -652,36 +651,21 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
     ub1 piece = OCI_FIRST_PIECE;
 
     rb_scan_args(argc, argv, "01", &size);
-    lob_length = oci8_lob_get_length(lob);
-    if (lob_length == 0 && NIL_P(size)) {
-        return rb_usascii_str_new("", 0);
-    }
-    if (lob_length <= pos) /* EOF */
-        return Qnil;
     if (NIL_P(size)) {
-        read_len = lob_length - pos;
+        sz = UB4MAXVAL;
     } else {
-        ub8 sz = NUM2ULL(size);
-        read_len = MIN(sz, lob_length - pos);
+        sz = NUM2ULL(size);
+    }
+    if (lob->state == S_BFILE_CLOSE) {
+        open_bfile(svcctx, lob, errhp);
     }
+read_more_data:
     if (lob->lobtype == OCI_TEMP_CLOB) {
         byte_amt = 0;
-        char_amt = read_len;
-        if (oci8_nls_ratio == 1) {
-            strbufsiz = MIN(read_len, ULONG_MAX);
-        } else {
-            strbufsiz = MIN(read_len + read_len / 8, ULONG_MAX);
-        }
-        if (strbufsiz <= 10) {
-            strbufsiz = 10;
-        }
+        char_amt = sz;
     } else {
-        byte_amt = read_len;
+        byte_amt = sz;
         char_amt = 0;
-        strbufsiz = MIN(read_len, ULONG_MAX);
-    }
-    if (lob->state == S_BFILE_CLOSE) {
-        open_bfile(svcctx, lob, errhp);
     }
     do {
         VALUE strbuf = rb_str_buf_new(strbufsiz);
@@ -711,15 +695,24 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
         }
         rb_str_set_len(strbuf, byte_amt);
         rb_ary_push(v, strbuf);
+        if (strbufsiz < 128 * 1024 * 1024) {
+            strbufsiz *= 2;
+        }
     } while (rv == OCI_NEED_DATA);
 
-    if (pos >= lob_length) {
-        bfile_close(lob);
+    if (NIL_P(size) && pos - lob->pos == sz) {
+        lob->pos = pos;
+        piece = OCI_FIRST_PIECE;
+        goto read_more_data;
     }
     lob->pos = pos;
     switch (RARRAY_LEN(v)) {
     case 0:
-        return Qnil;
+        if (NIL_P(size) && pos == 0) {
+            return rb_usascii_str_new("", 0);
+        } else {
+            return Qnil;
+        }
     case 1:
         v = RARRAY_AREF(v, 0);
         break;