ruby-oci8 2.1.7 → 2.1.8

data/ext/oci8/connection_pool.c

@@ -2,13 +2,15 @@
 /*
  * connection_pool.c - part of ruby-oci8
  *
- * Copyright (C) 2010 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2010-2014 Kubo Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
 
 static VALUE cOCIConnectionPool;
 
+#define TO_CPOOL(obj) ((oci8_cpool_t *)oci8_check_typeddata((obj), &oci8_cpool_data_type, 1))
+
 typedef struct {
     oci8_base_t base;
     VALUE pool_name;
@@ -32,23 +34,36 @@ static void oci8_cpool_free(oci8_base_t *base)
 {
     oci8_run_native_thread(cpool_free_thread, base->hp.poolhp);
     base->type = 0;
+    base->closed = 1;
     base->hp.ptr = NULL;
 }
 
-static void oci8_cpool_init(oci8_base_t *base)
+static const oci8_handle_data_type_t oci8_cpool_data_type = {
+    {
+        "OCI8::ConnectionPool",
+        {
+            (RUBY_DATA_FUNC)oci8_cpool_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_cpool_free,
+    sizeof(oci8_cpool_t),
+};
+
+static VALUE oci8_cpool_alloc(VALUE klass)
 {
-    oci8_cpool_t *cpool = (oci8_cpool_t *)base;
+    VALUE self = oci8_allocate_typeddata(klass, &oci8_cpool_data_type);
+    oci8_cpool_t *cpool = (oci8_cpool_t *)RTYPEDDATA_DATA(self);
 
     cpool->pool_name = Qnil;
+    return self;
 }
 
-static oci8_base_vtable_t oci8_cpool_vtable = {
-    oci8_cpool_mark,
-    oci8_cpool_free,
-    sizeof(oci8_cpool_t),
-    oci8_cpool_init,
-};
-
 /*
  * call-seq:
  *   OCI8::ConnectionPool.new(conn_min, conn_max, conn_incr, username = nil, password = nil, dbname = nil) -> connection pool
@@ -89,9 +104,9 @@ static VALUE oci8_cpool_initialize(int argc, VALUE *argv, VALUE self)
     VALUE username;
     VALUE password;
     VALUE dbname;
-    oci8_cpool_t *cpool = DATA_PTR(self);
-    OraText *pool_name;
-    sb4 pool_name_len;
+    oci8_cpool_t *cpool = TO_CPOOL(self);
+    OraText *pool_name = NULL;
+    sb4 pool_name_len = 0;
     sword rv;
 
     /* check arguments */
@@ -138,7 +153,7 @@ static VALUE oci8_cpool_initialize(int argc, VALUE *argv, VALUE self)
                                    NIL_P(password) ? 0 : RSTRING_LEN(password),
                                    OCI_DEFAULT),
            &cpool->base);
-    cpool->pool_name = rb_str_new(TO_CHARPTR(pool_name), pool_name_len);
+    RB_OBJ_WRITE(cpool->base.self, &cpool->pool_name, rb_str_new(TO_CHARPTR(pool_name), pool_name_len));
     rb_str_freeze(cpool->pool_name);
     return Qnil;
 }
@@ -152,7 +167,7 @@ static VALUE oci8_cpool_initialize(int argc, VALUE *argv, VALUE self)
  */
 static VALUE oci8_cpool_reinitialize(VALUE self, VALUE conn_min, VALUE conn_max, VALUE conn_incr)
 {
-    oci8_cpool_t *cpool = DATA_PTR(self);
+    oci8_cpool_t *cpool = TO_CPOOL(self);
     OraText *pool_name;
     sb4 pool_name_len;
 
@@ -180,7 +195,7 @@ static VALUE oci8_cpool_reinitialize(VALUE self, VALUE conn_min, VALUE conn_max,
  */
 static VALUE oci8_cpool_pool_name(VALUE self)
 {
-    oci8_cpool_t *cpool = DATA_PTR(self);
+    oci8_cpool_t *cpool = TO_CPOOL(self);
 
     return cpool->pool_name;
 }
@@ -193,7 +208,7 @@ void Init_oci8_connection_pool(VALUE cOCI8)
     cOCIConnectionPool = rb_define_class_under(cOCI8, "ConnectionPool", cOCIHandle);
 #endif
 
-    cOCIConnectionPool = oci8_define_class_under(cOCI8, "ConnectionPool", &oci8_cpool_vtable);
+    cOCIConnectionPool = oci8_define_class_under(cOCI8, "ConnectionPool", &oci8_cpool_data_type, oci8_cpool_alloc);
 
     rb_define_private_method(cOCIConnectionPool, "initialize", oci8_cpool_initialize, -1);
     rb_define_method(cOCIConnectionPool, "reinitialize", oci8_cpool_reinitialize, 3);

data/ext/oci8/extconf.rb

@@ -118,10 +118,12 @@ have_header("ruby/thread.h")
 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'
   have_func("rb_str_buf_cat_ascii", "ruby.h")
   have_func("rb_enc_str_buf_cat", "ruby.h")
@@ -181,6 +183,25 @@ else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
 
+print "checking for plthook... "
+STDOUT.flush
+case RUBY_PLATFORM
+when /mswin32|cygwin|mingw32|bccwin32/
+  plthook_src = "plthook_win32.c"
+when /darwin/
+  plthook_src = "plthook_osx.c"
+else
+  plthook_src = "plthook_elf.c"
+end
+if xsystem(cc_command("").gsub(CONFTEST_C, File.dirname(__FILE__) + "/" + plthook_src))
+  puts plthook_src
+  $objs << plthook_src.gsub(/\.c$/, '.o')
+  $objs << "hook_funcs.o"
+  $defs << "-DHAVE_PLTHOOK"
+else
+  puts "no"
+end
+
 $defs << "-DInit_oci8lib=Init_#{so_basename}"
 $defs << "-Doci8lib=#{so_basename}"
 $defs << "-DOCI8LIB_VERSION=\\\"#{RUBY_OCI8_VERSION}\\\""

data/ext/oci8/hook_funcs.c

@@ -0,0 +1,215 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ * hook.c
+ *
+ * Copyright (C) 2015 Kubo Takehiro <kubo@jiubao.org>
+ */
+#include "oci8.h"
+#include "plthook.h"
+#ifndef WIN32
+#include <unistd.h>
+#include <sys/socket.h>
+#endif
+
+#define DEBUG_HOOK_FUNCS 1
+
+#ifdef WIN32
+static CRITICAL_SECTION lock;
+#define LOCK(lock) EnterCriticalSection(lock)
+#define UNLOCK(lock) LeaveCriticalSection(lock)
+#else
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+#define LOCK(lock) pthread_mutex_lock(lock)
+#define UNLOCK(lock) pthread_mutex_unlock(lock)
+#define SOCKET int
+#define INVALID_SOCKET (-1)
+#endif
+
+typedef struct {
+    const char *func_name;
+    void *func_addr;
+    void *old_func_addr;
+} hook_func_entry_t;
+
+typedef struct socket_entry {
+    struct socket_entry *next;
+    struct socket_entry *prev;
+    SOCKET sock;
+} socket_entry_t;
+
+static socket_entry_t sockets_in_use = {
+    &sockets_in_use, &sockets_in_use, INVALID_SOCKET,
+};
+
+static void socket_entry_set(socket_entry_t *entry, SOCKET sock)
+{
+    LOCK(&lock);
+    entry->next = sockets_in_use.next;
+    entry->prev = &sockets_in_use;
+    sockets_in_use.next->prev = entry;
+    sockets_in_use.next = entry;
+    entry->sock = sock;
+    UNLOCK(&lock);
+}
+
+static void socket_entry_clear(socket_entry_t *entry)
+{
+    LOCK(&lock);
+    entry->next->prev = entry->prev;
+    entry->prev->next = entry->next;
+    UNLOCK(&lock);
+}
+
+static int replace_functions(const char * const *files, hook_func_entry_t *functions)
+{
+    int i;
+
+    for (i = 0; files[i] != NULL; i++) {
+        const char *file = files[i];
+        plthook_t *ph;
+        if (plthook_open(&ph, file) == 0) {
+            int j;
+            int rv = 0;
+
+            /* install hooks */
+            for (j = 0; functions[j].func_name != NULL ; j++) {
+                hook_func_entry_t *function = &functions[j];
+                rv = plthook_replace(ph, function->func_name, function->func_addr, &function->old_func_addr);
+                if (rv != 0) {
+                    while (--j >= 0) {
+                        /*restore hooked fuction address */
+                        plthook_replace(ph, functions[j].func_name, functions[j].old_func_addr, NULL);
+                    }
+                    plthook_close(ph);
+                    rb_raise(rb_eRuntimeError, "Could not replace function %s in %s", function->func_name, file);
+                }
+            }
+            plthook_close(ph);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+#ifdef WIN32
+
+static int locK_is_initialized;
+
+static int WSAAPI hook_WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+
+static const char * const tcp_func_files[] = {
+    /* full client */
+    "orantcp12.dll",
+    "orantcp11.dll",
+    "orantcp10.dll",
+    "orantcp9.dll",
+    /* instant client basic */
+    "oraociei12.dll",
+    "oraociei11.dll",
+    "oraociei10.dll",
+    /* instant client basic lite */
+    "oraociicus12.dll",
+    "oraociicus11.dll",
+    "oraociicus10.dll",
+    NULL,
+};
+
+static hook_func_entry_t tcp_functions[] = {
+    {"WSARecv", (void*)hook_WSARecv, NULL},
+    {NULL, NULL, NULL},
+};
+
+/* WSARecv() is used for TCP connections */
+static int WSAAPI hook_WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)
+{
+    socket_entry_t entry;
+    int rv;
+
+    socket_entry_set(&entry, s);
+    rv = WSARecv(s, lpBuffers, dwBufferCount, lpNumberOfBytesRecvd, lpFlags, lpOverlapped, lpCompletionRoutine);
+    socket_entry_clear(&entry);
+    return rv;
+}
+
+void oci8_install_hook_functions()
+{
+    InitializeCriticalSectionAndSpinCount(&lock, 5000);
+    locK_is_initialized = 1;
+
+    if (replace_functions(tcp_func_files, tcp_functions) != 0) {
+        rb_raise(rb_eRuntimeError, "No DLL is found to hook.");
+    }
+}
+
+static void shutdown_socket(socket_entry_t *entry)
+{
+    /* This is dangerous. But I don't know how to cancel WSARecv().
+     * This technique is usable only at the process termination.
+     * Otherwise, Oracle client library may close sockets used by
+     * others.
+     */
+    closesocket(entry->sock);
+}
+
+#else
+static ssize_t hook_read(int fd, void *buf, size_t count);
+
+#ifdef __APPLE__
+#define SO_EXT "dylib"
+#else
+#define SO_EXT "so"
+#endif
+
+static const char * const files[] = {
+    "libclntsh." SO_EXT ".12.1",
+    "libclntsh." SO_EXT ".11.1",
+    "libclntsh." SO_EXT ".10.1",
+    "libclntsh." SO_EXT ".9.0",
+    NULL,
+};
+
+static hook_func_entry_t functions[] = {
+    {"read", (void*)hook_read, NULL},
+    {NULL, NULL, NULL},
+};
+
+static ssize_t hook_read(int fd, void *buf, size_t count)
+{
+    socket_entry_t entry;
+    ssize_t rv;
+
+    socket_entry_set(&entry, fd);
+    rv = read(fd, buf, count);
+    socket_entry_clear(&entry);
+    return rv;
+}
+
+void oci8_install_hook_functions(void)
+{
+    if (replace_functions(files, functions) != 0) {
+        rb_raise(rb_eRuntimeError, "No shared library is found to hook.");
+    }
+}
+
+static void shutdown_socket(socket_entry_t *entry)
+{
+    shutdown(entry->sock, SHUT_RDWR);
+}
+#endif
+
+void oci8_shutdown_sockets(void)
+{
+    socket_entry_t *entry;
+
+#ifdef WIN32
+    if (!locK_is_initialized) {
+        return;
+    }
+#endif
+
+    LOCK(&lock);
+    for (entry = sockets_in_use.next; entry != &sockets_in_use; entry = entry->next) {
+        shutdown_socket(entry);
+    }
+    UNLOCK(&lock);
+}

data/ext/oci8/lob.c

@@ -2,7 +2,7 @@
 /*
  * lob.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
  */
 #include "oci8.h"
 
@@ -18,6 +18,8 @@ static VALUE seek_set;
 static VALUE seek_cur;
 static VALUE seek_end;
 
+#define TO_LOB(obj) ((oci8_lob_t *)oci8_check_typeddata((obj), &oci8_lob_data_type, 1))
+
 enum state {
     S_NO_OPEN_CLOSE,
     S_OPEN,
@@ -46,6 +48,148 @@ static oci8_svcctx_t *check_svcctx(oci8_lob_t *lob)
 
 static VALUE oci8_lob_write(VALUE self, VALUE data);
 
+static void oci8_lob_mark(oci8_base_t *base)
+{
+    oci8_lob_t *lob = (oci8_lob_t *)base;
+    if (lob->svcctx != NULL) {
+        rb_gc_mark(lob->svcctx->base.self);
+    }
+}
+
+static void oci8_lob_free(oci8_base_t *base)
+{
+    oci8_lob_t *lob = (oci8_lob_t *)base;
+    boolean is_temporary;
+    oci8_svcctx_t *svcctx = lob->svcctx;
+
+    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;
+        temp_lob->lob = lob->base.hp.lob;
+        svcctx->temp_lobs = temp_lob;
+        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;
+}
+
+static const oci8_handle_data_type_t oci8_lob_data_type = {
+    {
+        "OCI8::LOB",
+        {
+            NULL,
+            NULL,
+            NULL,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+    },
+    NULL,
+    sizeof(oci8_lob_t),
+};
+
+static VALUE oci8_lob_alloc(VALUE klass)
+{
+    rb_raise(rb_eNameError, "private method `new' called for %s:Class", rb_class2name(klass));
+}
+
+static const oci8_handle_data_type_t oci8_clob_data_type = {
+    {
+        "OCI8::CLOB",
+        {
+            (RUBY_DATA_FUNC)oci8_lob_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_lob_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_lob_free,
+    sizeof(oci8_lob_t),
+};
+
+static VALUE oci8_clob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_clob_data_type);
+}
+
+static const oci8_handle_data_type_t oci8_nclob_data_type = {
+    {
+        "OCI8::NCLOB",
+        {
+            (RUBY_DATA_FUNC)oci8_lob_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_lob_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_lob_free,
+    sizeof(oci8_lob_t),
+};
+
+static VALUE oci8_nclob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_nclob_data_type);
+}
+
+static const oci8_handle_data_type_t oci8_blob_data_type = {
+    {
+        "OCI8::BLOB",
+        {
+            (RUBY_DATA_FUNC)oci8_lob_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_lob_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_lob_free,
+    sizeof(oci8_lob_t),
+};
+
+static VALUE oci8_blob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_blob_data_type);
+}
+
+static const oci8_handle_data_type_t oci8_bfile_data_type = {
+    {
+        "OCI8::BFILE",
+        {
+            (RUBY_DATA_FUNC)oci8_lob_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_lob_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_lob_free,
+    sizeof(oci8_lob_t),
+};
+
+static VALUE oci8_bfile_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_bfile_data_type);
+}
+
 static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
 {
     oci8_lob_t *lob;
@@ -53,7 +197,7 @@ static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
     VALUE lob_obj;
 
     lob_obj = rb_class_new_instance(1, &svcctx->base.self, klass);
-    lob = DATA_PTR(lob_obj);
+    lob = TO_LOB(lob_obj);
     /* If 's' is a temporary lob, use OCILobLocatorAssign instead. */
     chker2(OCILobIsTemporary(oci8_envhp, oci8_errhp, s, &is_temp), &svcctx->base);
     if (is_temp)
@@ -87,7 +231,11 @@ VALUE oci8_make_bfile(oci8_svcctx_t *svcctx, OCILobLocator *s)
 
 static void oci8_assign_lob(VALUE klass, oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
 {
-    oci8_base_t *base = oci8_get_handle(lob, klass);
+    oci8_base_t *base = oci8_check_typeddata(lob, &oci8_lob_data_type, 1);
+    if (!rb_obj_is_kind_of(lob, klass)) {
+        rb_raise(rb_eTypeError, "wrong argument %s (expect %s)",
+                 rb_obj_classname(lob), rb_class2name(klass));
+    }
     chker2(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, base->hp.lob, dest), base);
 }
 
@@ -111,46 +259,6 @@ void oci8_assign_bfile(oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
     oci8_assign_lob(cOCI8BFILE, svcctx, lob, dest);
 }
 
-static void oci8_lob_mark(oci8_base_t *base)
-{
-    oci8_lob_t *lob = (oci8_lob_t *)base;
-    if (lob->svcctx != NULL) {
-        rb_gc_mark(lob->svcctx->base.self);
-    }
-}
-
-static void oci8_lob_free(oci8_base_t *base)
-{
-    oci8_lob_t *lob = (oci8_lob_t *)base;
-    boolean is_temporary;
-    oci8_svcctx_t *svcctx = lob->svcctx;
-
-    if (svcctx != NULL
-        && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
-        && is_temporary) {
-
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-        oci8_temp_lob_t *temp_lob = ALLOC(oci8_temp_lob_t);
-
-        temp_lob->next = svcctx->temp_lobs;
-        temp_lob->lob = lob->base.hp.lob;
-        svcctx->temp_lobs = temp_lob;
-        lob->base.type = 0;
-        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;
-}
-
-static oci8_base_vtable_t oci8_lob_vtable = {
-    oci8_lob_mark,
-    oci8_lob_free,
-    sizeof(oci8_lob_t),
-};
-
 static ub4 oci8_lob_get_length(oci8_lob_t *lob)
 {
     oci8_svcctx_t *svcctx = check_svcctx(lob);
@@ -197,31 +305,58 @@ static void bfile_close(oci8_lob_t *lob)
 /*
  *  Document-class: OCI8::LOB
  *
- *  This is the abstract base class of large-object data types; BFILE, BLOB, CLOB and NCLOB.
+ *  This is the abstract base class of large-object data types; {BFILE}, {BLOB}, {CLOB} and {NCLOB}.
  *
  */
 
 /*
  *  Document-class: OCI8::CLOB
  *
+ *  This class is a ruby-side class of {Oracle NCLOB datatype}[http://docs.oracle.com/database/121/SQLRF/sql_elements001.htm#sthref175].
  */
 
 /*
  *  Document-class: OCI8::NCLOB
  *
+ *  This class is a ruby-side class of {Oracle CLOB datatype}[http://docs.oracle.com/database/121/SQLRF/sql_elements001.htm#sthref172].
  */
 
 /*
  *  Document-class: OCI8::BLOB
  *
+ *  This class is a ruby-side class of {Oracle BLOB datatype}[http://docs.oracle.com/database/121/SQLRF/sql_elements001.htm#sthref168].
+ *
  */
 
 /*
  *  Document-class: OCI8::BFILE
  *
- *  @method truncate(length)
- *  @method size = length
- *  @method write(data)
+ *  This class is a ruby-side class of {Oracle BFILE datatype}[http://docs.oracle.com/database/121/SQLRF/sql_elements001.htm#sthref164].
+ *  It is a read-only {LOB}. You cannot change the contents.
+ *
+ *  You can read files on the server-side as follows:
+ *
+ *  1. Connect to the Oracle server as a user who has CREATE DIRECTORY privilege.
+ *
+ *       # create a directory object on the Oracle server.
+ *       CREATE DIRECTORY file_storage_dir AS '/opt/file_storage';
+ *       # grant a privilege to read files on file_storage_dir directory to a user.
+ *       GRANT READ ON DIRECTORY file_storage_dir TO username;
+ *
+ *  2. Create a file 'hello_world.txt' in the directory '/opt/file_storage' on the server filesystem.
+ *
+ *       echo 'Hello World!' > /opt/file_storage/hello_world.txt
+ *
+ *  3. Read the file by ruby-oci8.
+ *
+ *       require 'oci8'
+ *       # The user must have 'READ ON DIRECTORY file_storage_dir' privilege.
+ *       conn = OCI8.new('username/password')
+ *
+ *       # The second argument is usually an uppercase string unless the directory
+ *       # object is explicitly created as *double-quoted* lowercase characters.
+ *       bfile = OCI8::BFILE.new(conn, 'FILE_STORAGE_DIR', 'hello_world.txt')
+ *       bfile.read # => "Hello World!\n"
  */
 
 /*
@@ -231,15 +366,15 @@ static void bfile_close(oci8_lob_t *lob)
  */
 static VALUE oci8_lob_close(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     lob_close(lob);
-    oci8_base_free(DATA_PTR(self));
+    oci8_base_free(&lob->base);
     return self;
 }
 
 static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm, ub1 lobtype)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     VALUE svc;
     VALUE val;
     oci8_svcctx_t *svcctx;
@@ -256,8 +391,9 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
     lob->csfrm = csfrm;
     lob->lobtype = lobtype;
     lob->state = S_NO_OPEN_CLOSE;
-    oci8_link_to_parent((oci8_base_t*)lob, (oci8_base_t*)DATA_PTR(svc));
+    oci8_link_to_parent(&lob->base, &svcctx->base);
     lob->svcctx = svcctx;
+    RB_OBJ_WRITTEN(self, Qundef, svc);
     if (!NIL_P(val)) {
         OCI8StringValue(val);
         chker2(OCILobCreateTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, 0, csfrm, lobtype, TRUE, OCI_DURATION_SESSION),
@@ -346,7 +482,7 @@ static VALUE oci8_blob_initialize(int argc, VALUE *argv, VALUE self)
  */
 static VALUE oci8_lob_set_char_width(VALUE self, VALUE vsize)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     int size;
 
     size = NUM2INT(vsize); /* 1 */
@@ -364,7 +500,7 @@ static VALUE oci8_lob_set_char_width(VALUE self, VALUE vsize)
  */
 static VALUE oci8_lob_available_p(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     boolean is_initialized;
 
     chker2(OCILobLocatorIsInit(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_initialized),
@@ -381,7 +517,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(DATA_PTR(self)));
+    return UB4_TO_NUM(oci8_lob_get_length(TO_LOB(self)));
 }
 
 /*
@@ -393,7 +529,7 @@ static VALUE oci8_lob_get_size(VALUE self)
  */
 static VALUE oci8_lob_get_pos(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     return UB4_TO_NUM(lob->pos);
 }
 
@@ -404,7 +540,7 @@ static VALUE oci8_lob_get_pos(VALUE self)
  */
 static VALUE oci8_lob_eof_p(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     if (oci8_lob_get_length(lob) < lob->pos)
         return Qfalse;
     else
@@ -427,7 +563,7 @@ static VALUE oci8_lob_eof_p(VALUE self)
  */
 static VALUE oci8_lob_seek(int argc, VALUE *argv, VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     VALUE position, whence;
 
     rb_scan_args(argc, argv, "11", &position, &whence);
@@ -456,7 +592,7 @@ static VALUE oci8_lob_seek(int argc, VALUE *argv, VALUE self)
  */
 static VALUE oci8_lob_rewind(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     lob->pos = 0;
     return self;
 }
@@ -465,14 +601,14 @@ static VALUE oci8_lob_rewind(VALUE self)
  *  call-seq:
  *    truncate(length)
  *
- *  Changes the lob size to the given <i>length</i>.
- *
- *  @param [Integer] length
+ *  @param [Integer] length length in characters if +self+ is a {CLOB} or a {NCLOB}.
+ *    length in bytes if +self+ is a {BLOB} or a {BFILE}.
  *  @return [self]
+ *  @see #size=
  */
 static VALUE oci8_lob_truncate(VALUE self, VALUE len)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
 
     lob_open(lob);
@@ -482,13 +618,13 @@ static VALUE oci8_lob_truncate(VALUE self, VALUE len)
 }
 
 /*
- *  call-seq:
- *    size = length
+ * @overload size=(length)
  *
  *  Changes the lob size to the given <i>length</i>.
  *
- *  @param [Integer] length
- *  @return [Integer]
+ *  @param [Integer] length length in characters if +self+ is a {CLOB} or a {NCLOB}.
+ *    length in bytes if +self+ is a {BLOB} or a {BFILE}.
+ *  @see #truncate
  */
 static VALUE oci8_lob_set_size(VALUE self, VALUE len)
 {
@@ -497,29 +633,37 @@ static VALUE oci8_lob_set_size(VALUE self, VALUE len)
 }
 
 /*
- *  call-seq:
- *    read(length = nil)
+ * @overload read
  *
- *  Reads <i>length</i> characters for CLOB and NCLOB or <i>length</i>
- *  bytes for BLOB and BILF from the current position.
- *  If <i>length</i> is <code>nil</code>, it reads data until EOF.
+ *  
+ *
+ *  @param [Integer] length number of characters if +self+ is a {CLOB} or a {NCLOB}.
+ *    number of bytes if +self+ is a {BLOB} or a {BFILE}.
+ *  @return [String or nil] data read. <code>nil</code> means it
+ *    met EOF at beginning. It returns an empty string '' as a special exception
+ *    when <i>length</i> is <code>nil</code> and the lob is empty.
  *
- *  It returns a string or <code>nil</code>. <code>nil</code> means it
- *  met EOF at beginning. As a special exception, when <i>length</i> is
- *  <code>nil</code> and the lob length is zero, it returns an empty string ''.
+ * @overload read(length)
  *
- *  @param [Integer] length
- *  @return [String or nil]
+ *  Reads <i>length</i> characters for {CLOB} and {NCLOB} or <i>length</i>
+ *  bytes for {BLOB} and {BFILE} from the current position.
+ *  If <i>length</i> is <code>nil</code>, it reads data until EOF.
+ *
+ *  @param [Integer] length number of characters if +self+ is a {CLOB} or a {NCLOB}.
+ *    number of bytes if +self+ is a {BLOB} or a {BFILE}.
+ *  @return [String or nil] data read. <code>nil</code> means it
+ *    met EOF at beginning. It returns an empty string '' as a special exception
+ *    when <i>length</i> is <code>nil</code> and the lob is empty.
  */
 static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 length;
     ub4 nchar;
+    long nbyte;
     ub4 amt;
     sword rv;
-    char buf[8192];
     size_t buf_size_in_char;
     VALUE size;
     VALUE v = rb_ary_new();
@@ -539,9 +683,13 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
         if (nchar > length)
             nchar = length;
     }
+    nbyte = oci8_nls_ratio * (long)nchar;
     amt = nchar;
-    buf_size_in_char = sizeof(buf) / lob->char_width;
+    buf_size_in_char = nbyte / lob->char_width;
     do {
+        VALUE strbuf = rb_str_buf_new(nbyte);
+        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) {
@@ -564,8 +712,8 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
             lob->state = S_BFILE_OPEN;
         }
         /* initialize buf in zeros everytime to check a nul characters. */
-        memset(buf, 0, sizeof(buf));
-        rv = OCILobRead_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, buf, sizeof(buf), NULL, NULL, 0, lob->csfrm);
+        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);
         svcctx->suppress_free_temp_lobs = 0;
         switch (rv) {
         case OCI_SUCCESS:
@@ -594,7 +742,7 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
          * amt is increaded until a nul character to know the actually
          * read size.
          */
-        while (amt < sizeof(buf) && buf[amt] != '\0') {
+        while (amt < nbyte && buf[amt] != '\0') {
             amt++;
         }
 
@@ -604,17 +752,23 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
         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_ary_push(v, rb_str_new(buf, amt));
+        rb_str_set_len(strbuf, amt);
+        rb_ary_push(v, strbuf);
     } while (rv == OCI_NEED_DATA);
     lob->pos += nchar;
     if (nchar == length) {
         lob_close(lob);
         bfile_close(lob);
     }
-    if (RARRAY_LEN(v) == 0) {
+    switch (RARRAY_LEN(v)) {
+    case 0:
         return Qnil;
+    case 1:
+        v = RARRAY_PTR(v)[0];
+        break;
+    default:
+        v = rb_ary_join(v, Qnil);
     }
-    v = rb_ary_join(v, Qnil);
     OBJ_TAINT(v);
     if (lob->lobtype == OCI_TEMP_CLOB) {
         /* set encoding */
@@ -627,17 +781,17 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- *  call-seq:
- *    write(data)
+ * @overload write(data)
  *
- *  Writes <i>data</i>.
+ *  Writes +data+ to LOB.
  *
  *  @param [String] data
- *  @return [Integer]
+ *  @return [Integer] number of characters written if +self+ is a {CLOB} or a {NCLOB}.
+ *    number of bytes written if +self+ is a {BLOB} or a {BFILE}.
  */
 static VALUE oci8_lob_write(VALUE self, VALUE data)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 amt;
 
@@ -666,7 +820,7 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
  */
 static VALUE oci8_lob_get_sync(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     return (lob->state == S_NO_OPEN_CLOSE) ? Qtrue : Qfalse;
 }
 
@@ -676,7 +830,7 @@ static VALUE oci8_lob_get_sync(VALUE self)
  */
 static VALUE oci8_lob_set_sync(VALUE self, VALUE b)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     if (RTEST(b)) {
         lob_close(lob);
         lob->state = S_NO_OPEN_CLOSE;
@@ -693,7 +847,7 @@ static VALUE oci8_lob_set_sync(VALUE self, VALUE b)
  */
 static VALUE oci8_lob_flush(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     lob_close(lob);
     return self;
 }
@@ -701,12 +855,12 @@ static VALUE oci8_lob_flush(VALUE self)
 /*
  *  Returns the chunk size of a LOB.
  *
- *  @see http://docs.oracle.com/cd/E16338_01/appdev.112/e10646/oci17msc002.htm#i493090
+ *  @see http://docs.oracle.com/database/121/ARPLS/d_lob.htm#ARPLS66706 DBMS_LOB.GETCHUNKSIZE
  *  @return [Integer]
  */
 static VALUE oci8_lob_get_chunk_size(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 len;
 
@@ -717,7 +871,7 @@ static VALUE oci8_lob_get_chunk_size(VALUE self)
 
 static VALUE oci8_lob_clone(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_lob_t *newlob;
     VALUE newobj = lob->svcctx ? lob->svcctx->base.self : Qnil;
     boolean is_temporary;
@@ -749,7 +903,7 @@ static void oci8_bfile_get_name(VALUE self, VALUE *dir_alias_p, VALUE *filename_
             need_get = 1;
     }
     if (need_get) {
-        oci8_lob_t *lob = DATA_PTR(self);
+        oci8_lob_t *lob = TO_LOB(self);
         char d_buf[31];
         ub2 d_length = sizeof(d_buf);
         char f_buf[256];
@@ -774,7 +928,7 @@ static void oci8_bfile_get_name(VALUE self, VALUE *dir_alias_p, VALUE *filename_
 
 static void oci8_bfile_set_name(VALUE self, VALUE dir_alias, VALUE filename)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
 
     bfile_close(lob);
     if (RSTRING_LEN(dir_alias) > UB2MAXVAL) {
@@ -790,21 +944,20 @@ static void oci8_bfile_set_name(VALUE self, VALUE dir_alias, VALUE filename)
 }
 
 /*
- *  call-seq:
- *    initialize(conn, dir_alias = nil, filename = nil)
+ * @overload initialize(conn, directory = nil, filename = nil)
  *
  *  Creates a BFILE object.
- *  This is correspond to {http://docs.oracle.com/cd/E11882_01/server.112/e17118/functions019.htm#sthref953 BFILENAME}.
+ *  This is correspond to {BFILENAME}[https://docs.oracle.com/database/121/SQLRF/functions020.htm].
  *
  *  @param [OCI8] conn
- *  @param [String] dir_alias  a directory object created by
- *    {http://docs.oracle.com/cd/E11882_01/server.112/e17118/statements_5007.htm "CREATE DIRECTORY"}.
+ *  @param [String] directory  a directory object created by
+ *    {"CREATE DIRECTORY"}[http://docs.oracle.com/database/121/SQLRF/statements_5008.htm].
  *  @param [String] filename
  *  @return [OCI8::BFILE]
  */
 static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     VALUE svc;
     VALUE dir_alias;
     VALUE filename;
@@ -828,12 +981,14 @@ static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
         OCI8SafeStringValue(filename);
         oci8_bfile_set_name(self, dir_alias, filename);
     }
-    oci8_link_to_parent((oci8_base_t*)lob, (oci8_base_t*)DATA_PTR(svc));
+    oci8_link_to_parent(&lob->base, &svcctx->base);
     lob->svcctx = svcctx;
     return Qnil;
 }
 
 /*
+ * @overload dir_alias
+ *
  *  Returns the directory object name.
  *
  *  @return [String]
@@ -847,6 +1002,8 @@ static VALUE oci8_bfile_get_dir_alias(VALUE self)
 }
 
 /*
+ * @overload filename
+ *
  *  Returns the file name.
  *
  *  @return [String]
@@ -860,12 +1017,11 @@ static VALUE oci8_bfile_get_filename(VALUE self)
 }
 
 /*
- *  call-seq:
- *    dir_alias = name
+ * @overload dir_alias=(dir_alias)
  *
  *  Changes the directory object name.
  *
- *  @param [String] name
+ *  @param [String] dir_alias
  */
 static VALUE oci8_bfile_set_dir_alias(VALUE self, VALUE dir_alias)
 {
@@ -879,12 +1035,11 @@ static VALUE oci8_bfile_set_dir_alias(VALUE self, VALUE dir_alias)
 }
 
 /*
- *  call-seq:
- *    filename = name
+ * @overload filename=(filename)
  *
  *  Changes the file name.
  *
- *  @param [String] name
+ *  @param [String] filename
  */
 static VALUE oci8_bfile_set_filename(VALUE self, VALUE filename)
 {
@@ -898,13 +1053,13 @@ static VALUE oci8_bfile_set_filename(VALUE self, VALUE filename)
 }
 
 /*
- *  Returns <code>true</code> when the BFILE exists on the server's operating system.
+ * @overload exists?
  *
- *  @return [true or false]
+ *  Returns <code>true</code> when the BFILE exists on the server's operating system.
  */
 static VALUE oci8_bfile_exists_p(VALUE self)
 {
-    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
     boolean flag;
 
@@ -914,38 +1069,10 @@ static VALUE oci8_bfile_exists_p(VALUE self)
 }
 
 /*
- *  Document-method: OCI8::BFILE#truncate
- *
- *  call-seq:
- *    truncate(length)
- *
- *  Raises <code>RuntimeError</code>.
- *
- *  @raise [RuntimeError] cannot modify a read-only BFILE object
- */
-
-/*
- *  Document-method: OCI8::BFILE#size=
- *
- *  call-seq:
- *    size = length
- *
- *  Raises <code>RuntimeError</code>.
- *
- *  @raise [RuntimeError] cannot modify a read-only BFILE object
- */
-
-/*
- *  Document-method: OCI8::BFILE#write
- *
- *  call-seq:
- *    write(data)
- *
- *  Raises <code>RuntimeError</code>.
+ *  Raises <code>RuntimeError</code> always.
  *
  *  @raise [RuntimeError] cannot modify a read-only BFILE object
  */
-
 static VALUE oci8_bfile_error(VALUE self, VALUE dummy)
 {
     rb_raise(rb_eRuntimeError, "cannot modify a read-only BFILE object");
@@ -956,9 +1083,9 @@ static VALUE oci8_bfile_error(VALUE self, VALUE dummy)
  */
 
 typedef struct {
-    oci8_bind_vtable_t bind;
+    oci8_bind_data_type_t bind;
     VALUE *klass;
-} oci8_bind_lob_vtable_t;
+} oci8_bind_lob_data_type_t;
 
 static VALUE bind_lob_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
@@ -969,13 +1096,11 @@ static VALUE bind_lob_get(oci8_bind_t *obind, void *data, void *null_struct)
 static void bind_lob_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     oci8_hp_obj_t *oho = (oci8_hp_obj_t *)data;
-    const oci8_bind_lob_vtable_t *vptr = (const oci8_bind_lob_vtable_t *)obind->base.vptr;
-    oci8_base_t *h;
-    if (!rb_obj_is_kind_of(val, *vptr->klass))
-        rb_raise(rb_eArgError, "Invalid argument: %s (expect %s)", rb_class2name(CLASS_OF(val)), rb_class2name(*vptr->klass));
-    h = DATA_PTR(val);
+    const oci8_handle_data_type_t *bind_data_type = obind->base.data_type;
+    const oci8_handle_data_type_t *lob_data_type = bind_data_type->rb_data_type.data;
+    oci8_base_t *h = oci8_check_typeddata(val, lob_data_type, 1);
     oho->hp = h->hp.ptr;
-    oho->obj = val;
+    RB_OBJ_WRITE(obind->base.self, &oho->obj, val);
 }
 
 static void bind_lob_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
@@ -986,13 +1111,14 @@ static void bind_lob_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length
 
 static void bind_lob_init_elem(oci8_bind_t *obind, VALUE svc)
 {
-    const oci8_bind_lob_vtable_t *vptr = (const oci8_bind_lob_vtable_t *)obind->base.vptr;
+    const oci8_bind_lob_data_type_t *data_type = (const oci8_bind_lob_data_type_t *)obind->base.data_type;
     oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
     oci8_base_t *h;
     ub4 idx = 0;
 
     do {
-        oho[idx].obj = rb_class_new_instance(1, &svc, *vptr->klass);
+        oho[idx].obj = rb_class_new_instance(1, &svc, *data_type->klass);
+        RB_OBJ_WRITTEN(obind->base.self, Qundef, oho[idx].obj);
         h = DATA_PTR(oho[idx].obj);
         oho[idx].hp = h->hp.ptr;
     } while (++idx < obind->maxar_sz);
@@ -1006,10 +1132,21 @@ static void bind_lob_post_bind_hook_for_nclob(oci8_bind_t *obind)
            &obind->base);
 }
 
-static const oci8_bind_lob_vtable_t bind_clob_vtable = {
+static const oci8_bind_lob_data_type_t bind_clob_data_type = {
     {
         {
-            oci8_bind_hp_obj_mark,
+            {
+                "OCI8::BindType::CLOB",
+                {
+                    (RUBY_DATA_FUNC)oci8_bind_hp_obj_mark,
+                    oci8_handle_cleanup,
+                    oci8_handle_size,
+                },
+                &oci8_bind_data_type.rb_data_type, (void*)&oci8_clob_data_type,
+#ifdef RUBY_TYPED_WB_PROTECTED
+                RUBY_TYPED_WB_PROTECTED,
+#endif
+            },
             oci8_bind_free,
             sizeof(oci8_bind_t)
         },
@@ -1023,10 +1160,26 @@ static const oci8_bind_lob_vtable_t bind_clob_vtable = {
     &cOCI8CLOB
 };
 
-static const oci8_bind_lob_vtable_t bind_nclob_vtable = {
+static VALUE bind_clob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_clob_data_type.bind.base);
+}
+
+static const oci8_bind_lob_data_type_t bind_nclob_data_type = {
     {
         {
-            oci8_bind_hp_obj_mark,
+            {
+                "OCI8::BindType::NCLOB",
+                {
+                    (RUBY_DATA_FUNC)oci8_bind_hp_obj_mark,
+                    oci8_handle_cleanup,
+                    oci8_handle_size,
+                },
+                &oci8_bind_data_type.rb_data_type, (void*)&oci8_nclob_data_type,
+#ifdef RUBY_TYPED_WB_PROTECTED
+                RUBY_TYPED_WB_PROTECTED,
+#endif
+            },
             oci8_bind_free,
             sizeof(oci8_bind_t)
         },
@@ -1041,10 +1194,26 @@ static const oci8_bind_lob_vtable_t bind_nclob_vtable = {
     &cOCI8NCLOB
 };
 
-static const oci8_bind_lob_vtable_t bind_blob_vtable = {
+static VALUE bind_nclob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_nclob_data_type.bind.base);
+}
+
+static const oci8_bind_lob_data_type_t bind_blob_data_type = {
     {
         {
-            oci8_bind_hp_obj_mark,
+            {
+                "OCI8::BindType::BLOB",
+                {
+                    (RUBY_DATA_FUNC)oci8_bind_hp_obj_mark,
+                    oci8_handle_cleanup,
+                    oci8_handle_size,
+                },
+                &oci8_bind_data_type.rb_data_type, (void*)&oci8_blob_data_type,
+#ifdef RUBY_TYPED_WB_PROTECTED
+                RUBY_TYPED_WB_PROTECTED,
+#endif
+            },
             oci8_bind_free,
             sizeof(oci8_bind_t)
         },
@@ -1058,10 +1227,26 @@ static const oci8_bind_lob_vtable_t bind_blob_vtable = {
     &cOCI8BLOB
 };
 
-static const oci8_bind_lob_vtable_t bind_bfile_vtable = {
+static VALUE bind_blob_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_blob_data_type.bind.base);
+}
+
+static const oci8_bind_lob_data_type_t bind_bfile_data_type = {
     {
         {
-            oci8_bind_hp_obj_mark,
+            {
+                "OCI8::BindType::BFILE",
+                {
+                    (RUBY_DATA_FUNC)oci8_bind_hp_obj_mark,
+                    oci8_handle_cleanup,
+                    oci8_handle_size,
+                },
+                &oci8_bind_data_type.rb_data_type, (void*)&oci8_bfile_data_type,
+#ifdef RUBY_TYPED_WB_PROTECTED
+                RUBY_TYPED_WB_PROTECTED,
+#endif
+            },
             oci8_bind_free,
             sizeof(oci8_bind_t)
         },
@@ -1075,6 +1260,11 @@ static const oci8_bind_lob_vtable_t bind_bfile_vtable = {
     &cOCI8BFILE
 };
 
+static VALUE bind_bfile_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_bfile_data_type.bind.base);
+}
+
 void Init_oci8_lob(VALUE cOCI8)
 {
     id_plus = rb_intern("+");
@@ -1085,16 +1275,21 @@ void Init_oci8_lob(VALUE cOCI8)
     seek_end = rb_eval_string("::IO::SEEK_END");
 
 #if 0
+    /* for yard */
     cOCIHandle = rb_define_class("OCIHandle", rb_cObject);
     cOCI8 = rb_define_class("OCI8", cOCIHandle);
     cOCI8LOB = rb_define_class_under(cOCI8, "LOB", cOCIHandle);
-#endif
-
-    cOCI8LOB = oci8_define_class_under(cOCI8, "LOB", &oci8_lob_vtable);
     cOCI8CLOB = rb_define_class_under(cOCI8, "CLOB", cOCI8LOB);
     cOCI8NCLOB = rb_define_class_under(cOCI8, "NCLOB", cOCI8LOB);
     cOCI8BLOB = rb_define_class_under(cOCI8, "BLOB", cOCI8LOB);
     cOCI8BFILE = rb_define_class_under(cOCI8, "BFILE", cOCI8LOB);
+#endif
+
+    cOCI8LOB = oci8_define_class_under(cOCI8, "LOB", &oci8_lob_data_type, oci8_lob_alloc);
+    cOCI8CLOB = oci8_define_class_under(cOCI8, "CLOB", &oci8_clob_data_type, oci8_clob_alloc);
+    cOCI8NCLOB = oci8_define_class_under(cOCI8, "NCLOB", &oci8_nclob_data_type, oci8_nclob_alloc);
+    cOCI8BLOB = oci8_define_class_under(cOCI8, "BLOB", &oci8_blob_data_type, oci8_blob_alloc);
+    cOCI8BFILE = oci8_define_class_under(cOCI8, "BFILE", &oci8_bfile_data_type, oci8_bfile_alloc);
 
     rb_define_method(cOCI8CLOB, "initialize", oci8_clob_initialize, -1);
     rb_define_method(cOCI8NCLOB, "initialize", oci8_nclob_initialize, -1);
@@ -1127,8 +1322,8 @@ void Init_oci8_lob(VALUE cOCI8)
     rb_define_method(cOCI8BFILE, "size=", oci8_bfile_error, 1);
     rb_define_method(cOCI8BFILE, "write", oci8_bfile_error, 1);
 
-    oci8_define_bind_class("CLOB", &bind_clob_vtable.bind);
-    oci8_define_bind_class("NCLOB", &bind_nclob_vtable.bind);
-    oci8_define_bind_class("BLOB", &bind_blob_vtable.bind);
-    oci8_define_bind_class("BFILE", &bind_bfile_vtable.bind);
+    oci8_define_bind_class("CLOB", &bind_clob_data_type.bind, bind_clob_alloc);
+    oci8_define_bind_class("NCLOB", &bind_nclob_data_type.bind, bind_nclob_alloc);
+    oci8_define_bind_class("BLOB", &bind_blob_data_type.bind, bind_blob_alloc);
+    oci8_define_bind_class("BFILE", &bind_bfile_data_type.bind, bind_bfile_alloc);
 }