From 11e09937a85ceb1f8821ab4094c1ccc259ab5f76 Mon Sep 17 00:00:00 2001
From: priyanshi-yb <pgupta@yugabyte.com>
Date: Tue, 28 Jan 2025 13:58:15 +0530
Subject: [PATCH 1/3] changed the copier to jinzhu/copier as it seems popular
and maintained
---
yb-voyager/go.mod | 2 +-
yb-voyager/go.sum | 4 ++--
yb-voyager/src/tgtdb/yugabytedb.go | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/yb-voyager/go.mod b/yb-voyager/go.mod
index 228330bfa1..716310a4a1 100644
--- a/yb-voyager/go.mod
+++ b/yb-voyager/go.mod
@@ -24,6 +24,7 @@ require (
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgx/v4 v4.18.3
github.com/jackc/pgx/v5 v5.0.3
+ github.com/jinzhu/copier v0.4.0
github.com/mattn/go-sqlite3 v1.14.17
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
github.com/mitchellh/go-ps v1.0.0
@@ -37,7 +38,6 @@ require (
github.com/tebeka/atexit v0.3.0
github.com/testcontainers/testcontainers-go v0.34.0
github.com/testcontainers/testcontainers-go/modules/yugabytedb v0.34.0
- github.com/tiendc/go-deepcopy v1.2.0
github.com/vbauerster/mpb/v8 v8.4.0
gocloud.dev v0.29.0
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
diff --git a/yb-voyager/go.sum b/yb-voyager/go.sum
index 61e5485128..62c999553d 100644
--- a/yb-voyager/go.sum
+++ b/yb-voyager/go.sum
@@ -1414,6 +1414,8 @@ github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxy
github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
+github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -1932,8 +1934,6 @@ github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNu
github.com/testcontainers/testcontainers-go/modules/yugabytedb v0.34.0 h1:9wIqSZJwBr4s8Q7R3S+rhe1J2zqHHxH0S1bN17ld+CI=
github.com/testcontainers/testcontainers-go/modules/yugabytedb v0.34.0/go.mod h1:bgHrbdYjpNPSstf8HfxChUxc6XztBCSoqDR0syb1Oeg=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tiendc/go-deepcopy v1.2.0 h1:6vCCs+qdLQHzFqY1fcPirsAWOmrLbuccilfp8UzD1Qo=
-github.com/tiendc/go-deepcopy v1.2.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
diff --git a/yb-voyager/src/tgtdb/yugabytedb.go b/yb-voyager/src/tgtdb/yugabytedb.go
index 8989190ee4..7c4e179f85 100644
--- a/yb-voyager/src/tgtdb/yugabytedb.go
+++ b/yb-voyager/src/tgtdb/yugabytedb.go
@@ -35,9 +35,9 @@ import (
"github.com/jackc/pgx/v4"
pgconn5 "github.com/jackc/pgx/v5/pgconn"
_ "github.com/jackc/pgx/v5/stdlib"
+ "github.com/jinzhu/copier"
"github.com/samber/lo"
log "github.com/sirupsen/logrus"
- "github.com/tiendc/go-deepcopy"
"golang.org/x/exp/slices"
"github.com/yugabyte/yb-voyager/yb-voyager/src/callhome"
@@ -246,8 +246,8 @@ func (yb *TargetYugabyteDB) InitConnPool() error {
yb.connPool = NewConnectionPool(params)
redactedParams := &ConnectionParams{}
//Whenever adding new fields to CONNECTION PARAMS check if that needs to be redacted while logging
- err := deepcopy.Copy(redactedParams, params)
- if err!= nil {
+ err := copier.Copy(redactedParams, params)
+ if err != nil {
log.Errorf("couldn't get the copy of connection params for logging: %v", err)
return nil
}
From 7c766f1ee16ae89617e6138aa776390489e55714 Mon Sep 17 00:00:00 2001
From: priyanshi-yb <pgupta@yugabyte.com>
Date: Tue, 28 Jan 2025 13:59:33 +0530
Subject: [PATCH 2/3] use String.format in java for MAP converter handling
---
.../ybexporter/DebeziumRecordTransformer.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java b/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
index c33c54f660..8f1d522d13 100644
--- a/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
+++ b/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
@@ -96,14 +96,15 @@ Escaping the key and value here for the double quote (")" and backslash char (\
LOGGER.debug("[MAP] after transforming key - {}", key);
LOGGER.debug("[MAP] after transforming value - {}", val);
- mapString.append("\"");
- mapString.append(key);
- mapString.append("\"");
- mapString.append(" => ");
- mapString.append("\"");
- mapString.append(val);
- mapString.append("\"");
- mapString.append(",");
+ // mapString.append("\"");
+ // mapString.append(key);
+ // mapString.append("\"");
+ // mapString.append(" => ");
+ // mapString.append("\"");
+ // mapString.append(val);
+ // mapString.append("\"");
+ // mapString.append(",");
+ mapString.append(String.format("\"%s\" => \"%s\",", key, val));
}
if(mapString.length() == 0) {
return "";
From 453ba70fcf3b355f4048dd4ea91f788657cd3b11 Mon Sep 17 00:00:00 2001
From: priyanshi-yb <pgupta@yugabyte.com>
Date: Tue, 28 Jan 2025 14:29:59 +0530
Subject: [PATCH 3/3] remove comments
---
.../server/ybexporter/DebeziumRecordTransformer.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java b/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
index 8f1d522d13..0fe8956c62 100644
--- a/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
+++ b/debezium-server-voyager/debezium-server-voyagerexporter/src/main/java/io/debezium/server/ybexporter/DebeziumRecordTransformer.java
@@ -96,14 +96,6 @@ Escaping the key and value here for the double quote (")" and backslash char (\
LOGGER.debug("[MAP] after transforming key - {}", key);
LOGGER.debug("[MAP] after transforming value - {}", val);
- // mapString.append("\"");
- // mapString.append(key);
- // mapString.append("\"");
- // mapString.append(" => ");
- // mapString.append("\"");
- // mapString.append(val);
- // mapString.append("\"");
- // mapString.append(",");
mapString.append(String.format("\"%s\" => \"%s\",", key, val));
}
if(mapString.length() == 0) {