[inlong] branch master updated: [INLONG-7387][Agent] Fix error of SqlServer connector (#7388)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bf8fa4b5 [INLONG-7387][Agent] Fix error of SqlServer connector (#7388)
2bf8fa4b5 is described below

commit 2bf8fa4b581bd0e0e41490b30ec4a90e25e2f14e
Author: haifxu <xhf1208357...@gmail.com>
AuthorDate: Fri Feb 17 16:45:09 2023 +0800

    [INLONG-7387][Agent] Fix error of SqlServer connector (#7388)
---
 .../src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java | 8 ++++----
 .../src/main/java/org/apache/inlong/agent/pojo/SqlServerJob.java  | 6 +++---
 .../org/apache/inlong/agent/plugin/sources/SQLServerSource.java   | 3 ++-
 .../inlong/agent/plugin/sources/reader/SQLServerReader.java       | 6 +++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
index 3f14dd09a..74e8377af 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
@@ -71,7 +71,7 @@ public class JobProfileDto {
     /**
      * sqlserver source
      */
-    public static final String SQLSERVER_SOURCE = 
"org.apache.inlong.agent.plugin.sources.SqlServerSource";
+    public static final String SQLSERVER_SOURCE = 
"org.apache.inlong.agent.plugin.sources.SQLServerSource";
 
     private static final Gson GSON = new Gson();
 
@@ -293,12 +293,12 @@ public class JobProfileDto {
         SqlServerJob.SqlserverJobConfig config = 
GSON.fromJson(dataConfigs.getExtParams(),
                 SqlServerJob.SqlserverJobConfig.class);
         SqlServerJob sqlServerJob = new SqlServerJob();
-        sqlServerJob.setUser(config.getUser());
+        sqlServerJob.setUser(config.getUsername());
         sqlServerJob.setHostname(config.getHostname());
         sqlServerJob.setPassword(config.getPassword());
         sqlServerJob.setPort(config.getPort());
-        sqlServerJob.setServerName(config.getServerName());
-        sqlServerJob.setDbname(config.getDbname());
+        sqlServerJob.setServerName(config.getSchemaName());
+        sqlServerJob.setDbname(config.getDatabase());
 
         SqlServerJob.Offset offset = new SqlServerJob.Offset();
         offset.setFilename(config.getOffsetFilename());
diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlServerJob.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlServerJob.java
index 735c745bb..c18ae32e5 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlServerJob.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlServerJob.java
@@ -58,11 +58,11 @@ public class SqlServerJob {
     public static class SqlserverJobConfig {
 
         private String hostname;
-        private String user;
+        private String username;
         private String password;
         private String port;
-        private String dbname;
-        private String serverName;
+        private String database;
+        private String schemaName;
 
         private String snapshotMode;
         private String intervalMs;
diff --git 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/SQLServerSource.java
 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/SQLServerSource.java
index a65006152..ebc8f1342 100644
--- 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/SQLServerSource.java
+++ 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/SQLServerSource.java
@@ -39,7 +39,8 @@ public class SQLServerSource extends AbstractSource {
     @Override
     public List<Reader> split(JobProfile conf) {
         super.init(conf);
-        Reader sqlServerReader = new SQLServerReader();
+        SQLServerReader sqlServerReader = new SQLServerReader();
+        sqlServerReader.setReadSource(conf.getInstanceId());
         List<Reader> readerList = new ArrayList<>();
         readerList.add(sqlServerReader);
         sourceMetric.sourceSuccessCount.incrementAndGet();
diff --git 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
index 41957c4e3..de2d2e8a9 100644
--- 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
+++ 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
@@ -149,6 +149,10 @@ public class SQLServerReader extends AbstractReader {
         return instanceId;
     }
 
+    public void setReadSource(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
     @Override
     public void setReadTimeout(long mill) {
 
@@ -253,7 +257,7 @@ public class SQLServerReader extends AbstractReader {
 
     private Properties getEngineProps() {
         Properties props = new Properties();
-        props.setProperty("name", "engine" + instanceId);
+        props.setProperty("name", "engine-" + instanceId);
         props.setProperty("connector.class", 
SqlServerConnector.class.getCanonicalName());
         props.setProperty("database.hostname", hostName);
         props.setProperty("database.port", port);