diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/PartitionPathUtils.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/PartitionPathUtils.java
index 0d36bbaec2fd9a..4a988bc8f3b7e7 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/PartitionPathUtils.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/utils/PartitionPathUtils.java
@@ -108,24 +108,41 @@ public static String generatePartitionPath(LinkedHashMap<String, String> partiti
      * @param path The path to escape.
      * @return An escaped path name.
      */
-    private static String escapePathName(String path) {
+    static String escapePathName(String path) {
         if (path == null || path.length() == 0) {
             throw new TableException("Path should not be null or empty: " + path);
         }
 
-        StringBuilder sb = new StringBuilder();
+        StringBuilder sb = null;
         for (int i = 0; i < path.length(); i++) {
             char c = path.charAt(i);
             if (needsEscaping(c)) {
-                sb.append('%');
-                sb.append(String.format("%1$02X", (int) c));
-            } else {
+                if (sb == null) {
+                    sb = new StringBuilder(path.length() + 2);
+                    for (int j = 0; j < i; j++) {
+                        sb.append(path.charAt(j));
+                    }
+                }
+                escapeChar(c, sb);
+            } else if (sb != null) {
                 sb.append(c);
             }
         }
+        if (sb == null) {
+            return path;
+        }
         return sb.toString();
     }
 
+    static StringBuilder escapeChar(char c, StringBuilder sb) {
+        sb.append('%');
+        if (c < 16) {
+            sb.append('0');
+        }
+        sb.append(Integer.toHexString(c).toUpperCase());
+        return sb;
+    }
+
     /**
      * Make partition values from path.
      *
diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/PartitionPathUtilsTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/PartitionPathUtilsTest.java
new file mode 100644
index 00000000000000..1a18d428632875
--- /dev/null
+++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/utils/PartitionPathUtilsTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.utils;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/** Tests for {@link org.apache.flink.table.utils.PartitionPathUtils}. */
+public class PartitionPathUtilsTest {
+
+    @Test
+    public void testEscapeChar() {
+        for (char c = 0; c <= 128; c++) {
+            String expected = "%" + String.format("%1$02X", (int) c);
+            String actual = PartitionPathUtils.escapeChar(c, new StringBuilder()).toString();
+            assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testEscapePathNameWithHeadControl() {
+        String origin = "[00";
+        String expected = "%5B00";
+        String actual = PartitionPathUtils.escapePathName(origin);
+        assertEquals(expected, actual);
+        assertEquals(origin, PartitionPathUtils.unescapePathName(actual));
+    }
+
+    @Test
+    public void testEscapePathNameWithTailControl() {
+        String origin = "00]";
+        String expected = "00%5D";
+        String actual = PartitionPathUtils.escapePathName(origin);
+        assertEquals(expected, actual);
+        assertEquals(origin, PartitionPathUtils.unescapePathName(actual));
+    }
+
+    @Test
+    public void testEscapePathNameWithMidControl() {
+        String origin = "00:00";
+        String expected = "00%3A00";
+        String actual = PartitionPathUtils.escapePathName(origin);
+        assertEquals(expected, actual);
+        assertEquals(origin, PartitionPathUtils.unescapePathName(actual));
+    }
+
+    @Test
+    public void testEscapePathName() {
+        String origin = "[00:00]";
+        String expected = "%5B00%3A00%5D";
+        String actual = PartitionPathUtils.escapePathName(origin);
+        assertEquals(expected, actual);
+        assertEquals(origin, PartitionPathUtils.unescapePathName(actual));
+    }
+
+    @Test
+    public void testEscapePathNameWithoutControl() {
+        String origin = "0000";
+        String expected = "0000";
+        String actual = PartitionPathUtils.escapePathName(origin);
+        assertEquals(expected, actual);
+        assertEquals(origin, PartitionPathUtils.unescapePathName(actual));
+    }
+}