This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3e8b061 [Bug] Fix bug that forwarding show tablet stmt return error
(#4605)
3e8b061 is described below
commit 3e8b0618fd8effebf378efb4e27e8bfa3935220e
Author: Mingyu Chen <morningman....@gmail.com>
AuthorDate: Sun Sep 20 20:52:23 2020 +0800
[Bug] Fix bug that forwarding show tablet stmt return error (#4605)
When forwarding show tablet stmt to Master FE. If the result contains null,
FE will throw exception.
Fix it by using `\N` instead of "null" in result, to make thrift rpc happy.
---
fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
index 9641204..b41135a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
@@ -38,7 +38,6 @@ import org.apache.doris.analysis.ShowDbStmt;
import org.apache.doris.analysis.ShowDeleteStmt;
import org.apache.doris.analysis.ShowDynamicPartitionStmt;
import org.apache.doris.analysis.ShowEnginesStmt;
-import org.apache.doris.analysis.ShowResourcesStmt;
import org.apache.doris.analysis.ShowExportStmt;
import org.apache.doris.analysis.ShowFrontendsStmt;
import org.apache.doris.analysis.ShowFunctionsStmt;
@@ -52,6 +51,7 @@ import org.apache.doris.analysis.ShowPluginsStmt;
import org.apache.doris.analysis.ShowProcStmt;
import org.apache.doris.analysis.ShowProcesslistStmt;
import org.apache.doris.analysis.ShowRepositoriesStmt;
+import org.apache.doris.analysis.ShowResourcesStmt;
import org.apache.doris.analysis.ShowRestoreStmt;
import org.apache.doris.analysis.ShowRolesStmt;
import org.apache.doris.analysis.ShowRollupStmt;
@@ -1130,13 +1130,13 @@ public class ShowExecutor {
TabletInvertedIndex invertedIndex =
Catalog.getCurrentInvertedIndex();
TabletMeta tabletMeta = invertedIndex.getTabletMeta(tabletId);
Long dbId = tabletMeta != null ? tabletMeta.getDbId() :
TabletInvertedIndex.NOT_EXIST_VALUE;
- String dbName = null;
+ String dbName = FeConstants.null_string;
Long tableId = tabletMeta != null ? tabletMeta.getTableId() :
TabletInvertedIndex.NOT_EXIST_VALUE;
- String tableName = null;
+ String tableName = FeConstants.null_string;
Long partitionId = tabletMeta != null ?
tabletMeta.getPartitionId() : TabletInvertedIndex.NOT_EXIST_VALUE;
- String partitionName = null;
+ String partitionName = FeConstants.null_string;
Long indexId = tabletMeta != null ? tabletMeta.getIndexId() :
TabletInvertedIndex.NOT_EXIST_VALUE;
- String indexName = null;
+ String indexName = FeConstants.null_string;
Boolean isSync = true;
// check real meta
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
