embulk-output-oracle 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f9b6c624d5915f9d678ef5c41114f9357fb4775
-  data.tar.gz: efd8caf50fdec1903b18bd25f8b688bdad7b464d
+  metadata.gz: 1074dcbca44c9b5e6cc3d80da2eea5b40538bb28
+  data.tar.gz: e560931b3c0dcb3851b4b330d06ed0a01103b34a
 SHA512:
-  metadata.gz: 017964eef4b7809462040ce187e11faaf067fdb0a3e21e26f8c365e13f3a47723ec545f60b4893048727c482d7855c6ee20dabf2abb320127e020ccd38355970
-  data.tar.gz: c3875ea7746f2f5fc4368dabf98e72bc239b8333b8b0caafbf770f512170ebd88daa9e267c60b96b97b89c1bead2f7983eff7121f48743ba9a5abd828fcae77d
+  metadata.gz: 919fc3fc46e0ded5c4e0983459659bde509898506f546932b4b5029fe45ef617279ed0895b24e7352936574090f2097ba1cc2d9dc2dbc4a05d6a98a58b1d65a4
+  data.tar.gz: 1ab155c13bf488e439f3951b31d257f75ee226d1f4b1352212147107d835cf270a8f2859fd8cd09269f88e16798929898d26a4a0af1eb5a87df3191a9a45a31f

data/README.md

@@ -63,6 +63,9 @@ It requires Oracle JDBC driver too, but the version 12 driver doesn't work (the
 "oci" means direct path insert using OCI(Oracle Call Interface). It is fastest.
 It requires both Oracle JDBC driver and Oracle Instant Client (version 12.1.0.2.0).
 You must set the library loading path to the OCI library.
+And it uses an optional native library (embulk-output-oracle-oci) written in cpp to improve performance furthermore.
+Not only the source codes of the library, but also the built libraries for Windows(x64) and Linux(x64) have bean committed.
+
 
 ### Supported types
 
@@ -123,6 +126,46 @@ out:
 $ ./gradlew gem
 ```
 
+#### Build environment for native library
+
+For Windows (x64)
+
+(1) Install Microsoft Visual Studio (only 2010 is tested).
+
+(2) Install Oracle Instant Client SDK 11.1.0.6.0 for Microsoft Windows (x64).
+
+(3) Set environment variables.
+
+* OCI\_SDK_PATH ("sdk" directory of Oracle Instant Client)
+
+(4) Open src/main/cpp/win/embulk-output-oracle-oci.sln by Visual Studio and build.
+
+For Windows command line, the following are needed in addition to (1) - (4).
+
+(5) Set environment variables.
+
+* MSVC_PATH (ex. C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC)
+* MSSDK_PATH (ex. C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A)
+
+(6) Execute src/main/cpp/win/build.bat .
+
+
+For Linux (x64) (only Ubuntu Server 14.04 is tested)
+
+(1) Install gcc and g++ .
+
+(2) Install Oracle Instant Client Basic and SDK 11.1.0.6.0 for Linux (x64).
+
+(3) Create symbolic links of OCI libraries.
+
+    ln -s libocci.so.11.1 libocci.so
+    ln -s libclntsh.so.11.1 libclntsh.so
+
+(4) Set environment variables.
+
+* OCI_PATH (the directory of Oracle Instant Client Basic and the parent of the "sdk" directory)
+
+(5) Execute src/main/cpp/linux/build.sh .
 
 ***
 <img src="https://www.yourkit.com/images/yklogo.png" alt="YourKit"/> is used to improve performance of embulk-output-oracle.

data/build.gradle

@@ -1,7 +1,7 @@
-[compileTestJava]*.options*.encoding = 'UTF-8'
-
 dependencies {
     compile project(':embulk-output-jdbc')
+
     testCompile 'org.embulk:embulk-standards:0.8.8'
     testCompile files('../embulk-output-jdbc/build/classes/test/')
+    testCompile files('driver/ojdbc7.jar')
 }

data/src/main/cpp/common/embulk-output-oracle-oci.cpp

@@ -0,0 +1,27 @@
+#include <occi.h>
+
+
+extern "C" 
+#ifdef WIN32
+    __declspec(dllexport) 
+#endif 
+sword embulk_output_oracle_OCIDirPathColArrayEntriesSet(
+        OCIDirPathColArray *dpca,
+        OCIError *errhp,
+        ub2 columnCount,
+        ub4 rowCount,
+        ub1* data,
+        ub2* sizes)
+{
+    for (ub4 row = 0; row < rowCount; row++) {
+        for (ub2 column = 0; column < columnCount; column++) {
+            ub2 size = *sizes++;
+            sword result = OCIDirPathColArrayEntrySet(dpca, errhp, row, column, data, size, OCI_DIRPATH_COL_COMPLETE);
+            if (result != OCI_SUCCESS) {
+                return result;
+            }
+            data += size;
+        }
+    }
+    return OCI_SUCCESS;
+}

data/src/main/cpp/linux/build.sh

@@ -0,0 +1,15 @@
+# gcc, g++ and Oracle Instant Client Basic and SDK are requred.
+#
+# ln libocci.so.x.x libocci.so
+# ln libclntsh.so.x.x libclntsh.so
+#
+
+if [ "$OCI_PATH" = "" ]
+then
+    echo "You should set the environment variable 'OCI_PATH'."
+    exit 1
+fi
+
+mkdir -p ../../../../lib/embulk/native/x86_64-linux
+
+gcc -fPIC -I. -I"$OCI_PATH/sdk/include" -I../../../main/cpp/common -L"$OCI_PATH" -shared ../../../main/cpp/common/embulk-output-oracle-oci.cpp -locci -lclntsh -lstdc++ -o ../../../../lib/embulk/native/x86_64-linux/libembulk-output-oracle-oci.so

data/src/main/cpp/windows/build.bat

@@ -0,0 +1,26 @@
+@ECHO OFF
+
+REM  Visual Studio and Oracle Instant Client SDK are requred.
+REM  You should set the environment variable 'PATH' to CL.exe(x86_amd64) of Visual Studio.
+
+IF "%OCI_SDK_PATH%" == "" (
+    ECHO "You should set the environment variable 'OCI_SDK_PATH'."
+    EXIT /B 1
+)
+
+IF "%MSVC_PATH%" == "" (
+    ECHO "You should set the environment variable 'MSVC_PATH'."
+    ECHO "For example : SET MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
+    EXIT /B 1
+)
+
+IF "%MSSDK_PATH%" == "" (
+    ECHO "You should set the environment variable 'MSSDK_PATH'."
+    ECHO "For example : SET MSSDK_PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A"
+    EXIT /B 1
+)
+
+
+MKDIR ..\..\..\..\lib\embulk\native\x86_64-windows
+
+CL /I"%MSSDK_PATH%\Include" /I"%MSVC_PATH%\include" /I"%OCI_SDK_PATH%\include" /Zi /nologo /W3 /WX- /O2 /Oi /GL /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "EMBULKOUTPUTORACLE_EXPORTS" /D "_WINDLL" /D "_UNICODE" /D "UNICODE" /Gm- /EHsc /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:queue ..\common\embulk-output-oracle-oci.cpp dllmain.cpp /link /LIBPATH:"%MSVC_PATH%\lib\amd64" /LIBPATH:"%MSSDK_PATH%\Lib\x64" /LIBPATH:"%OCI_SDK_PATH%\lib\msvc" /INCREMENTAL:NO /NOLOGO /LIBPATH:"%OCI_SDK_PATH%\lib\msvc" /OUT:"..\..\..\..\lib\embulk\native\x86_64-windows\embulk-output-oracle-oci.dll" /DLL "oci.lib" "kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X64 /ERRORREPORT:QUEUE

data/src/main/cpp/windows/dllmain.cpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <SDKDDKVer.h>
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+                       DWORD  ul_reason_for_call,
+                       LPVOID lpReserved
+					 )
+{
+	switch (ul_reason_for_call)
+	{
+	case DLL_PROCESS_ATTACH:
+	case DLL_THREAD_ATTACH:
+	case DLL_THREAD_DETACH:
+	case DLL_PROCESS_DETACH:
+		break;
+	}
+	return TRUE;
+}
+

data/src/main/cpp/windows/embulk-output-oracle-oci.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "embulk-output-oracle-oci", "embulk-output-oracle-oci.vcxproj", "{2284D821-588E-419F-8790-F5BCC12F93BD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2284D821-588E-419F-8790-F5BCC12F93BD}.Debug|x64.ActiveCfg = Debug|x64
+		{2284D821-588E-419F-8790-F5BCC12F93BD}.Debug|x64.Build.0 = Debug|x64
+		{2284D821-588E-419F-8790-F5BCC12F93BD}.Release|x64.ActiveCfg = Release|x64
+		{2284D821-588E-419F-8790-F5BCC12F93BD}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/src/main/cpp/windows/embulk-output-oracle-oci.vcxproj

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2284D821-588E-419F-8790-F5BCC12F93BD}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>embulkoutputoracle</RootNamespace>
+    <ProjectName>embulk-output-oracle-oci</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;EMBULKOUTPUTORACLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OCI_SDK_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(OCI_SDK_PATH)\lib\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OutputFile>..\..\..\..\lib\$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;EMBULKOUTPUTORACLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OCI_SDK_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(OCI_SDK_PATH)\lib\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oci.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\..\..\lib\embulk\native\x86_64-windows\$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EMBULKOUTPUTORACLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OCI_SDK_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>..\..\..\..\lib\$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EMBULKOUTPUTORACLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OCI_SDK_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(OCI_SDK_PATH)\lib\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oci.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\..\..\lib\embulk\native\x86_64-windows\$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\embulk-output-oracle-oci.cpp" />
+    <ClCompile Include="dllmain.cpp">
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

data/src/main/java/org/embulk/output/oracle/DirectBatchInsert.java

@@ -21,16 +21,12 @@ import org.embulk.output.oracle.oci.OCIManager;
 import org.embulk.output.oracle.oci.OCIWrapper;
 import org.embulk.output.oracle.oci.RowBuffer;
 import org.embulk.output.oracle.oci.TableDefinition;
-import org.embulk.spi.Exec;
 import org.embulk.spi.time.Timestamp;
-import org.slf4j.Logger;
 
 public class DirectBatchInsert implements BatchInsert
 {
     private static OCIManager ociManager = new OCIManager();
 
-    private final Logger logger = Exec.getLogger(DirectBatchInsert.class);
-
     private List<String> ociKey;
     private final String database;
     private final String user;
@@ -40,9 +36,6 @@ public class DirectBatchInsert implements BatchInsert
     private final OracleCharset nationalCharset;
     private final int batchSize;
     private RowBuffer buffer;
-    private long totalRows;
-    private int rowSize;
-    private int batchWeight;
     private boolean closed;
 
     private DateFormat[] formats;
@@ -148,31 +141,23 @@ public class DirectBatchInsert implements BatchInsert
 
         }
 
-        rowSize = 0;
-        for (ColumnDefinition column : columns) {
-            rowSize += column.getDataSize();
-        }
-
         TableDefinition tableDefinition = new TableDefinition(schema, loadTable, columns);
         ociKey = Arrays.asList(database, user, loadTable);
-        ociManager.open(ociKey, database, user, password, tableDefinition);
+        OCIWrapper oci = ociManager.open(ociKey, database, user, password, tableDefinition, batchSize);
 
-        buffer = new RowBuffer(tableDefinition, Math.max(batchSize / rowSize, 8));
+        buffer = new RowBuffer(oci, tableDefinition);
     }
 
     @Override
     public int getBatchWeight()
     {
-        return batchWeight;
+        // Automatically flushed in RowBuffer
+        return 0;
     }
 
     @Override
     public void add() throws IOException, SQLException
     {
-        batchWeight += rowSize;
-        if (buffer.isFull()) {
-            flush();
-        }
     }
 
     @Override
@@ -187,26 +172,7 @@ public class DirectBatchInsert implements BatchInsert
     @Override
     public void flush() throws IOException, SQLException
     {
-        if (buffer.getRowCount() > 0) {
-            try {
-                logger.info(String.format("Loading %,d rows", buffer.getRowCount()));
-
-                long startTime = System.currentTimeMillis();
-
-                OCIWrapper oci = ociManager.get(ociKey);
-                synchronized (oci) {
-                    oci.loadBuffer(buffer);
-                }
-
-                totalRows += buffer.getRowCount();
-                double seconds = (System.currentTimeMillis() - startTime) / 1000.0;
-                logger.info(String.format("> %.2f seconds (loaded %,d rows in total)", seconds, totalRows));
-
-            } finally {
-                buffer.clear();
-                batchWeight = 0;
-            }
-        }
+        buffer.flush();
     }
 
     @Override