[Improve][Jdbc] Using varchar2 datatype store string in oracle (apach…

…e#6392)
chaorongzhi · Aug 21, 2024 · f79f8f4 · f79f8f4
1 parent 0d56c63
commit f79f8f4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -362,6 +362,8 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
+      - name: free disk space
+        run: tools/github/free_disk_space.sh
       - name: run updated modules integration test (part-3)
         if: needs.changes.outputs.api == 'false' && needs.changes.outputs.it-modules != ''
         run: |

diff --git a/...ache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverter.java b/...ache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverter.java
@@ -330,12 +330,12 @@ public BasicTypeDefine reconvert(Column column) {
             case STRING:
                 if (column.getColumnLength() == null || column.getColumnLength() <= 0) {
                     builder.columnType(
-                            String.format("%s(%s)", ORACLE_NVARCHAR2, MAX_VARCHAR_LENGTH));
-                    builder.dataType(ORACLE_NVARCHAR2);
+                            String.format("%s(%s)", ORACLE_VARCHAR2, MAX_VARCHAR_LENGTH));
+                    builder.dataType(ORACLE_VARCHAR2);
                 } else if (column.getColumnLength() <= MAX_VARCHAR_LENGTH) {
                     builder.columnType(
-                            String.format("%s(%s)", ORACLE_NVARCHAR2, column.getColumnLength()));
-                    builder.dataType(ORACLE_NVARCHAR2);
+                            String.format("%s(%s)", ORACLE_VARCHAR2, column.getColumnLength()));
+                    builder.dataType(ORACLE_VARCHAR2);
                 } else {
                     builder.columnType(ORACLE_CLOB);
                     builder.dataType(ORACLE_CLOB);

diff --git a/.../seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverterTest.java b/.../seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverterTest.java
@@ -660,8 +660,8 @@ public void testReconvertString() {
 
         BasicTypeDefine typeDefine = OracleTypeConverter.INSTANCE.reconvert(column);
         Assertions.assertEquals(column.getName(), typeDefine.getName());
-        Assertions.assertEquals("NVARCHAR2(4000)", typeDefine.getColumnType());
-        Assertions.assertEquals(OracleTypeConverter.ORACLE_NVARCHAR2, typeDefine.getDataType());
+        Assertions.assertEquals("VARCHAR2(4000)", typeDefine.getColumnType());
+        Assertions.assertEquals(OracleTypeConverter.ORACLE_VARCHAR2, typeDefine.getDataType());
 
         column =
                 PhysicalColumn.builder()
@@ -674,9 +674,9 @@ public void testReconvertString() {
         Assertions.assertEquals(column.getName(), typeDefine.getName());
         Assertions.assertEquals(
                 String.format(
-                        "%s(%s)", OracleTypeConverter.ORACLE_NVARCHAR2, column.getColumnLength()),
+                        "%s(%s)", OracleTypeConverter.ORACLE_VARCHAR2, column.getColumnLength()),
                 typeDefine.getColumnType());
-        Assertions.assertEquals(OracleTypeConverter.ORACLE_NVARCHAR2, typeDefine.getDataType());
+        Assertions.assertEquals(OracleTypeConverter.ORACLE_VARCHAR2, typeDefine.getDataType());
 
         column =
                 PhysicalColumn.builder()
@@ -689,9 +689,9 @@ public void testReconvertString() {
         Assertions.assertEquals(column.getName(), typeDefine.getName());
         Assertions.assertEquals(
                 String.format(
-                        "%s(%s)", OracleTypeConverter.ORACLE_NVARCHAR2, column.getColumnLength()),
+                        "%s(%s)", OracleTypeConverter.ORACLE_VARCHAR2, column.getColumnLength()),
                 typeDefine.getColumnType());
-        Assertions.assertEquals(OracleTypeConverter.ORACLE_NVARCHAR2, typeDefine.getDataType());
+        Assertions.assertEquals(OracleTypeConverter.ORACLE_VARCHAR2, typeDefine.getDataType());
 
         column =
                 PhysicalColumn.builder()

diff --git a/...-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java b/...-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java
@@ -27,6 +27,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.PullPolicy;
 import org.testcontainers.utility.DockerLoggerFactory;
 
 import com.google.common.collect.Lists;
@@ -283,6 +284,7 @@ GenericContainer<?> initContainer() {
                 .withNetwork(NETWORK)
                 .withNetworkAliases(HOSTNAME)
                 .withExposedPorts(PORT)
+                .withImagePullPolicy(PullPolicy.alwaysPull())
                 .waitingFor(Wait.forLogMessage(".*boot success!.*", 1))
                 .withStartupTimeout(Duration.ofMinutes(5))
                 .withLogConsumer(new Slf4jLogConsumer(DockerLoggerFactory.getLogger(IMAGE)));