Revert "[#92] Connector changes to support composite types (#30)"

This reverts commit 53992d8.
yugabyte · Nov 22, 2022 · 28b5923 · 28b5923
1 parent 53992d8
commit 28b5923
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 121 deletions.
diff --git a/src/main/java/io/debezium/connector/yugabytedb/PgOid.java b/src/main/java/io/debezium/connector/yugabytedb/PgOid.java
@@ -41,5 +41,4 @@ public final class PgOid extends Oid {
     public static final int INT8RANGE_OID = 3926;
     public static final int INT8RANGE_ARRAY = 3927;
     public static final int ENUM_OID = 3500;
-    public static final int RECORD_OID = 2249;
 }
diff --git a/src/main/java/io/debezium/connector/yugabytedb/YugabyteDBValueConverter.java b/src/main/java/io/debezium/connector/yugabytedb/YugabyteDBValueConverter.java
@@ -203,7 +203,6 @@ public SchemaBuilder schemaBuilder(Column column) {
             case PgOid.NUM_RANGE_OID:
             case PgOid.INT8RANGE_OID:
             case PgOid.ENUM_OID:
-            case PgOid.RECORD_OID:
                 return SchemaBuilder.string();
             case PgOid.UUID:
                 return Uuid.builder();
@@ -394,7 +393,6 @@ public ValueConverter converter(Column column, Field fieldDefn) {
             case PgOid.NUM_RANGE_OID:
             case PgOid.INT8RANGE_OID:
             case PgOid.ENUM_OID:
-            case PgOid.RECORD_OID:
                 return data -> convertString(column, fieldDefn, data);
             case PgOid.POINT:
                 return data -> convertPoint(column, fieldDefn, data);

diff --git a/src/test/java/io/debezium/connector/yugabytedb/YugabyteDBCompositeTypesTest.java b/src/test/java/io/debezium/connector/yugabytedb/YugabyteDBCompositeTypesTest.java
diff --git a/src/test/java/io/debezium/connector/yugabytedb/YugabyteDBDatatypesTest.java b/src/test/java/io/debezium/connector/yugabytedb/YugabyteDBDatatypesTest.java
@@ -22,12 +22,14 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.YugabyteYSQLContainer;
 
 import io.debezium.config.Configuration;
 import io.debezium.connector.yugabytedb.common.YugabyteDBTestBase;
 import io.debezium.connector.yugabytedb.transforms.YBExtractNewRecordState;
 import io.debezium.transforms.ExtractNewRecordStateConfigDefinition;
+import io.debezium.util.Strings;
 
 /**
  * Basic unit tests to check the behaviour with YugabyteDB datatypes

diff --git a/src/test/java/io/debezium/connector/yugabytedb/common/YugabyteDBTestBase.java b/src/test/java/io/debezium/connector/yugabytedb/common/YugabyteDBTestBase.java
@@ -9,10 +9,14 @@
 public class YugabyteDBTestBase extends AbstractConnectorTest {
     public void awaitUntilConnectorIsReady() throws Exception {
         Awaitility.await()
-                  .pollDelay(Duration.ofSeconds(10))
-                  .atMost(Duration.ofSeconds(15))
+                  .pollDelay(Duration.ofSeconds(5))
+                  .atMost(Duration.ofSeconds(10))
                   .until(() -> {
-                    return engine.isRunning();
+                    if (engine.isRunning()) {
+                        return true;
+                    } else {
+                        return false;
+                    }
                   });
     }
 }
diff --git a/src/test/resources/drop_tables_and_databases.ddl b/src/test/resources/drop_tables_and_databases.ddl
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS all_types;
 DROP TABLE IF EXISTS test_enum;
-DROP TABLE IF EXISTS composite_types_table;
 DROP DATABASE IF EXISTS secondary_database;
+