[GitHub] imay closed pull request #267: Make class name compatible with the old name

[GitBox <gi...@apache.org>]

imay closed pull request #267: Make class name compatible with the old name
URL: https://github.com/apache/incubator-doris/pull/267
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 ced6fb10..4eb22758 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<? extends AlterClause> derivedClass = (Class<? extends AlterClause>) 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 8b1ac2fe..47600b5d 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<? extends PrivEntry> derivedClass = (Class<? extends PrivEntry>) 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 ff914c41..677eff5f 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<? extends PrivTable> derivedClass = (Class<? extends PrivTable>) Class.forName(className);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@doris.apache.org
For additional commands, e-mail: dev-help@doris.apache.org