improve ctid class

Author: rodireich

airbyte-integrations/connectors/source-postgres/src/main/kotlin/io/airbyte/integrations/source/postgres/PostgresSourceJdbcPartitionFactory.kt

@@ -322,7 +322,7 @@ class PostgresSourceJdbcPartitionFactory(
     private fun PostgresSourceJdbcSplittableSnapshotPartition.split(
         splitPointValues: List<PostgresSourceJdbcStreamStateValue>
     ): List<PostgresSourceJdbcSplittableSnapshotPartition> {
-        val inners: List<Ctid> = splitPointValues.map { Ctid(it.ctid!!) }
+        val inners: List<Ctid> = splitPointValues.map { Ctid.of(it.ctid!!) }
         val lbCtid: Ctid? =
             lowerBound?.let {
                 if (it.isNotEmpty()) {
@@ -351,7 +351,7 @@ class PostgresSourceJdbcPartitionFactory(
     private fun PostgresSourceJdbcSplittableSnapshotWithCursorPartition.split(
         splitPointValues: List<PostgresSourceJdbcStreamStateValue>
     ): List<PostgresSourceJdbcSplittableSnapshotWithCursorPartition> {
-        val inners: List<Ctid> = splitPointValues.map { Ctid(it.ctid!!) }
+        val inners: List<Ctid> = splitPointValues.map { Ctid.of(it.ctid!!) }
         val lbCtid: Ctid? =
             lowerBound?.let {
                 if (it.isNotEmpty()) {

airbyte-integrations/connectors/source-postgres/src/main/kotlin/io/airbyte/integrations/source/postgres/PostgresSourceJdbcStreamState.kt

@@ -28,7 +28,7 @@ class PostgresSourceJdbcStreamState(val base: DefaultJdbcStreamState) :
     val maybeFilenode: Filenode?
         get() = stateValue?.let { sv -> sv.filenode }
     val maybeCtid: Ctid?
-        get() = stateValue?.let { sv -> sv.ctid?.let { Ctid(it) } }
+        get() = stateValue?.let { sv -> sv.ctid?.let { Ctid.of(it) } }
 
     override fun validatePartition(
         partition: JdbcPartition<*>,

airbyte-integrations/connectors/source-postgres/src/main/kotlin/io/airbyte/integrations/source/postgres/ctid/Ctid.kt

@@ -4,68 +4,33 @@
 
 package io.airbyte.integrations.source.postgres.ctid
 
-import java.util.*
 import java.util.regex.Pattern
 
-class Ctid {
-    val page: Long
+data class Ctid (
+    val page: Long,
     val tuple: Long
-
-    internal constructor(page: Long, tuple: Long) {
-        this.page = page
-        this.tuple = tuple
-    }
-
-    internal constructor(ctid: String) {
-        val p = Pattern.compile("\\d+")
-        val m = p.matcher(ctid)
-        require(m.find()) { "Invalid ctid format" }
-        val ctidPageStr = m.group()
-        this.page = ctidPageStr.toLong()
-
-        require(m.find()) { "Invalid ctid format" }
-        val ctidTupleStr = m.group()
-        this.tuple = ctidTupleStr.toLong()
-
-        Objects.requireNonNull<Long?>(this.page)
-        Objects.requireNonNull<Long?>(this.tuple)
-    }
-
+) {
     override fun toString(): String = "($page,$tuple)"
 
-    override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
-        if (other == null || javaClass != other.javaClass) {
-            return false
-        }
-        val ctid = other as Ctid
-        return page == ctid.page && tuple == ctid.tuple
-    }
+    companion object {
+        val ZERO: Ctid = Ctid(0, 0)
 
-    override fun hashCode(): Int {
-        return Objects.hash(page, tuple)
-    }
+        fun of(ctid: String): Ctid {
+            val p = Pattern.compile("\\d+")
+            val m = p.matcher(ctid)
+            require(m.find()) { "Invalid ctid format" }
+            val ctidPageStr = m.group()
+            val page: Long = ctidPageStr.toLong()
 
-    companion object {
-        val ZERO: Ctid = of(0, 0)
+            require(m.find()) { "Invalid ctid format" }
+            val ctidTupleStr = m.group()
+            val tuple: Long = ctidTupleStr.toLong()
 
-        fun of(page: Long, tuple: Long): Ctid {
             return Ctid(page, tuple)
         }
 
-        fun of(ctid: String): Ctid {
-            return Ctid(ctid)
-        }
-
-        fun inc(ctid: Ctid, maxTuple: Long): Ctid {
-            return if (ctid.tuple + 1 > maxTuple) of(ctid.page + 1, 1)
-            else
-                of(
-                    ctid.page,
-                    ctid.tuple + 1,
-                )
-        }
+        fun inc(ctid: Ctid, maxTuple: Long): Ctid =
+            if (ctid.tuple + 1 > maxTuple) Ctid(ctid.page + 1, 1)
+            else Ctid(ctid.page, ctid.tuple + 1)
     }
 }