embulk-output-oracle 0.2.4 → 0.3.0

data/src/main/java/org/embulk/output/oracle/oci/RowBuffer.java

@@ -1,99 +1,99 @@
-package org.embulk.output.oracle.oci;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-
-public class RowBuffer
-{
-    private final TableDefinition table;
-    private final int rowCount;
-    private final byte[] buffer;
-    private int currentRow = 0;
-    private int currentColumn = 0;
-    private int currentPosition = 0;
-    private final Charset charset;
-
-
-    public RowBuffer(TableDefinition table, int rowCount, Charset charset)
-    {
-        this.table = table;
-        this.rowCount = rowCount;
-        this.charset = charset;
-
-        int rowSize = 0;
-        for (ColumnDefinition column : table.columns) {
-            rowSize += column.columnSize;
-        }
-
-        buffer = new byte[rowSize * rowCount];
-    }
-
-    public void addValue(int value)
-    {
-        if (isFull()) {
-            throw new IllegalStateException();
-        }
-
-        buffer[currentPosition] = (byte)value;
-        buffer[currentPosition + 1] = (byte)(value >> 8);
-        buffer[currentPosition + 2] = (byte)(value >> 16);
-        buffer[currentPosition + 3] = (byte)(value >> 24);
-
-        next();
-    }
-
-    public void addValue(String value)
-    {
-        if (isFull()) {
-            throw new IllegalStateException();
-        }
-
-        ByteBuffer bytes = charset.encode(value);
-        int length = bytes.remaining();
-        // TODO:warning or error if truncated
-        bytes.get(buffer, currentPosition, length);
-        if (length < table.columns[currentColumn].columnSize) {
-            buffer[currentPosition + length] = 0;
-        }
-
-        next();
-    }
-
-    private void next()
-    {
-        currentPosition += table.columns[currentColumn].columnSize;
-        currentColumn++;
-        if (currentColumn == table.columns.length) {
-            currentColumn = 0;
-            currentRow++;
-        }
-    }
-
-    public byte[] getBuffer()
-    {
-        return buffer;
-    }
-
-    public int getCurrentColumn()
-    {
-        return currentColumn;
-    }
-
-    public int getRowCount()
-    {
-        return currentRow;
-    }
-
-    public boolean isFull()
-    {
-        return currentRow >= rowCount;
-    }
-
-    public void clear()
-    {
-        currentPosition = 0;
-        currentRow = 0;
-        currentColumn = 0;
-    }
-
-}
+package org.embulk.output.oracle.oci;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
+public class RowBuffer
+{
+    private final TableDefinition table;
+    private final int rowCount;
+    private final byte[] buffer;
+    private int currentRow = 0;
+    private int currentColumn = 0;
+    private int currentPosition = 0;
+    private final Charset charset;
+
+
+    public RowBuffer(TableDefinition table, int rowCount, Charset charset)
+    {
+        this.table = table;
+        this.rowCount = rowCount;
+        this.charset = charset;
+
+        int rowSize = 0;
+        for (ColumnDefinition column : table.columns) {
+            rowSize += column.columnSize;
+        }
+
+        buffer = new byte[rowSize * rowCount];
+    }
+
+    public void addValue(int value)
+    {
+        if (isFull()) {
+            throw new IllegalStateException();
+        }
+
+        buffer[currentPosition] = (byte)value;
+        buffer[currentPosition + 1] = (byte)(value >> 8);
+        buffer[currentPosition + 2] = (byte)(value >> 16);
+        buffer[currentPosition + 3] = (byte)(value >> 24);
+
+        next();
+    }
+
+    public void addValue(String value)
+    {
+        if (isFull()) {
+            throw new IllegalStateException();
+        }
+
+        ByteBuffer bytes = charset.encode(value);
+        int length = bytes.remaining();
+        // TODO:warning or error if truncated
+        bytes.get(buffer, currentPosition, length);
+        if (length < table.columns[currentColumn].columnSize) {
+            buffer[currentPosition + length] = 0;
+        }
+
+        next();
+    }
+
+    private void next()
+    {
+        currentPosition += table.columns[currentColumn].columnSize;
+        currentColumn++;
+        if (currentColumn == table.columns.length) {
+            currentColumn = 0;
+            currentRow++;
+        }
+    }
+
+    public byte[] getBuffer()
+    {
+        return buffer;
+    }
+
+    public int getCurrentColumn()
+    {
+        return currentColumn;
+    }
+
+    public int getRowCount()
+    {
+        return currentRow;
+    }
+
+    public boolean isFull()
+    {
+        return currentRow >= rowCount;
+    }
+
+    public void clear()
+    {
+        currentPosition = 0;
+        currentRow = 0;
+        currentColumn = 0;
+    }
+
+}

data/src/main/java/org/embulk/output/oracle/oci/TableDefinition.java

@@ -1,24 +1,24 @@
-package org.embulk.output.oracle.oci;
-
-import java.util.List;
-
-public class TableDefinition
-{
-
-    public final String tableName;
-    public final short charsetId;
-    public final ColumnDefinition[] columns;
-
-
-    public TableDefinition(String tableName, short charsetId, ColumnDefinition... columns)
-    {
-        this.tableName = tableName;
-        this.charsetId = charsetId;
-        this.columns = columns;
-    }
-
-    public TableDefinition(String tableName, short charsetId, List<ColumnDefinition> columns)
-    {
-        this(tableName, charsetId, columns.toArray(new ColumnDefinition[columns.size()]));
-    }
-}
+package org.embulk.output.oracle.oci;
+
+import java.util.List;
+
+public class TableDefinition
+{
+
+    public final String tableName;
+    public final short charsetId;
+    public final ColumnDefinition[] columns;
+
+
+    public TableDefinition(String tableName, short charsetId, ColumnDefinition... columns)
+    {
+        this.tableName = tableName;
+        this.charsetId = charsetId;
+        this.columns = columns;
+    }
+
+    public TableDefinition(String tableName, short charsetId, List<ColumnDefinition> columns)
+    {
+        this(tableName, charsetId, columns.toArray(new ColumnDefinition[columns.size()]));
+    }
+}

data/src/test/cpp/common/embulk-output-oracle-test.cpp

@@ -1,69 +1,69 @@
-#include <stdio.h>
-#include <string.h>
-#include <dir-path-load.h>
-
-
-static int test(EMBULK_OUTPUT_ORACLE_OCI_CONTEXT *context, const char *db, const char *user, const char *pass, const char *csvFileName)
-{
-	if (embulk_output_oracle_prepareDirPathCtx(context, db, user, pass)) {
-		return OCI_ERROR;
-	}
-
-	EMBULK_OUTPUT_ORACLE_OCI_COL_DEF colDefs[] = {
-		{"ID", SQLT_INT, 4},
-		//{"ID", SQLT_CHR, 8},
-		{"NUM", SQLT_INT, 4},
-		//{"NUM", SQLT_CHR, 12},
-		{"VALUE1", SQLT_CHR, 60},
-		{"VALUE2", SQLT_CHR, 60},
-		{"VALUE3", SQLT_CHR, 60},
-		{"VALUE4", SQLT_CHR, 60},
-		{"VALUE5", SQLT_CHR, 60},
-		{"VALUE6", SQLT_CHR, 60},
-		{"VALUE7", SQLT_CHR, 60},
-		{"VALUE8", SQLT_CHR, 60},
-		{"VALUE9", SQLT_CHR, 60},
-		{"VALUE10", SQLT_CHR, 60},
-		{NULL, 0, 0}
-	};
-	if (embulk_output_oracle_prepareDirPathStream(context, "EXAMPLE", 832, colDefs)) {
-		return OCI_ERROR;
-	}
-
-	if (embulk_output_oracle_loadCSV(context, colDefs, csvFileName)) {
-		return OCI_ERROR;
-	}
-
-	if (embulk_output_oracle_commitDirPath(context)) {
-		return OCI_ERROR;
-	}
-
-	return OCI_SUCCESS;
-}
-
-
-int main(int argc, char* argv[])
-{
-	sword major_version;
-    sword minor_version; 
-    sword update_num;
-    sword patch_num;
-    sword port_update_num;
-	OCIClientVersion(&major_version, &minor_version, &update_num, &patch_num, &port_update_num);
-	printf("OCI client version = %d.%d.%d.%d.%d\r\n", major_version, minor_version, update_num, patch_num, port_update_num);
-
-	if (argc < 5) {
-		printf("embulk-output-oracle-test <db> <user> <password> <csv file name>\r\n");
-		return OCI_ERROR;
-	}
-
-	EMBULK_OUTPUT_ORACLE_OCI_CONTEXT context;
-	memset(&context, 0, sizeof(EMBULK_OUTPUT_ORACLE_OCI_CONTEXT));
-	int result = test(&context, argv[1], argv[2], argv[3], argv[4]);
-	if (result == OCI_ERROR) {
-		printf("%s\r\n", context.message);
-	}
-	embulk_output_oracle_freeDirPathHandles(&context);
-	return result;
-}
-
+#include <stdio.h>
+#include <string.h>
+#include <dir-path-load.h>
+
+
+static int test(EMBULK_OUTPUT_ORACLE_OCI_CONTEXT *context, const char *db, const char *user, const char *pass, const char *csvFileName)
+{
+	if (embulk_output_oracle_prepareDirPathCtx(context, db, user, pass)) {
+		return OCI_ERROR;
+	}
+
+	EMBULK_OUTPUT_ORACLE_OCI_COL_DEF colDefs[] = {
+		{"ID", SQLT_INT, 4},
+		//{"ID", SQLT_CHR, 8},
+		{"NUM", SQLT_INT, 4},
+		//{"NUM", SQLT_CHR, 12},
+		{"VALUE1", SQLT_CHR, 60},
+		{"VALUE2", SQLT_CHR, 60},
+		{"VALUE3", SQLT_CHR, 60},
+		{"VALUE4", SQLT_CHR, 60},
+		{"VALUE5", SQLT_CHR, 60},
+		{"VALUE6", SQLT_CHR, 60},
+		{"VALUE7", SQLT_CHR, 60},
+		{"VALUE8", SQLT_CHR, 60},
+		{"VALUE9", SQLT_CHR, 60},
+		{"VALUE10", SQLT_CHR, 60},
+		{NULL, 0, 0}
+	};
+	if (embulk_output_oracle_prepareDirPathStream(context, "EXAMPLE", 832, colDefs)) {
+		return OCI_ERROR;
+	}
+
+	if (embulk_output_oracle_loadCSV(context, colDefs, csvFileName)) {
+		return OCI_ERROR;
+	}
+
+	if (embulk_output_oracle_commitDirPath(context)) {
+		return OCI_ERROR;
+	}
+
+	return OCI_SUCCESS;
+}
+
+
+int main(int argc, char* argv[])
+{
+	sword major_version;
+    sword minor_version; 
+    sword update_num;
+    sword patch_num;
+    sword port_update_num;
+	OCIClientVersion(&major_version, &minor_version, &update_num, &patch_num, &port_update_num);
+	printf("OCI client version = %d.%d.%d.%d.%d\r\n", major_version, minor_version, update_num, patch_num, port_update_num);
+
+	if (argc < 5) {
+		printf("embulk-output-oracle-test <db> <user> <password> <csv file name>\r\n");
+		return OCI_ERROR;
+	}
+
+	EMBULK_OUTPUT_ORACLE_OCI_CONTEXT context;
+	memset(&context, 0, sizeof(EMBULK_OUTPUT_ORACLE_OCI_CONTEXT));
+	int result = test(&context, argv[1], argv[2], argv[3], argv[4]);
+	if (result == OCI_ERROR) {
+		printf("%s\r\n", context.message);
+	}
+	embulk_output_oracle_freeDirPathHandles(&context);
+	return result;
+}
+

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

@@ -1,19 +1,19 @@
-# gcc, g++ and Oracle Instant Client SDK are requred.
-#
-# ln libocci.so.x.x libocci.so
-# ln libclntsh.so.x.x libclntsh.so
-#
-
-if [ "$JAVA_HOME" = "" ]
-then
-    echo "You should set the environment variable 'JAVA_HOME'."
-    exit 1
-fi
-
-if [ "$OCI_PATH" = "" ]
-then
-    echo "You should set the environment variable 'OCI_PATH'."
-    exit 1
-fi
-
-gcc -I. -I"$JAVA_HOME/include" -I"$OCI_PATH/sdk/include" -I../../../main/cpp/common -L"$OCI_PATH" ../common/embulk-output-oracle-test.cpp ../../../main/cpp/common/embulk-output-oracle.cpp ../../../main/cpp/common/dir-path-load.cpp -locci -lclntsh -lstdc++ -o embulk-output-oracle-test
+# gcc, g++ and Oracle Instant Client SDK are requred.
+#
+# ln libocci.so.x.x libocci.so
+# ln libclntsh.so.x.x libclntsh.so
+#
+
+if [ "$JAVA_HOME" = "" ]
+then
+    echo "You should set the environment variable 'JAVA_HOME'."
+    exit 1
+fi
+
+if [ "$OCI_PATH" = "" ]
+then
+    echo "You should set the environment variable 'OCI_PATH'."
+    exit 1
+fi
+
+gcc -I. -I"$JAVA_HOME/include" -I"$OCI_PATH/sdk/include" -I../../../main/cpp/common -L"$OCI_PATH" ../common/embulk-output-oracle-test.cpp ../../../main/cpp/common/embulk-output-oracle.cpp ../../../main/cpp/common/dir-path-load.cpp -locci -lclntsh -lstdc++ -o embulk-output-oracle-test

data/src/test/cpp/win/build.bat

@@ -1,29 +1,29 @@
-@ECHO OFF
-
-REM You should set the environment variable 'PATH' to CL.exe(x86_amd64) of Visual Studio.
-
-IF "%JAVA_HOME%" == "" (
-    ECHO "You should set the environment variable 'JAVA_HOME'."
-    EXIT /B 1
-)
-
-
-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
-)
-
-
+@ECHO OFF
+
+REM You should set the environment variable 'PATH' to CL.exe(x86_amd64) of Visual Studio.
+
+IF "%JAVA_HOME%" == "" (
+    ECHO "You should set the environment variable 'JAVA_HOME'."
+    EXIT /B 1
+)
+
+
+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
+)
+
+
 CL /I"..\..\..\main\cpp\common" /I"%MSSDK_PATH%\Include" /I"%MSVC_PATH%\include" /I"%OCI_SDK_PATH%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32"  /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-test.cpp ..\..\..\main\cpp\common\dir-path-load.cpp /link /LIBPATH:"%MSVC_PATH%\lib\amd64" /LIBPATH:"%MSSDK_PATH%\Lib\x64" /LIBPATH:"%OCI_SDK_PATH%\lib\msvc"   /INCREMENTAL:NO /NOLOGO /LIBPATH:"C:\Oracle\instantclient_12_1\x64\sdk\lib\msvc" "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" /ALLOWISOLATION /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X64 /ERRORREPORT:QUEUE