commit 5779aec031d4bb0bccd79329923e5dbad3786280
author Jarek Jarcec Cecho <jarcec@apache.org> Thu May 19 07:26:57 2016 -0700
committer Jarek Jarcec Cecho <jarcec@apache.org> Thu May 19 07:26:57 2016 -0700
tree c2be932870d5096ad77c5f425424fbd1f2d37c61
parent ac217a032c0755edac713ff53b3f55b7f2f46706

SQOOP-2906: Optimization of AvroUtil.toAvroIdentifier

(Joeri Hermans via Jarek Jarcec Cecho)

src/java/org/apache/sqoop/avro/AvroUtil.java

diff --git a/src/java/org/apache/sqoop/avro/AvroUtil.java b/src/java/org/apache/sqoop/avro/AvroUtil.java
index 319be0f..ee29f14 100644
--- a/src/java/org/apache/sqoop/avro/AvroUtil.java
+++ b/src/java/org/apache/sqoop/avro/AvroUtil.java
@@ -114,11 +114,25 @@
    * Format candidate to avro specifics
    */
   public static String toAvroIdentifier(String candidate) {
-    String formattedCandidate = candidate.replaceAll("\\W+", "_");
-    if (formattedCandidate.substring(0,1).matches("[a-zA-Z_]")) {
-      return formattedCandidate;
+    char[] data = candidate.toCharArray();
+    boolean skip = false;
+    int stringIndex = 0;
+
+    for (char c:data) {
+      if (Character.isLetterOrDigit(c) || c == '_') {
+        data[stringIndex++] = c;
+        skip = false;
+      } else if(!skip) {
+        data[stringIndex++] = '_';
+        skip = true;
+      }
+    }
+
+    char initial = data[0];
+    if (Character.isLetter(initial) || initial == '_') {
+      return new String(data, 0, stringIndex);
     } else {
-      return "AVRO_" + formattedCandidate;
+      return "AVRO_".concat(new String(data, 0, stringIndex));
     }
   }