Pārlūkot izejas kodu

HADOOP-1856 [Hbaseshell] Jar command using Hadoop RunJar util

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@576239 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 17 gadi atpakaļ
vecāks
revīzija
ba92a01f8f

+ 2 - 0
src/contrib/hbase/CHANGES.txt

@@ -67,6 +67,8 @@ Trunk (unreleased changes)
                 (Izaak Rubin via Stack)
     HADOOP-1868 Make default configuration more responsive
     HADOOP-1884 Remove useless debugging log messages from hbase.mapred
+    HADOOP-1856 Add Jar command to hbase shell using Hadoop RunJar util
+                (Edward Yoon via Stack)
 
 
 Below are the list of changes before 2007-08-18

+ 4 - 3
src/contrib/hbase/src/java/org/apache/hadoop/hbase/Shell.java

@@ -68,9 +68,10 @@ public class Shell {
           }
         } catch (ParseException pe) {
           String[] msg = pe.getMessage().split("[\n]");
-          System.out.println("Syntax error : Type 'help' for usage: " + msg[0]);
+          System.out.println("Syntax error : Type 'help;' for usage.\nMessage : " + msg[0]);
         } catch (TokenMgrError te) {
-          System.out.println("Lexical error : Type 'help' for usage.");
+          String[] msg = te.getMessage().split("[\n]");
+          System.out.println("Lexical error : Type 'help;' for usage.\nMessage : " + msg[0]);
         }
 
         long end = System.currentTimeMillis();
@@ -105,4 +106,4 @@ public class Shell {
         "(" + String.format("%.2f", (end - start) * 0.001) + " sec)" :
           "";
   }
-}
+}

+ 23 - 1
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj

@@ -72,6 +72,7 @@ TOKEN: /** for HQL statements */
    | <CREATE: "create">   
    | <DROP: "drop">
    | <FS: "fs">
+   | <JAR: "jar">
    | <EXIT: "exit">
    | <INSERT: "insert">
    | <INTO: "into">
@@ -117,7 +118,7 @@ TOKEN: /** for HQL statements */
 
 TOKEN : /** Literals */
 {
-   <ID: (["A"-"Z","a"-"z","_","-",".",":","/"])+ >
+   <ID: (["A"-"Z","a"-"z","0"-"9","_","-",".",":","/"])+ >
  | <INTEGER_LITERAL: (["0"-"9"])+ >
  | <FLOATING_POINT_LITERAL:
    (["0"-"9"])+ "." (["0"-"9"])+ (<EXPONENT>)?
@@ -164,6 +165,7 @@ Command cmdStatement() :
       | cmd = disableCommand()
       | cmd = clearCommand()
       | cmd = fsCommand()
+      | cmd = jarCommand()
   )
    {
        return cmd;
@@ -197,6 +199,25 @@ FsCommand fsCommand() :
   }
 }
 
+JarCommand jarCommand() :
+{
+  Token t = null;
+  JarCommand jar = new JarCommand();
+  List<String> query = new ArrayList<String>();
+}
+{
+  <JAR>
+  (
+      ( t = <ID> | t = <INTEGER_LITERAL> )
+      { query.add(t.image.toString()); }
+  )*
+  
+  {
+    jar.setQuery(query);
+    return jar;
+  }
+}
+
 HelpCommand helpCommand() :
 {
   Token t = null;
@@ -218,6 +239,7 @@ HelpCommand helpCommand() :
        | t=<ALTER>
        | t=<CLEAR>
        | t=<FS>
+       | t=<JAR>
        | t=<ID>
      ) { argument = t.image.toString(); }
    ]

+ 4 - 1
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpContents.java

@@ -37,9 +37,12 @@ public class HelpContents {
 
     load.put("SHOW", new String[] {"List all available tables", "SHOW TABLES;"});
 
-    load.put("FS", new String[] { "Hadoop FsShell operations.",
+    load.put("FS", new String[] { "Hadoop FsShell operations",
       "FS -copyFromLocal /home/user/backup.dat fs/user/backup;" });
     
+    load.put("JAR", new String[] { "Hadoop RunJar util", 
+      "JAR ./build/hadoop-examples.jar pi 10 10;" });
+    
     load.put("CLEAR", new String[] {"Clear the screen", "CLEAR;"} );
     
     load.put("DESCRIBE", new String[] { "Print information about tables",

+ 111 - 67
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java

@@ -60,13 +60,14 @@ public class Parser implements ParserConstants {
     case CREATE:
     case DROP:
     case FS:
+    case JAR:
     case EXIT:
     case INSERT:
     case DELETE:
     case SELECT:
     case ENABLE:
     case DISABLE:
-    case 61:
+    case 62:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case HELP:
       case ALTER:
@@ -77,6 +78,7 @@ public class Parser implements ParserConstants {
       case CREATE:
       case DROP:
       case FS:
+      case JAR:
       case EXIT:
       case INSERT:
       case DELETE:
@@ -89,7 +91,7 @@ public class Parser implements ParserConstants {
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(61);
+      jj_consume_token(62);
       break;
     case 0:
       jj_consume_token(0);
@@ -149,6 +151,9 @@ public class Parser implements ParserConstants {
     case FS:
       cmd = fsCommand();
       break;
+    case JAR:
+      cmd = jarCommand();
+      break;
     default:
       jj_la1[2] = jj_gen;
       jj_consume_token(-1);
@@ -188,6 +193,41 @@ public class Parser implements ParserConstants {
     throw new Error("Missing return statement in function");
   }
 
+  final public JarCommand jarCommand() throws ParseException {
+  Token t = null;
+  JarCommand jar = new JarCommand();
+  List<String> query = new ArrayList<String>();
+    jj_consume_token(JAR);
+    label_2:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ID:
+      case INTEGER_LITERAL:
+        ;
+        break;
+      default:
+        jj_la1[4] = jj_gen;
+        break label_2;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ID:
+        t = jj_consume_token(ID);
+        break;
+      case INTEGER_LITERAL:
+        t = jj_consume_token(INTEGER_LITERAL);
+        break;
+      default:
+        jj_la1[5] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+        query.add(t.image.toString());
+    }
+    jar.setQuery(query);
+    {if (true) return jar;}
+    throw new Error("Missing return statement in function");
+  }
+
   final public HelpCommand helpCommand() throws ParseException {
   Token t = null;
   HelpCommand help = new HelpCommand();
@@ -201,6 +241,7 @@ public class Parser implements ParserConstants {
     case CREATE:
     case DROP:
     case FS:
+    case JAR:
     case EXIT:
     case INSERT:
     case DELETE:
@@ -240,18 +281,21 @@ public class Parser implements ParserConstants {
       case FS:
         t = jj_consume_token(FS);
         break;
+      case JAR:
+        t = jj_consume_token(JAR);
+        break;
       case ID:
         t = jj_consume_token(ID);
         break;
       default:
-        jj_la1[4] = jj_gen;
+        jj_la1[6] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
          argument = t.image.toString();
       break;
     default:
-      jj_la1[5] = jj_gen;
+      jj_la1[7] = jj_gen;
       ;
     }
       help.setArgument(argument);
@@ -270,7 +314,7 @@ public class Parser implements ParserConstants {
       argument = Identifier();
       break;
     default:
-      jj_la1[6] = jj_gen;
+      jj_la1[8] = jj_gen;
       ;
     }
       show.setArgument(argument);
@@ -289,7 +333,7 @@ public class Parser implements ParserConstants {
       jj_consume_token(DESC);
       break;
     default:
-      jj_la1[7] = jj_gen;
+      jj_la1[9] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -303,7 +347,7 @@ public class Parser implements ParserConstants {
   Map<String, Object> columnSpec = new HashMap<String, Object>();
   int n = -1;
   Token t = null;
-    label_2:
+    label_3:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case MAX_VERSIONS:
@@ -317,8 +361,8 @@ public class Parser implements ParserConstants {
         ;
         break;
       default:
-        jj_la1[8] = jj_gen;
-        break label_2;
+        jj_la1[10] = jj_gen;
+        break label_3;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case MAX_VERSIONS:
@@ -347,7 +391,7 @@ public class Parser implements ParserConstants {
           t = jj_consume_token(RECORD);
           break;
         default:
-          jj_la1[9] = jj_gen;
+          jj_la1[11] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -371,7 +415,7 @@ public class Parser implements ParserConstants {
           t = jj_consume_token(RETOUCHED_BLOOMFILTER);
           break;
         default:
-          jj_la1[10] = jj_gen;
+          jj_la1[12] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -396,7 +440,7 @@ public class Parser implements ParserConstants {
       columnSpec.put("NUM_ENTRIES", n);
         break;
       default:
-        jj_la1[11] = jj_gen;
+        jj_la1[13] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -418,15 +462,15 @@ public class Parser implements ParserConstants {
     column = Identifier();
     columnSpec = ColumnSpec();
     createCommand.addColumnSpec(column, columnSpec);
-    label_3:
+    label_4:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[12] = jj_gen;
-        break label_3;
+        jj_la1[14] = jj_gen;
+        break label_4;
       }
       jj_consume_token(COMMA);
       column = Identifier();
@@ -462,15 +506,15 @@ public class Parser implements ParserConstants {
         column = Identifier();
         columnSpec = ColumnSpec();
       alterCommand.addColumnSpec(column, columnSpec);
-        label_4:
+        label_5:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
           case COMMA:
             ;
             break;
           default:
-            jj_la1[13] = jj_gen;
-            break label_4;
+            jj_la1[15] = jj_gen;
+            break label_5;
           }
           jj_consume_token(COMMA);
           column = Identifier();
@@ -493,7 +537,7 @@ public class Parser implements ParserConstants {
       alterCommand.addColumnSpec(column, columnSpec);
         break;
       default:
-        jj_la1[14] = jj_gen;
+        jj_la1[16] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -539,7 +583,7 @@ public class Parser implements ParserConstants {
       t = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[15] = jj_gen;
+      jj_la1[17] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -570,7 +614,7 @@ public class Parser implements ParserConstants {
       t = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[16] = jj_gen;
+      jj_la1[18] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -608,7 +652,7 @@ public class Parser implements ParserConstants {
         jj_consume_token(FROM);
         break;
       default:
-        jj_la1[17] = jj_gen;
+        jj_la1[19] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -616,7 +660,7 @@ public class Parser implements ParserConstants {
        select.setRowKey(rowKey);
       break;
     default:
-      jj_la1[18] = jj_gen;
+      jj_la1[20] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -626,7 +670,7 @@ public class Parser implements ParserConstants {
        select.setTimestamp(timestamp);
       break;
     default:
-      jj_la1[19] = jj_gen;
+      jj_la1[21] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -636,7 +680,7 @@ public class Parser implements ParserConstants {
         select.setVersion(numVersion);
       break;
     default:
-      jj_la1[20] = jj_gen;
+      jj_la1[22] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -651,7 +695,7 @@ public class Parser implements ParserConstants {
       }
       break;
     default:
-      jj_la1[21] = jj_gen;
+      jj_la1[23] = jj_gen;
       ;
     }
     {if (true) return select;}
@@ -693,7 +737,7 @@ public class Parser implements ParserConstants {
     jj_consume_token(LPAREN);
    literal = getStringLiteral();
  if(literal != null) values.add(literal);
-    label_5:
+    label_6:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -703,8 +747,8 @@ public class Parser implements ParserConstants {
         ;
         break;
       default:
-        jj_la1[22] = jj_gen;
-        break label_5;
+        jj_la1[24] = jj_gen;
+        break label_6;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
@@ -726,14 +770,14 @@ public class Parser implements ParserConstants {
           jj_consume_token(QUOTED_IDENTIFIER);
           break;
         default:
-          jj_la1[23] = jj_gen;
+          jj_la1[25] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
        values.removeAll(values);
         break;
       default:
-        jj_la1[24] = jj_gen;
+        jj_la1[26] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -753,7 +797,7 @@ public class Parser implements ParserConstants {
       s = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[25] = jj_gen;
+      jj_la1[27] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -768,15 +812,15 @@ public class Parser implements ParserConstants {
     jj_consume_token(LPAREN);
    literal = getColumn();
  if(literal != null) values.add(literal);
-    label_6:
+    label_7:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[26] = jj_gen;
-        break label_6;
+        jj_la1[28] = jj_gen;
+        break label_7;
       }
       jj_consume_token(COMMA);
         literal = getColumn();
@@ -800,7 +844,7 @@ public class Parser implements ParserConstants {
         col = jj_consume_token(ASTERISK);
         break;
       default:
-        jj_la1[27] = jj_gen;
+        jj_la1[29] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -816,14 +860,14 @@ public class Parser implements ParserConstants {
         col = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[28] = jj_gen;
+        jj_la1[30] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
         {if (true) return col.image.substring(1,col.image.toString().length() - 1);}
       break;
     default:
-      jj_la1[29] = jj_gen;
+      jj_la1[31] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -835,15 +879,15 @@ public class Parser implements ParserConstants {
   String table = null;
     table = Identifier();
                          tableList.add(table);
-    label_7:
+    label_8:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[30] = jj_gen;
-        break label_7;
+        jj_la1[32] = jj_gen;
+        break label_8;
       }
       jj_consume_token(COMMA);
       table = Identifier();
@@ -862,15 +906,15 @@ public class Parser implements ParserConstants {
       } else {
         {if (true) return columnList;}
       }
-    label_8:
+    label_9:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case COMMA:
         ;
         break;
       default:
-        jj_la1[31] = jj_gen;
-        break label_8;
+        jj_la1[33] = jj_gen;
+        break label_9;
       }
       jj_consume_token(COMMA);
       column = getColumn();
@@ -904,14 +948,14 @@ public class Parser implements ParserConstants {
         t = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[34] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
        {if (true) return t.image.substring(1,t.image.toString().length() - 1);}
       break;
     default:
-      jj_la1[33] = jj_gen;
+      jj_la1[35] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -925,33 +969,33 @@ public class Parser implements ParserConstants {
     finally { jj_save(0, xla); }
   }
 
-  final private boolean jj_3R_9() {
+  final private boolean jj_3R_10() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_10()) {
+    if (jj_3R_11()) {
     jj_scanpos = xsp;
-    if (jj_3R_11()) return true;
+    if (jj_3R_12()) return true;
     }
     return false;
   }
 
   final private boolean jj_3_1() {
     if (jj_scan_token(ADD)) return true;
-    if (jj_3R_9()) return true;
+    if (jj_3R_10()) return true;
     return false;
   }
 
-  final private boolean jj_3R_11() {
+  final private boolean jj_3R_12() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(59)) {
+    if (jj_scan_token(60)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(60)) return true;
+    if (jj_scan_token(61)) return true;
     }
     return false;
   }
 
-  final private boolean jj_3R_10() {
+  final private boolean jj_3R_11() {
     if (jj_scan_token(ID)) return true;
     return false;
   }
@@ -965,7 +1009,7 @@ public class Parser implements ParserConstants {
   public boolean lookingAhead = false;
   private boolean jj_semLA;
   private int jj_gen;
-  final private int[] jj_la1 = new int[34];
+  final private int[] jj_la1 = new int[36];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static {
@@ -973,10 +1017,10 @@ public class Parser implements ParserConstants {
       jj_la1_1();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x3cffe0,0x3cffe1,0x3cffe0,0x0,0xcfbc0,0xcfbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0xc00000,0xc00000,0x10000000,0x20000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0x79ffe0,0x79ffe1,0x79ffe0,0x0,0x0,0x0,0x19fbc0,0x19fbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1800000,0x1800000,0x20000000,0x40000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x20000000,0x0,0x800000,0x800000,0x800000,0x18800000,0x0,0x1cc700,0x3800,0x38000,0x1cc700,0x2,0x2,0x600000,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x0,0x18800002,0x18800000,0x18800002,0x18000000,0x2,0x800080,0x18000000,0x18800080,0x2,0x2,0x18000000,0x18800000,};
+      jj_la1_1 = new int[] {0x0,0x40000000,0x0,0x1000000,0x3000000,0x3000000,0x1000000,0x1000000,0x31000000,0x0,0x398e00,0x7000,0x70000,0x398e00,0x4,0x4,0xc00000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x31000004,0x31000000,0x31000004,0x30000000,0x4,0x1000100,0x30000000,0x31000100,0x4,0x4,0x30000000,0x31000000,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -991,7 +1035,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1004,7 +1048,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1014,7 +1058,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1024,7 +1068,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1033,7 +1077,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1042,7 +1086,7 @@ public class Parser implements ParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1153,15 +1197,15 @@ public class Parser implements ParserConstants {
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[62];
-    for (int i = 0; i < 62; i++) {
+    boolean[] la1tokens = new boolean[63];
+    for (int i = 0; i < 63; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 34; i++) {
+    for (int i = 0; i < 36; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -1173,7 +1217,7 @@ public class Parser implements ParserConstants {
         }
       }
     }
-    for (int i = 0; i < 62; i++) {
+    for (int i = 0; i < 63; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

+ 49 - 47
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java

@@ -13,53 +13,54 @@ public interface ParserConstants {
   int CREATE = 11;
   int DROP = 12;
   int FS = 13;
-  int EXIT = 14;
-  int INSERT = 15;
-  int INTO = 16;
-  int TABLE = 17;
-  int DELETE = 18;
-  int SELECT = 19;
-  int ENABLE = 20;
-  int DISABLE = 21;
-  int STARTING = 22;
-  int WHERE = 23;
-  int FROM = 24;
-  int ROW = 25;
-  int VALUES = 26;
-  int COLUMNFAMILIES = 27;
-  int TIMESTAMP = 28;
-  int NUM_VERSIONS = 29;
-  int LIMIT = 30;
-  int AND = 31;
-  int OR = 32;
-  int COMMA = 33;
-  int DOT = 34;
-  int LPAREN = 35;
-  int RPAREN = 36;
-  int EQUALS = 37;
-  int NOTEQUAL = 38;
-  int ASTERISK = 39;
-  int MAX_VERSIONS = 40;
-  int MAX_LENGTH = 41;
-  int COMPRESSION = 42;
-  int NONE = 43;
-  int BLOCK = 44;
-  int RECORD = 45;
-  int IN_MEMORY = 46;
-  int BLOOMFILTER = 47;
-  int COUNTING_BLOOMFILTER = 48;
-  int RETOUCHED_BLOOMFILTER = 49;
-  int VECTOR_SIZE = 50;
-  int NUM_HASH = 51;
-  int NUM_ENTRIES = 52;
-  int ADD = 53;
-  int CHANGE = 54;
-  int ID = 55;
-  int INTEGER_LITERAL = 56;
-  int FLOATING_POINT_LITERAL = 57;
-  int EXPONENT = 58;
-  int QUOTED_IDENTIFIER = 59;
-  int STRING_LITERAL = 60;
+  int JAR = 14;
+  int EXIT = 15;
+  int INSERT = 16;
+  int INTO = 17;
+  int TABLE = 18;
+  int DELETE = 19;
+  int SELECT = 20;
+  int ENABLE = 21;
+  int DISABLE = 22;
+  int STARTING = 23;
+  int WHERE = 24;
+  int FROM = 25;
+  int ROW = 26;
+  int VALUES = 27;
+  int COLUMNFAMILIES = 28;
+  int TIMESTAMP = 29;
+  int NUM_VERSIONS = 30;
+  int LIMIT = 31;
+  int AND = 32;
+  int OR = 33;
+  int COMMA = 34;
+  int DOT = 35;
+  int LPAREN = 36;
+  int RPAREN = 37;
+  int EQUALS = 38;
+  int NOTEQUAL = 39;
+  int ASTERISK = 40;
+  int MAX_VERSIONS = 41;
+  int MAX_LENGTH = 42;
+  int COMPRESSION = 43;
+  int NONE = 44;
+  int BLOCK = 45;
+  int RECORD = 46;
+  int IN_MEMORY = 47;
+  int BLOOMFILTER = 48;
+  int COUNTING_BLOOMFILTER = 49;
+  int RETOUCHED_BLOOMFILTER = 50;
+  int VECTOR_SIZE = 51;
+  int NUM_HASH = 52;
+  int NUM_ENTRIES = 53;
+  int ADD = 54;
+  int CHANGE = 55;
+  int ID = 56;
+  int INTEGER_LITERAL = 57;
+  int FLOATING_POINT_LITERAL = 58;
+  int EXPONENT = 59;
+  int QUOTED_IDENTIFIER = 60;
+  int STRING_LITERAL = 61;
 
   int DEFAULT = 0;
 
@@ -78,6 +79,7 @@ public interface ParserConstants {
     "\"create\"",
     "\"drop\"",
     "\"fs\"",
+    "\"jar\"",
     "\"exit\"",
     "\"insert\"",
     "\"into\"",

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 249 - 241
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels