[incubator-doris] 04/20: fix some fe ut failed (#8547)

[morningman]

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

morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git

commit 1caf8ad3f41d6f1fb3ed15311a9ec38ace6b5333
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Mon Mar 21 10:36:06 2022 +0800

    fix some fe ut failed (#8547)
---
 .../java/org/apache/doris/external/elasticsearch/EsShardPartitions.java | 2 +-
 .../src/test/java/org/apache/doris/catalog/TempPartitionTest.java       | 2 +-
 .../src/test/java/org/apache/doris/catalog/TruncateTableTest.java       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java
 
b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java
index 710e6832..967cf18 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java
@@ -77,7 +77,7 @@ public class EsShardPartitions {
                         singleShardRouting.add(
                                 EsShardRouting.newSearchShard(
                                         (String) indexShard.get("index"),
-                                        (Integer) indexShard.get("shard"),
+                                        ((Long) 
indexShard.get("shard")).intValue(),
                                         (Boolean) indexShard.get("primary"),
                                         (String) indexShard.get("node"),
                                         (JSONObject) jsonObject.get("nodes")));
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java
index b587730..ffd3528 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TempPartitionTest.java
@@ -116,7 +116,7 @@ public class TempPartitionTest {
 
     private List<List<String>> checkTablet(String tbl, String partitions, 
boolean isTemp, int expected)
             throws Exception {
-        String showStr = "show tablet from " + tbl + (isTemp ? " temporary" : 
"") + " partition (" + partitions + ");";
+        String showStr = "show tablets from " + tbl + (isTemp ? " temporary" : 
"") + " partition (" + partitions + ");";
         ShowTabletStmt showStmt = (ShowTabletStmt) 
UtFrameUtils.parseAndAnalyzeStmt(showStr, ctx);
         ShowExecutor executor = new ShowExecutor(ctx, (ShowStmt) showStmt);
         ShowResultSet showResultSet = executor.execute();
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java
index 15a8f82..db8951d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java
@@ -125,7 +125,7 @@ public class TruncateTableTest {
     }
 
     private List<List<String>> checkShowTabletResultNum(String tbl, String 
partition, int expected) throws Exception {
-        String showStr = "show tablet from " + tbl + " partition(" + partition 
+ ")";
+        String showStr = "show tablets from " + tbl + " partition(" + 
partition + ")";
         ShowTabletStmt showStmt = (ShowTabletStmt) 
UtFrameUtils.parseAndAnalyzeStmt(showStr, connectContext);
         ShowExecutor executor = new ShowExecutor(connectContext, (ShowStmt) 
showStmt);
         ShowResultSet showResultSet = executor.execute();

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org