(inlong) branch master updated: [INLONG-11095][Manager] Fix the problem of data preview field misalignment (#11096)

[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 c620fdc681 [INLONG-11095][Manager] Fix the problem of data preview 
field misalignment (#11096)
c620fdc681 is described below

commit c620fdc681b8d04937032434a738bcae7699a309
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Fri Sep 13 18:14:32 2024 +0800

    [INLONG-11095][Manager] Fix the problem of data preview field misalignment 
(#11096)
---
 .../org/apache/inlong/manager/pojo/stream/QueryMessageRequest.java   | 2 +-
 .../apache/inlong/manager/service/datatype/CsvDataTypeOperator.java  | 5 +++--
 .../apache/inlong/manager/service/datatype/KvDataTypeOperator.java   | 2 +-
 .../inlong/manager/service/resource/queue/pulsar/PulsarOperator.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/QueryMessageRequest.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/QueryMessageRequest.java
index 3c939222e5..0183b57e6f 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/QueryMessageRequest.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/QueryMessageRequest.java
@@ -41,7 +41,7 @@ public class QueryMessageRequest {
     private String streamId;
 
     @ApiModelProperty(value = "Message count")
-    private Integer messageCount = 100;
+    private Integer messageCount = 10;
 
     @ApiModelProperty(value = "Field name")
     private String fieldName;
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
index 3fa9853e93..de53dfb19c 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
@@ -52,12 +52,13 @@ public class CsvDataTypeOperator implements 
DataTypeOperator {
             if (StringUtils.isNotBlank(streamInfo.getDataEscapeChar())) {
                 escapeChar = streamInfo.getDataEscapeChar().charAt(0);
             }
-            String[][] rowValues = SplitUtils.splitCsv(str, separator, 
escapeChar, '\"', '\n', true);
+            String[][] rowValues = SplitUtils.splitCsv(str, separator, 
escapeChar, null, '\n', true);
+            int fieldIndex = 0;
             for (int i = 0; i < rowValues.length; i++) {
                 String[] fieldValues = rowValues[i];
                 for (int j = 0; j < fieldValues.length; j++) {
                     if (i + j < fields.size()) {
-                        fields.get(i + j).setFieldValue(fieldValues[j]);
+                        fields.get(fieldIndex++).setFieldValue(fieldValues[j]);
                     }
                 }
             }
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
index 8b0a40af37..900732f906 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
@@ -62,7 +62,7 @@ public class KvDataTypeOperator implements DataTypeOperator {
                 lineSeparator = (char) 
Integer.parseInt(streamInfo.getLineSeparator());
             }
             List<Map<String, String>> rowValues =
-                    KvUtils.splitKv(str, separator, kvSeparator, escapeChar, 
'\"', lineSeparator);
+                    KvUtils.splitKv(str, separator, kvSeparator, escapeChar, 
null, lineSeparator);
             for (Map<String, String> row : rowValues) {
                 for (FieldInfo fieldInfo : fields) {
                     fieldInfo.setFieldValue(row.get(fieldInfo.getFieldName()));
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarOperator.java
index a7ac1dcf9a..0e4983214c 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarOperator.java
@@ -414,7 +414,7 @@ public class PulsarOperator {
         LOGGER.info("begin to query message for topic {}, adminUrl={}", 
topicFullName, pulsarClusterInfo.getAdminUrl());
         List<BriefMQMessage> messageList = new ArrayList<>();
         int partitionCount = getPartitionCount(pulsarClusterInfo, 
topicFullName);
-        for (int messageIndex = 0; messageIndex < 100; messageIndex++) {
+        for (int messageIndex = 0; messageIndex < request.getMessageCount(); 
messageIndex++) {
             int currentPartitionNum = messageIndex % partitionCount;
             int messagePosition = messageIndex / partitionCount + 1;
             String topicNameOfPartition = 
buildTopicNameOfPartition(topicFullName, currentPartitionNum, serial);