ruby-oci8 2.1.8 → 2.2.0.1

data/ext/oci8/env.c

@@ -5,12 +5,7 @@
  * Copyright (C) 2002-2011 KUBO Takehiro <kubo@jiubao.org>
  */
 #include "oci8.h"
-
-#if defined(HAVE_RUBY_UTIL_H)
 #include <ruby/util.h>
-#elif defined(HAVE_UTIL_H)
-#include <util.h>
-#endif
 
 ub4 oci8_env_mode = OCI_OBJECT | OCI_THREADED;
 
@@ -27,7 +22,6 @@ OCIEnv *oci8_make_envhp(void)
     return oci8_global_envhp;
 }
 
-#ifdef USE_THREAD_LOCAL_ERRHP
 /*
  * Setup thread-local oci8_errhp.
  */
@@ -87,48 +81,10 @@ OCIError *oci8_make_errhp(void)
     oci8_tls_set(oci8_tls_key, (void*)errhp);
     return errhp;
 }
-#else
-/*
- * oci8_errhp is global in ruby 1.8 configured without --enable-pthread on Unix.
- */
-OCIError *oci8_global_errhp;
-
-OCIError *oci8_make_errhp(void)
-{
-    sword rv;
-
-    rv = OCIHandleAlloc(oci8_envhp, (dvoid *)&oci8_global_errhp, OCI_HTYPE_ERROR, 0, NULL);
-    if (rv != OCI_SUCCESS)
-        oci8_env_raise(oci8_envhp, rv);
-    return oci8_global_errhp;
-}
-#endif
 
 void Init_oci8_env(void)
 {
-#ifdef USE_THREAD_LOCAL_ERRHP
     int error;
-#endif
-
-#if !defined(NATIVE_THREAD_WITH_GVL) && !defined(_WIN32)
-    /* workaround code.
-     *
-     * Some instant clients set the environment variables
-     * ORA_NLS_PROFILE33, ORA_NLS10 and ORACLE_HOME if they aren't
-     * set. It causes problems on some platforms.
-     */
-    if (RTEST(rb_eval_string("RUBY_VERSION == \"1.8.4\""))) {
-        if (getenv("ORA_NLS_PROFILE33") == NULL) {
-            ruby_setenv("ORA_NLS_PROFILE33", "");
-        }
-        if (getenv("ORA_NLS10") == NULL) {
-            ruby_setenv("ORA_NLS10", "");
-        }
-        if (getenv("ORACLE_HOME") == NULL) {
-            ruby_setenv("ORACLE_HOME", ".");
-        }
-    }
-#endif /* WIN32 */
 
     /* workaround code.
      *
@@ -156,7 +112,6 @@ void Init_oci8_env(void)
         }
     }
 
-#ifdef USE_THREAD_LOCAL_ERRHP
 #if defined(_WIN32)
     if (!dllmain_is_called) {
         /* sanity check */
@@ -174,5 +129,4 @@ void Init_oci8_env(void)
     if (error != 0) {
         rb_raise(rb_eRuntimeError, "Cannot create thread local key (errno = %d)", error);
     }
-#endif
 }

data/ext/oci8/error.c

@@ -2,20 +2,10 @@
 /*
   error.c - part of ruby-oci8
 
-  Copyright (C) 2002-2012 KUBO Takehiro <kubo@jiubao.org>
+  Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
 
 */
-#if defined __linux && !defined(_GNU_SOURCE)
-#define _GNU_SOURCE 1
-#endif
 #include "oci8.h"
-#ifdef HAVE_DLADDR
-#include <dlfcn.h>
-#endif
-#ifdef __CYGWIN__
-#undef boolean
-#include <windows.h>
-#endif
 
 #ifndef DLEXT
 #define DLEXT ".so"
@@ -227,22 +217,8 @@ void oci8_do_raise_init_error(const char *file, int line)
 {
     VALUE msg = rb_usascii_str_new_cstr("OCI Library Initialization Error");
     VALUE exc;
-    const char *dll_path = NULL;
-#if defined _WIN32 || defined __CYGWIN__
-    HMODULE hMod = GetModuleHandleA("OCI.DLL");
-    char buf[MAX_PATH];
-    if (hMod != NULL) {
-        if (GetModuleFileName(hMod, buf, sizeof(buf))) {
-            dll_path = buf;
-        }
-    }
-#elif defined HAVE_DLADDR
-    void *addr = dlsym(RTLD_DEFAULT, "OCIEnvCreate");
-    Dl_info info;
-    if (addr != NULL && dladdr(addr, &info)) {
-        dll_path = info.dli_fname;
-    }
-#endif
+    const char *dll_path = oci8_dll_path();
+
     if (dll_path != NULL) {
         msg = rb_str_buf_cat_ascii(msg, " - ");
         msg = rb_enc_str_buf_cat(msg, dll_path, strlen(dll_path), rb_filesystem_encoding());
@@ -258,12 +234,10 @@ VALUE oci8_get_error_message(ub4 msgno, const char *default_msg)
     const char *errmsg = NULL;
     char msgbuf[64];
 
-    if (have_OCIMessageGet) {
-        if (msghp == NULL) {
-            chkerr(OCIMessageOpen(oci8_envhp, oci8_errhp, &msghp, TO_CONST_ORATEXT("rdbms"), TO_CONST_ORATEXT("ora"), OCI_DURATION_PROCESS));
-        }
-        errmsg = TO_CHARPTR(OCIMessageGet(msghp, msgno, NULL, 0));
+    if (msghp == NULL) {
+        chkerr(OCIMessageOpen(oci8_envhp, oci8_errhp, &msghp, TO_CONST_ORATEXT("rdbms"), TO_CONST_ORATEXT("ora"), OCI_DURATION_PROCESS));
     }
+    errmsg = TO_CHARPTR(OCIMessageGet(msghp, msgno, NULL, 0));
     if (errmsg == NULL) {
         if (default_msg != NULL) {
             errmsg = default_msg;

data/ext/oci8/extconf.rb

@@ -1,3 +1,8 @@
+if RUBY_VERSION < "1.9"
+  puts "Ruby-oci8 doesn't work ruby 1.8 since ruby-oci8 2.2.0."
+  exit 1
+end
+
 begin
   require 'mkmf'
 rescue LoadError
@@ -12,24 +17,10 @@ end
 require File.dirname(__FILE__) + '/oraconf'
 require File.dirname(__FILE__) + '/apiwrap'
 require File.dirname(__FILE__) + '/../../lib/oci8/oracle_version.rb'
-
-RUBY_OCI8_VERSION = File.read("#{File.dirname(__FILE__)}/../../VERSION").chomp
+require File.dirname(__FILE__) + '/../../lib/oci8/version.rb'
 
 oraconf = OraConf.get()
 
-def replace_keyword(source, target, replace)
-  puts "creating #{target} from #{source}"
-  open(source, "rb") { |f|
-    buf = f.read
-    replace.each do |key, value|
-      buf.gsub!('@@' + key + '@@', value)
-    end
-    open(target, "wb") {|fw|
-      fw.write buf
-    }
-  }        
-end
-
 $CFLAGS += oraconf.cflags
 saved_libs = $libs
 $libs += oraconf.libs
@@ -46,6 +37,8 @@ YAML.load(open(File.dirname(__FILE__) + '/apiwrap.yml')).each do |key, val|
   funcs[ver] ||= []
   funcs[ver] << key
 end
+
+saved_defs = $defs.clone
 funcs.keys.sort.each do |version|
   next if version == 0x08000000
   verstr = format('%d.%d.%d', ((version >> 24) & 0xFF), ((version >> 20) & 0xF), ((version >> 12) & 0xFF))
@@ -62,6 +55,7 @@ funcs.keys.sort.each do |version|
   puts "checking for Oracle #{verstr} API - #{result}"
   break if result == 'fail'
 end
+$defs = saved_defs
 
 have_type('oratext', 'ociap.h')
 have_type('OCIDateTime*', 'ociap.h')
@@ -83,6 +77,25 @@ $defs << "-DORACLE_CLIENT_VERSION=#{format('0x%08x', oci_client_version)}"
 if with_config('runtime-check')
   $defs << "-DRUNTIME_API_CHECK=1"
   $libs = saved_libs
+else
+  oraver = OCI8::OracleVersion.new(oci_client_version)
+  if oraver < OCI8::OracleVersion.new(10)
+    case "#{oraver.major}.#{oraver.minor}"
+    when "8.0"
+      ora_name = "Oracle 8"
+      oci8_ver = "2.0.x"
+    when "8.1"
+      ora_name = "Oracle 8i"
+      oci8_ver = "2.0.x"
+    when "9.1"
+      ora_name = "Oracle 9iR1"
+      oci8_ver = "2.1.x"
+    when "9.2"
+      ora_name = "Oracle 9iR2"
+      oci8_ver = "2.1.x"
+    end
+    raise "Ruby-oci8 #{OCI8::VERSION} doesn't support #{ora_name}. Use ruby-oci8 #{oci8_ver} instead."
+  end
 end
 
 $objs = ["oci8lib.o", "env.o", "error.o", "oci8.o", "ocihandle.o",
@@ -90,7 +103,7 @@ $objs = ["oci8lib.o", "env.o", "error.o", "oci8.o", "ocihandle.o",
          "stmt.o", "bind.o", "metadata.o", "attr.o",
          "lob.o", "oradate.o",
          "ocinumber.o", "ocidatetime.o", "object.o", "apiwrap.o",
-         "encoding.o", "oranumber_util.o", "thread_util.o"]
+         "encoding.o", "oranumber_util.o", "thread_util.o", "util.o"]
 
 if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/
   $defs << "-DUSE_WIN32_C"
@@ -104,24 +117,13 @@ end
 
 have_func("localtime_r")
 have_func("dladdr")
+have_func("dlmodinfo")
+have_func("dlgetname")
 
-# ruby 1.8 headers
-have_header("intern.h")
-have_header("util.h")
-# ruby 1.9.1 headers
-have_header("ruby/util.h")
-have_type('rb_encoding', ['ruby/ruby.h', 'ruby/encoding.h'])
 # ruby 2.0.0 headers
 have_header("ruby/thread.h")
 
-# $! in C API
-have_var("ruby_errinfo", "ruby.h") # ruby 1.8
-have_func("rb_errinfo", "ruby.h")  # ruby 1.9
-
-have_func("rb_str_set_len", "ruby.h")
-have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
-have_func("rb_thread_blocking_region", "ruby.h")
 have_func("rb_thread_call_without_gvl", "ruby/thread.h")
 have_func("rb_sym2str", "ruby.h")
 if (defined? RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
@@ -129,15 +131,6 @@ if (defined? RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   have_func("rb_enc_str_buf_cat", "ruby.h")
 end
 
-# replace files
-replace = {
-  'OCI8_CLIENT_VERSION' => oraconf.version,
-  'OCI8_MODULE_VERSION' => RUBY_OCI8_VERSION
-}
-
-# make ruby script before running create_makefile.
-replace_keyword(File.dirname(__FILE__) + '/../../lib/oci8.rb.in', '../../lib/oci8.rb', replace)
-
 ruby_engine = (defined? RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 
 so_basename = 'oci8lib_'
@@ -194,6 +187,7 @@ else
   plthook_src = "plthook_elf.c"
 end
 if xsystem(cc_command("").gsub(CONFTEST_C, File.dirname(__FILE__) + "/" + plthook_src))
+  File.delete(plthook_src.gsub(/\.c$/, '.' + RbConfig::CONFIG["OBJEXT"]))
   puts plthook_src
   $objs << plthook_src.gsub(/\.c$/, '.o')
   $objs << "hook_funcs.o"
@@ -204,7 +198,7 @@ end
 
 $defs << "-DInit_oci8lib=Init_#{so_basename}"
 $defs << "-Doci8lib=#{so_basename}"
-$defs << "-DOCI8LIB_VERSION=\\\"#{RUBY_OCI8_VERSION}\\\""
+$defs << "-DOCI8LIB_VERSION=\\\"#{OCI8::VERSION}\\\""
 $defs << "-DCHAR_IS_NOT_A_SHORTCUT_TO_ID" if ruby_engine != 'ruby'
 
 create_header()

data/ext/oci8/lob.c

@@ -20,6 +20,10 @@ static VALUE seek_end;
 
 #define TO_LOB(obj) ((oci8_lob_t *)oci8_check_typeddata((obj), &oci8_lob_data_type, 1))
 
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 enum state {
     S_NO_OPEN_CLOSE,
     S_OPEN,
@@ -30,8 +34,7 @@ enum state {
 typedef struct {
     oci8_base_t base;
     oci8_svcctx_t *svcctx;
-    ub4 pos;
-    int char_width;
+    ub8 pos;
     ub1 csfrm;
     ub1 lobtype;
     enum state state;
@@ -65,8 +68,6 @@ static void oci8_lob_free(oci8_base_t *base)
     if (svcctx != NULL
         && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
-
-#ifdef NATIVE_THREAD_WITH_GVL
         oci8_temp_lob_t *temp_lob = ALLOC(oci8_temp_lob_t);
 
         temp_lob->next = svcctx->temp_lobs;
@@ -75,10 +76,6 @@ static void oci8_lob_free(oci8_base_t *base)
         lob->base.type = 0;
         lob->base.closed = 1;
         lob->base.hp.ptr = NULL;
-#else
-        /* FIXME: This may stall the GC. */
-        OCILobFreeTemporary(svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob);
-#endif
     }
     lob->svcctx = NULL;
 }
@@ -259,12 +256,12 @@ void oci8_assign_bfile(oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
     oci8_assign_lob(cOCI8BFILE, svcctx, lob, dest);
 }
 
-static ub4 oci8_lob_get_length(oci8_lob_t *lob)
+static ub8 oci8_lob_get_length(oci8_lob_t *lob)
 {
     oci8_svcctx_t *svcctx = check_svcctx(lob);
-    ub4 len;
+    ub8 len;
 
-    chker2(OCILobGetLength_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
+    chker2(OCILobGetLength2_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
            &svcctx->base);
     return len;
 }
@@ -305,6 +302,10 @@ static void bfile_close(oci8_lob_t *lob)
 /*
  *  Document-class: OCI8::LOB
  *
+ *  OCI8::LOB is an I/O object. LOB contents are read from and written
+ *  to the Oracle server via an associating connection. When a connection
+ *  is closed, associating LOBs are also closed.
+ *
  *  This is the abstract base class of large-object data types; {BFILE}, {BLOB}, {CLOB} and {NCLOB}.
  *
  */
@@ -387,7 +388,6 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
         oci8_env_raise(oci8_envhp, rv);
     lob->base.type = OCI_DTYPE_LOB;
     lob->pos = 0;
-    lob->char_width = 1;
     lob->csfrm = csfrm;
     lob->lobtype = lobtype;
     lob->state = S_NO_OPEN_CLOSE;
@@ -473,26 +473,6 @@ static VALUE oci8_blob_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *    __char_width = size
- *
- *  @private
- *  IMO, nobody need and use this.
- */
-static VALUE oci8_lob_set_char_width(VALUE self, VALUE vsize)
-{
-    oci8_lob_t *lob = TO_LOB(self);
-    int size;
-
-    size = NUM2INT(vsize); /* 1 */
-
-    if (size <= 0)
-        rb_raise(rb_eArgError, "size must be more than one.");
-    lob->char_width = size;
-    return vsize;
-}
-
 /*
  *  Returns +true+ when <i>self</i> is initialized.
  *
@@ -517,7 +497,7 @@ static VALUE oci8_lob_available_p(VALUE self)
  */
 static VALUE oci8_lob_get_size(VALUE self)
 {
-    return UB4_TO_NUM(oci8_lob_get_length(TO_LOB(self)));
+    return ULL2NUM(oci8_lob_get_length(TO_LOB(self)));
 }
 
 /*
@@ -530,7 +510,7 @@ static VALUE oci8_lob_get_size(VALUE self)
 static VALUE oci8_lob_get_pos(VALUE self)
 {
     oci8_lob_t *lob = TO_LOB(self);
-    return UB4_TO_NUM(lob->pos);
+    return ULL2NUM(lob->pos);
 }
 
 /*
@@ -577,11 +557,11 @@ static VALUE oci8_lob_seek(int argc, VALUE *argv, VALUE self)
         }
     }
     if (whence == seek_cur) {
-        position = rb_funcall(UB4_TO_NUM(lob->pos), id_plus, 1, position);
+        position = rb_funcall(ULL2NUM(lob->pos), id_plus, 1, position);
     } else if (whence == seek_end) {
-        position = rb_funcall(UB4_TO_NUM(oci8_lob_get_length(lob)), id_plus, 1, position);
+        position = rb_funcall(ULL2NUM(oci8_lob_get_length(lob)), id_plus, 1, position);
     }
-    lob->pos = NUM2UINT(position);
+    lob->pos = NUM2ULL(position);
     return self;
 }
 
@@ -612,7 +592,7 @@ static VALUE oci8_lob_truncate(VALUE self, VALUE len)
     oci8_svcctx_t *svcctx = check_svcctx(lob);
 
     lob_open(lob);
-    chker2(OCILobTrim_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2UINT(len)),
+    chker2(OCILobTrim2_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2ULL(len)),
            &svcctx->base);
     return self;
 }
@@ -632,6 +612,32 @@ static VALUE oci8_lob_set_size(VALUE self, VALUE len)
     return len;
 }
 
+static void open_bfile(oci8_svcctx_t *svcctx, oci8_lob_t *lob, OCIError *errhp)
+{
+    while (1) {
+        sword rv = OCILobFileOpen_nb(svcctx, svcctx->base.hp.svc, errhp, lob->base.hp.lob, OCI_FILE_READONLY);
+        if (rv == OCI_ERROR && oci8_get_error_code(oci8_errhp) == 22290) {
+            /* ORA-22290: operation would exceed the maximum number of opened files or LOBs */
+            /* close all opened BFILE implicitly. */
+            oci8_base_t *base;
+            for (base = &lob->base; base != &lob->base; base = base->next) {
+                if (base->type == OCI_DTYPE_LOB) {
+                    oci8_lob_t *tmp = (oci8_lob_t *)base;
+                    if (tmp->state == S_BFILE_OPEN) {
+                        chker2(OCILobFileClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, tmp->base.hp.lob),
+                               &svcctx->base);
+                        tmp->state = S_BFILE_CLOSE;
+                    }
+                }
+            }
+        } else {
+            chker2(rv, &svcctx->base);
+            lob->state = S_BFILE_OPEN;
+            return;
+        }
+    }
+}
+
 /*
  * @overload read
  *
@@ -659,61 +665,55 @@ 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);
-    ub4 length;
-    ub4 nchar;
-    long nbyte;
-    ub4 amt;
+    ub8 lob_length;
+    ub8 read_len;
+    ub8 pos = lob->pos;
+    long strbufsiz;
+    ub8 byte_amt;
+    ub8 char_amt;
     sword rv;
-    size_t buf_size_in_char;
     VALUE size;
     VALUE v = rb_ary_new();
+    OCIError *errhp = oci8_errhp;
+    ub1 piece = OCI_FIRST_PIECE;
 
     rb_scan_args(argc, argv, "01", &size);
-    length = oci8_lob_get_length(lob);
-    if (length == 0 && NIL_P(size)) {
+    lob_length = oci8_lob_get_length(lob);
+    if (lob_length == 0 && NIL_P(size)) {
         return rb_usascii_str_new("", 0);
     }
-    if (length <= lob->pos) /* EOF */
+    if (lob_length <= pos) /* EOF */
         return Qnil;
-    length -= lob->pos;
     if (NIL_P(size)) {
-        nchar = length; /* read until EOF */
+        read_len = lob_length - pos;
     } else {
-        nchar = NUM2UINT(size);
-        if (nchar > length)
-            nchar = length;
+        ub8 sz = NUM2ULL(size);
+        read_len = MIN(sz, lob_length - pos);
+    }
+    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;
+        }
+    } else {
+        byte_amt = read_len;
+        char_amt = 0;
+        strbufsiz = MIN(read_len, ULONG_MAX);
+    }
+    if (lob->state == S_BFILE_CLOSE) {
+        open_bfile(svcctx, lob, errhp);
     }
-    nbyte = oci8_nls_ratio * (long)nchar;
-    amt = nchar;
-    buf_size_in_char = nbyte / lob->char_width;
     do {
-        VALUE strbuf = rb_str_buf_new(nbyte);
+        VALUE strbuf = rb_str_buf_new(strbufsiz);
         char *buf = RSTRING_PTR(strbuf);
 
-        if (lob->state == S_BFILE_CLOSE) {
-            rv = OCILobFileOpen_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, OCI_FILE_READONLY);
-            if (rv == OCI_ERROR && oci8_get_error_code(oci8_errhp) == 22290) {
-                /* ORA-22290: operation would exceed the maximum number of opened files or LOBs */
-                /* close all opened BFILE implicitly. */
-                oci8_base_t *base;
-                for (base = &lob->base; base != &lob->base; base = base->next) {
-                    if (base->type == OCI_DTYPE_LOB) {
-                        oci8_lob_t *tmp = (oci8_lob_t *)base;
-                        if (tmp->state == S_BFILE_OPEN) {
-                            tmp->state = S_BFILE_CLOSE;
-                        }
-                    }
-                }
-                chker2(OCILobFileCloseAll_nb(svcctx, svcctx->base.hp.svc, oci8_errhp),
-                       &svcctx->base);
-                continue;
-            }
-            chker2(rv, &svcctx->base);
-            lob->state = S_BFILE_OPEN;
-        }
-        /* initialize buf in zeros everytime to check a nul characters. */
-        memset(buf, 0, nbyte);
-        rv = OCILobRead_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, buf, nbyte, NULL, NULL, 0, lob->csfrm);
+        rv = OCILobRead2_nb(svcctx, svcctx->base.hp.svc, errhp, lob->base.hp.lob, &byte_amt, &char_amt, pos + 1, buf, strbufsiz, piece, NULL, NULL, 0, lob->csfrm);
         svcctx->suppress_free_temp_lobs = 0;
         switch (rv) {
         case OCI_SUCCESS:
@@ -723,48 +723,32 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
              * See: https://github.com/kubo/ruby-oci8/issues/20
              */
             svcctx->suppress_free_temp_lobs = 1;
+            piece = OCI_NEXT_PIECE;
             break;
-        case OCI_ERROR:
-            if (oci8_get_error_code(oci8_errhp) == 22289) {
-                /* ORA-22289: cannot perform FILEREAD operation on an unopened file or LOB */
-                if (lob->state == S_BFILE_CLOSE)
-                    continue;
-            }
-            /* FALLTHROUGH */
         default:
             chker2(rv, &svcctx->base);
         }
-
-        /* Workaround when using Oracle 10.2.0.4 or 11.1.0.6 client and
-         * variable-length character set (e.g. AL32UTF8).
-         *
-         * When the above mentioned condition, amt may be shorter. So
-         * amt is increaded until a nul character to know the actually
-         * read size.
-         */
-        while (amt < nbyte && buf[amt] != '\0') {
-            amt++;
-        }
-
-        if (amt == 0)
+        if (byte_amt == 0)
             break;
-        /* for fixed size charset, amt is the number of characters stored in buf. */
-        if (amt > buf_size_in_char)
-            rb_raise(eOCIException, "Too large buffer fetched or you set too large size of a character.");
-        amt *= lob->char_width;
-        rb_str_set_len(strbuf, amt);
+        if (lob->lobtype == OCI_TEMP_CLOB) {
+            pos += char_amt;
+        } else {
+            pos += byte_amt;
+        }
+        rb_str_set_len(strbuf, byte_amt);
         rb_ary_push(v, strbuf);
     } while (rv == OCI_NEED_DATA);
-    lob->pos += nchar;
-    if (nchar == length) {
+
+    if (pos >= lob_length) {
         lob_close(lob);
         bfile_close(lob);
     }
+    lob->pos = pos;
     switch (RARRAY_LEN(v)) {
     case 0:
         return Qnil;
     case 1:
-        v = RARRAY_PTR(v)[0];
+        v = RARRAY_AREF(v, 0);
         break;
     default:
         v = rb_ary_join(v, Qnil);
@@ -793,25 +777,35 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
 {
     oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
-    ub4 amt;
+    volatile VALUE str;
+    ub8 byte_amt;
+    ub8 char_amt;
 
     lob_open(lob);
     if (TYPE(data) != T_STRING) {
-        data = rb_obj_as_string(data);
+        str = rb_obj_as_string(data);
+    } else {
+        str = data;
     }
     if (lob->lobtype == OCI_TEMP_CLOB) {
-        data = rb_str_export_to_enc(data, oci8_encoding);
+        str = rb_str_export_to_enc(str, oci8_encoding);
     }
-    RB_GC_GUARD(data);
-    amt = RSTRING_LEN(data);
-    if (amt == 0) {
+    byte_amt = RSTRING_LEN(str);
+    if (byte_amt == 0) {
         /* to avoid ORA-24801: illegal parameter value in OCI lob function */
         return INT2FIX(0);
     }
-    chker2(OCILobWrite_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, RSTRING_PTR(data), amt, OCI_ONE_PIECE, NULL, NULL, 0, lob->csfrm),
+    char_amt = 0;
+    chker2(OCILobWrite2_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &byte_amt, &char_amt, lob->pos + 1, RSTRING_PTR(str), byte_amt, OCI_ONE_PIECE, NULL, NULL, 0, lob->csfrm),
            &svcctx->base);
-    lob->pos += amt;
-    return UINT2NUM(amt);
+    RB_GC_GUARD(str);
+    if (lob->lobtype == OCI_TEMP_CLOB) {
+        lob->pos += char_amt;
+        return UINT2NUM(char_amt);
+    } else {
+        lob->pos += byte_amt;
+        return UINT2NUM(byte_amt);
+    }
 }
 
 /*
@@ -972,7 +966,6 @@ static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
     }
     lob->base.type = OCI_DTYPE_LOB;
     lob->pos = 0;
-    lob->char_width = 1;
     lob->csfrm = SQLCS_IMPLICIT;
     lob->lobtype = OCI_TEMP_BLOB;
     lob->state = S_BFILE_CLOSE;
@@ -1294,7 +1287,6 @@ void Init_oci8_lob(VALUE cOCI8)
     rb_define_method(cOCI8CLOB, "initialize", oci8_clob_initialize, -1);
     rb_define_method(cOCI8NCLOB, "initialize", oci8_nclob_initialize, -1);
     rb_define_method(cOCI8BLOB, "initialize", oci8_blob_initialize, -1);
-    rb_define_private_method(cOCI8LOB, "__char_width=", oci8_lob_set_char_width, 1);
     rb_define_method(cOCI8LOB, "available?", oci8_lob_available_p, 0);
     rb_define_method(cOCI8LOB, "size", oci8_lob_get_size, 0);
     rb_define_method(cOCI8LOB, "pos", oci8_lob_get_pos, 0);