From b5e6eaa052821d7f0976738c67de777ded91243a Mon Sep 17 00:00:00 2001 From: chenmingyu Date: Thu, 1 Nov 2018 19:18:59 +0800 Subject: [PATCH] Make class name compatible with the old name We wrote the old name 'com.baidu.palo.xxx' in bdbje as meta journal. So we need to make it compatible with 'org.apache.doris.xxx'. --- fe/src/main/java/org/apache/doris/analysis/AlterClause.java | 4 ++++ .../main/java/org/apache/doris/mysql/privilege/PrivEntry.java | 4 ++++ .../main/java/org/apache/doris/mysql/privilege/PrivTable.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/fe/src/main/java/org/apache/doris/analysis/AlterClause.java b/fe/src/main/java/org/apache/doris/analysis/AlterClause.java index ced6fb1033fd6f..4eb227584281ec 100644 --- a/fe/src/main/java/org/apache/doris/analysis/AlterClause.java +++ b/fe/src/main/java/org/apache/doris/analysis/AlterClause.java @@ -46,6 +46,10 @@ public String toSql() { public static AlterClause read(DataInput in) throws IOException { String className = Text.readString(in); + if (className.startsWith("com.baidu.palo")) { + // we need to be compatible with former class name + className = className.replaceFirst("com.baidu.palo", "org.apache.doris"); + } AlterClause alterClause = null; try { Class derivedClass = (Class) Class.forName(className); diff --git a/fe/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java b/fe/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java index 8b1ac2fefc6baf..47600b5de817e2 100644 --- a/fe/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java +++ b/fe/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java @@ -176,6 +176,10 @@ public boolean match(UserIdentity userIdent, boolean exactMatch) { */ public static PrivEntry read(DataInput in) throws IOException { String className = Text.readString(in); + if (className.startsWith("com.baidu.palo")) { + // we need to be compatible with former class name + className = className.replaceFirst("com.baidu.palo", "org.apache.doris"); + } PrivEntry privEntry = null; try { Class derivedClass = (Class) Class.forName(className); diff --git a/fe/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java b/fe/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java index ff914c41379aa1..677eff5f578b49 100644 --- a/fe/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java +++ b/fe/src/main/java/org/apache/doris/mysql/privilege/PrivTable.java @@ -178,6 +178,10 @@ public boolean isEmpty() { public static PrivTable read(DataInput in) throws IOException { String className = Text.readString(in); + if (className.startsWith("com.baidu.palo")) { + // we need to be compatible with former class name + className = className.replaceFirst("com.baidu.palo", "org.apache.doris"); + } PrivTable privTable = null; try { Class derivedClass = (Class) Class.forName(className);