hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r610092 - in /lucene/hadoop/trunk/src/contrib/hbase: ./ src/java/org/apache/hadoop/hbase/shell/ src/java/org/apache/hadoop/hbase/shell/generated/
Date Tue, 08 Jan 2008 18:28:07 GMT
Author: stack
Date: Tue Jan  8 10:27:58 2008
New Revision: 610092

URL: http://svn.apache.org/viewvc?rev=610092&view=rev
Log:
HADOOP-2472 Range selection using filter

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Jan  8 10:27:58 2008
@@ -157,6 +157,7 @@
    HADOOP-2502 Insert/Select timestamp, Timestamp data type in HQL
                (Edward Yoon via Stack)
    HADOOP-2450 Show version (and svn revision) in hbase web ui
+   HADOOP-2472 Range selection using filter (Edward Yoon via Stack)
                
 
 

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj Tue Jan  8 10:27:58 2008
@@ -93,6 +93,7 @@
    | <STARTING: "starting">
    | <WHERE: "where">
    | <FROM: "from">
+   | <UNTIL: "until">
    | <ROW: "row">
    | <VALUES: "values">
    | <COLUMNFAMILIES: "columnfamilies">
@@ -566,6 +567,7 @@
   SelectCommand select = new SelectCommand(this.out, this.formatter);
   List<String> columns = null;
   String rowKey = "";
+  String stopRow = "";
   String timestamp = null;
   int numVersion = 0;
   String tableName = null;
@@ -590,6 +592,9 @@
      {
        select.setRowKey(rowKey); 
      }
+     [<UNTIL>
+      stopRow = getStringLiteral()
+     {select.setStopRow(stopRow);} ]
   ]
 
   [ <TIMESTAMP> 

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java Tue Jan  8 10:27:58 2008
@@ -109,7 +109,7 @@
     load.put("SELECT", new String[] {
         "Select values from table",
         "SELECT {column_name, [, column_name] ... | *} FROM table_name "
-            + "[WHERE row='row_key' | STARTING FROM 'row-key'] "
+            + "[WHERE row='row_key' | STARTING FROM 'row-key' [UNTIL 'stop-key']] "
             + "[NUM_VERSIONS = version_count] " + "[TIMESTAMP 'timestamp'] "
             + "[LIMIT = row_count] " + "[INTO FILE 'file_name'];" });
 

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/SelectCommand.java Tue Jan  8 10:27:58 2008
@@ -38,6 +38,9 @@
 import org.apache.hadoop.hbase.HTable;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.Shell;
+import org.apache.hadoop.hbase.filter.RowFilterInterface;
+import org.apache.hadoop.hbase.filter.StopRowFilter;
+import org.apache.hadoop.hbase.filter.WhileMatchRowFilter;
 import org.apache.hadoop.hbase.shell.generated.Parser;
 import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.io.Text;
@@ -50,6 +53,7 @@
 public class SelectCommand extends BasicCommand {
   private Text tableName;
   private Text rowKey = new Text("");
+  private Text stopRow = new Text("");
   private List<String> columns;
   private long timestamp;
   private int limit;
@@ -214,6 +218,12 @@
       } else {
         scan = table.obtainScanner(cols, rowKey, timestamp);
       }
+      
+      if(this.stopRow.toString().length() > 0) {
+        RowFilterInterface filter =  new WhileMatchRowFilter(new StopRowFilter(stopRow));
+        scan = table.obtainScanner(cols, rowKey, filter);
+      }
+      
       HStoreKey key = new HStoreKey();
       TreeMap<Text, byte[]> results = new TreeMap<Text, byte[]>();
       // If only one column in query, then don't print out the column.
@@ -336,6 +346,10 @@
       this.rowKey = new Text(rowKey);
   }
 
+  public void setStopRow(String stopRow) {
+    this.stopRow = new Text(stopRow);
+  }
+  
   /**
    * @param version Set maximum versions for this selection
    */

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/Parser.java Tue Jan  8 10:27:58 2008
@@ -76,7 +76,7 @@
     case SELECT:
     case ENABLE:
     case DISABLE:
-    case 66:
+    case 67:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case HELP:
       case ALTER:
@@ -101,7 +101,7 @@
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(66);
+      jj_consume_token(67);
       break;
     case 0:
       jj_consume_token(0);
@@ -685,6 +685,7 @@
   SelectCommand select = new SelectCommand(this.out, this.formatter);
   List<String> columns = null;
   String rowKey = "";
+  String stopRow = "";
   String timestamp = null;
   int numVersion = 0;
   String tableName = null;
@@ -716,9 +717,19 @@
       }
       rowKey = getStringLiteral();
        select.setRowKey(rowKey);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case UNTIL:
+        jj_consume_token(UNTIL);
+        stopRow = getStringLiteral();
+      select.setStopRow(stopRow);
+        break;
+      default:
+        jj_la1[23] = jj_gen;
+        ;
+      }
       break;
     default:
-      jj_la1[23] = jj_gen;
+      jj_la1[24] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -728,7 +739,7 @@
        select.setTimestamp(timestamp);
       break;
     default:
-      jj_la1[24] = jj_gen;
+      jj_la1[25] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -739,7 +750,7 @@
         select.setVersion(numVersion);
       break;
     default:
-      jj_la1[25] = jj_gen;
+      jj_la1[26] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -754,7 +765,7 @@
       }
       break;
     default:
-      jj_la1[26] = jj_gen;
+      jj_la1[27] = jj_gen;
       ;
     }
     {if (true) return select;}
@@ -804,7 +815,7 @@
         ;
         break;
       default:
-        jj_la1[27] = jj_gen;
+        jj_la1[28] = jj_gen;
         break label_6;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -827,14 +838,14 @@
           jj_consume_token(QUOTED_IDENTIFIER);
           break;
         default:
-          jj_la1[28] = jj_gen;
+          jj_la1[29] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
        values.removeAll(values);
         break;
       default:
-        jj_la1[29] = jj_gen;
+        jj_la1[30] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -854,7 +865,7 @@
       s = jj_consume_token(QUOTED_IDENTIFIER);
       break;
     default:
-      jj_la1[30] = jj_gen;
+      jj_la1[31] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -880,7 +891,7 @@
         col = jj_consume_token(ASTERISK);
         break;
       default:
-        jj_la1[31] = jj_gen;
+        jj_la1[32] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -896,14 +907,14 @@
         col = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[33] = 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[33] = jj_gen;
+      jj_la1[34] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -923,7 +934,7 @@
         ;
         break;
       default:
-        jj_la1[34] = jj_gen;
+        jj_la1[35] = jj_gen;
         break label_7;
       }
       jj_consume_token(COMMA);
@@ -947,7 +958,7 @@
         ;
         break;
       default:
-        jj_la1[35] = jj_gen;
+        jj_la1[36] = jj_gen;
         break label_8;
       }
       jj_consume_token(COMMA);
@@ -974,7 +985,7 @@
         ;
         break;
       default:
-        jj_la1[36] = jj_gen;
+        jj_la1[37] = jj_gen;
         break label_9;
       }
       jj_consume_token(COMMA);
@@ -996,7 +1007,7 @@
       t = jj_consume_token(INTEGER_LITERAL);
       break;
     default:
-      jj_la1[37] = jj_gen;
+      jj_la1[38] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1025,14 +1036,14 @@
         t = jj_consume_token(STRING_LITERAL);
         break;
       default:
-        jj_la1[38] = jj_gen;
+        jj_la1[39] = 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[39] = jj_gen;
+      jj_la1[40] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1053,33 +1064,33 @@
     finally { jj_save(0, xla); }
   }
 
+  final private boolean jj_3R_11() {
+    if (jj_scan_token(ID)) return true;
+    return false;
+  }
+
   final private boolean jj_3_1() {
     if (jj_scan_token(ADD)) return true;
     if (jj_3R_10()) return true;
     return false;
   }
 
-  final private boolean jj_3R_12() {
+  final private boolean jj_3R_10() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(64)) {
+    if (jj_3R_11()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(65)) return true;
+    if (jj_3R_12()) return true;
     }
     return false;
   }
 
-  final private boolean jj_3R_11() {
-    if (jj_scan_token(ID)) return true;
-    return false;
-  }
-
-  final private boolean jj_3R_10() {
+  final private boolean jj_3R_12() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_11()) {
+    if (jj_scan_token(65)) {
     jj_scanpos = xsp;
-    if (jj_3R_12()) return true;
+    if (jj_scan_token(66)) return true;
     }
     return false;
   }
@@ -1093,7 +1104,7 @@
   public boolean lookingAhead = false;
   private boolean jj_semLA;
   private int jj_gen;
-  final private int[] jj_la1 = new int[40];
+  final private int[] jj_la1 = new int[41];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -1103,13 +1114,13 @@
       jj_la1_2();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0xf3ffe0,0xf3ffe1,0xf3ffe0,0x0,0x0,0x0,0x0,0x33dbc0,0x33dbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x40000000,0x0,0x2000000,0x3000000,0x3000000,0x40000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_0 = new int[] {0xf3ffe0,0xf3ffe1,0xf3ffe0,0x0,0x0,0x0,0x0,0x33dbc0,0x33dbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x80000000,0x0,0x2000000,0x3000000,0x8000000,0x3000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x10000000,0x70000000,0x70000000,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x8,0x8,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x10000008,0x10000000,0x10000008,0x0,0x30001000,0x0,0x30001000,0x8,0x8,0x8,0x30000000,0x0,0x10000000,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x20000000,0xe0000000,0xe0000000,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x731c000,0xe0000,0xe00000,0x731c000,0x10,0x10,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x2,0x20000010,0x20000000,0x20000010,0x0,0x60002000,0x0,0x60002000,0x10,0x10,0x10,0x60000000,0x0,0x20000000,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x0,0x4,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x3,0x3,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x3,0x3,};
+      jj_la1_2 = new int[] {0x0,0x8,0x0,0x0,0x0,0x0,0x6,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6,0x6,0x6,0x6,0x0,0x6,0x6,0x0,0x0,0x0,0x0,0x6,0x6,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -1124,7 +1135,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1137,7 +1148,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1147,7 +1158,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1157,7 +1168,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1166,7 +1177,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1175,7 +1186,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 41; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -1286,15 +1297,15 @@
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[67];
-    for (int i = 0; i < 67; i++) {
+    boolean[] la1tokens = new boolean[68];
+    for (int i = 0; i < 68; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 40; i++) {
+    for (int i = 0; i < 41; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -1309,7 +1320,7 @@
         }
       }
     }
-    for (int i = 0; i < 67; i++) {
+    for (int i = 0; i < 68; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserConstants.java Tue Jan  8 10:27:58 2008
@@ -26,45 +26,46 @@
   int STARTING = 24;
   int WHERE = 25;
   int FROM = 26;
-  int ROW = 27;
-  int VALUES = 28;
-  int COLUMNFAMILIES = 29;
-  int TIMESTAMP = 30;
-  int NUM_VERSIONS = 31;
-  int LIMIT = 32;
-  int AND = 33;
-  int OR = 34;
-  int COMMA = 35;
-  int LPAREN = 36;
-  int RPAREN = 37;
-  int EQUALS = 38;
-  int LCOMP = 39;
-  int RCOMP = 40;
-  int NOT = 41;
-  int IN = 42;
-  int NOTEQUAL = 43;
-  int ASTERISK = 44;
-  int MAX_VERSIONS = 45;
-  int MAX_LENGTH = 46;
-  int COMPRESSION = 47;
-  int NONE = 48;
-  int BLOCK = 49;
-  int RECORD = 50;
-  int IN_MEMORY = 51;
-  int BLOOMFILTER = 52;
-  int COUNTING_BLOOMFILTER = 53;
-  int RETOUCHED_BLOOMFILTER = 54;
-  int VECTOR_SIZE = 55;
-  int NUM_HASH = 56;
-  int NUM_ENTRIES = 57;
-  int ADD = 58;
-  int CHANGE = 59;
-  int ID = 60;
-  int INTEGER_LITERAL = 61;
-  int FLOATING_POINT_LITERAL = 62;
-  int EXPONENT = 63;
-  int QUOTED_IDENTIFIER = 64;
-  int STRING_LITERAL = 65;
+  int UNTIL = 27;
+  int ROW = 28;
+  int VALUES = 29;
+  int COLUMNFAMILIES = 30;
+  int TIMESTAMP = 31;
+  int NUM_VERSIONS = 32;
+  int LIMIT = 33;
+  int AND = 34;
+  int OR = 35;
+  int COMMA = 36;
+  int LPAREN = 37;
+  int RPAREN = 38;
+  int EQUALS = 39;
+  int LCOMP = 40;
+  int RCOMP = 41;
+  int NOT = 42;
+  int IN = 43;
+  int NOTEQUAL = 44;
+  int ASTERISK = 45;
+  int MAX_VERSIONS = 46;
+  int MAX_LENGTH = 47;
+  int COMPRESSION = 48;
+  int NONE = 49;
+  int BLOCK = 50;
+  int RECORD = 51;
+  int IN_MEMORY = 52;
+  int BLOOMFILTER = 53;
+  int COUNTING_BLOOMFILTER = 54;
+  int RETOUCHED_BLOOMFILTER = 55;
+  int VECTOR_SIZE = 56;
+  int NUM_HASH = 57;
+  int NUM_ENTRIES = 58;
+  int ADD = 59;
+  int CHANGE = 60;
+  int ID = 61;
+  int INTEGER_LITERAL = 62;
+  int FLOATING_POINT_LITERAL = 63;
+  int EXPONENT = 64;
+  int QUOTED_IDENTIFIER = 65;
+  int STRING_LITERAL = 66;
 
   int DEFAULT = 0;
 
@@ -96,6 +97,7 @@
     "\"starting\"",
     "\"where\"",
     "\"from\"",
+    "\"until\"",
     "\"row\"",
     "\"values\"",
     "\"columnfamilies\"",

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java?rev=610092&r1=610091&r2=610092&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java Tue Jan  8 10:27:58 2008
@@ -40,72 +40,72 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xfffe607ffffffe0L) != 0L)
+         if ((active0 & 0x1fffcc0fffffffe0L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             return 1;
          }
          return -1;
       case 1:
-         if ((active0 & 0xff7e203fff9bfe0L) != 0L)
+         if ((active0 & 0x10080800064000L) != 0L)
+            return 1;
+         if ((active0 & 0x1fefc407fff9bfe0L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 60;
+               jjmatchedKind = 61;
                jjmatchedPos = 1;
             }
             return 1;
          }
-         if ((active0 & 0x8040400064000L) != 0L)
-            return 1;
          return -1;
       case 2:
-         if ((active0 & 0xbffe001f7ff3fe0L) != 0L)
+         if ((active0 & 0x800040410008000L) != 0L)
+            return 1;
+         if ((active0 & 0x17ffc003efff3fe0L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 2;
             return 1;
          }
-         if ((active0 & 0x400020208008000L) != 0L)
-            return 1;
          return -1;
       case 3:
-         if ((active0 & 0xbfee001f3fa28c0L) != 0L)
+         if ((active0 & 0x2000004051720L) != 0L)
+            return 1;
+         if ((active0 & 0x17fdc003ebfa28c0L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 60;
+               jjmatchedKind = 61;
                jjmatchedPos = 3;
             }
             return 1;
          }
-         if ((active0 & 0x1000004051720L) != 0L)
-            return 1;
          return -1;
       case 4:
-         if ((active0 & 0xbfce000f1f22a00L) != 0L)
+         if ((active0 & 0x400020a0800c0L) != 0L)
+            return 1;
+         if ((active0 & 0x17f9c001e1f22a00L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 4;
             return 1;
          }
-         if ((active0 & 0x20001020800c0L) != 0L)
-            return 1;
          return -1;
       case 5:
-         if ((active0 & 0x3f8e000e1802200L) != 0L)
+         if ((active0 & 0x1008000020720800L) != 0L)
+            return 1;
+         if ((active0 & 0x7f1c001c1802200L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 5;
             return 1;
          }
-         if ((active0 & 0x804000010720800L) != 0L)
-            return 1;
          return -1;
       case 6:
-         if ((active0 & 0x3f8e000e1002200L) != 0L)
+         if ((active0 & 0x7f1c001c1002200L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 6;
             return 1;
          }
@@ -113,121 +113,121 @@
             return 1;
          return -1;
       case 7:
-         if ((active0 & 0x2f8e000e0000000L) != 0L)
+         if ((active0 & 0x5f1c001c0000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 7;
             return 1;
          }
-         if ((active0 & 0x100000001002200L) != 0L)
+         if ((active0 & 0x200000001002200L) != 0L)
             return 1;
          return -1;
       case 8:
-         if ((active0 & 0x8000040000000L) != 0L)
-            return 1;
-         if ((active0 & 0x2f0e000a0000000L) != 0L)
+         if ((active0 & 0x5e1c00140000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 8;
             return 1;
          }
+         if ((active0 & 0x10000080000000L) != 0L)
+            return 1;
          return -1;
       case 9:
-         if ((active0 & 0x400000000000L) != 0L)
-            return 1;
-         if ((active0 & 0x2f0a000a0000000L) != 0L)
+         if ((active0 & 0x5e1400140000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 9;
             return 1;
          }
+         if ((active0 & 0x800000000000L) != 0L)
+            return 1;
          return -1;
       case 10:
-         if ((active0 & 0x290800000000000L) != 0L)
+         if ((active0 & 0x521000000000000L) != 0L)
             return 1;
-         if ((active0 & 0x602000a0000000L) != 0L)
+         if ((active0 & 0xc0400140000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 10;
             return 1;
          }
          return -1;
       case 11:
-         if ((active0 & 0x200080000000L) != 0L)
+         if ((active0 & 0x400100000000L) != 0L)
             return 1;
-         if ((active0 & 0x60000020000000L) != 0L)
+         if ((active0 & 0xc0000040000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 11;
             return 1;
          }
          return -1;
       case 12:
-         if ((active0 & 0x60000020000000L) != 0L)
+         if ((active0 & 0xc0000040000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 12;
             return 1;
          }
          return -1;
       case 13:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
+            return 1;
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 13;
             return 1;
          }
-         if ((active0 & 0x20000000L) != 0L)
-            return 1;
          return -1;
       case 14:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 14;
             return 1;
          }
          return -1;
       case 15:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 15;
             return 1;
          }
          return -1;
       case 16:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 16;
             return 1;
          }
          return -1;
       case 17:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 17;
             return 1;
          }
          return -1;
       case 18:
-         if ((active0 & 0x60000000000000L) != 0L)
+         if ((active0 & 0xc0000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 18;
             return 1;
          }
          return -1;
       case 19:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 19;
             return 1;
          }
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
             return 1;
          return -1;
       default :
@@ -257,32 +257,32 @@
    switch(curChar)
    {
       case 33:
-         return jjMoveStringLiteralDfa1_0(0x80000000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000L);
       case 40:
-         return jjStopAtPos(0, 36);
-      case 41:
          return jjStopAtPos(0, 37);
+      case 41:
+         return jjStopAtPos(0, 38);
       case 42:
-         return jjStopAtPos(0, 44);
+         return jjStopAtPos(0, 45);
       case 44:
-         return jjStopAtPos(0, 35);
+         return jjStopAtPos(0, 36);
       case 59:
-         return jjStopAtPos(0, 66);
+         return jjStopAtPos(0, 67);
       case 60:
-         return jjStopAtPos(0, 40);
+         return jjStopAtPos(0, 41);
       case 61:
-         return jjStopAtPos(0, 38);
-      case 62:
          return jjStopAtPos(0, 39);
+      case 62:
+         return jjStopAtPos(0, 40);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x400000200000040L);
+         return jjMoveStringLiteralDfa1_0(0x800000400000040L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x12000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x24000000000000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x820800020000880L);
+         return jjMoveStringLiteralDfa1_0(0x1041000040000880L);
       case 68:
       case 100:
          return jjMoveStringLiteralDfa1_0(0x901600L);
@@ -297,34 +297,37 @@
          return jjMoveStringLiteralDfa1_0(0x20L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x8040000060000L);
+         return jjMoveStringLiteralDfa1_0(0x10080000060000L);
       case 74:
       case 106:
          return jjMoveStringLiteralDfa1_0(0x8000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x100000000L);
+         return jjMoveStringLiteralDfa1_0(0x200000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x600000000000L);
+         return jjMoveStringLiteralDfa1_0(0xc00000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x301020080000000L);
+         return jjMoveStringLiteralDfa1_0(0x602040100000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x400000000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x44000008000000L);
+         return jjMoveStringLiteralDfa1_0(0x88000010000000L);
       case 83:
       case 115:
          return jjMoveStringLiteralDfa1_0(0x1200100L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x40082000L);
+         return jjMoveStringLiteralDfa1_0(0x80082000L);
+      case 85:
+      case 117:
+         return jjMoveStringLiteralDfa1_0(0x8000000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x80000010000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000020000000L);
       case 87:
       case 119:
          return jjMoveStringLiteralDfa1_0(0x2000000L);
@@ -342,42 +345,42 @@
    switch(curChar)
    {
       case 61:
-         if ((active0 & 0x80000000000L) != 0L)
-            return jjStopAtPos(1, 43);
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStopAtPos(1, 44);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x600010088000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc00020088000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc4000000300620L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x188000000300620L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000002000100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000100L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x140800000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x280800000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x120000000000c0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x240000000000c0L);
       case 78:
       case 110:
-         if ((active0 & 0x40000000000L) != 0L)
+         if ((active0 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 43;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000200460000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000408460000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x21820028000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x43040050000000L);
       case 82:
       case 114:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 34, 1);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 35, 1);
          return jjMoveStringLiteralDfa2_0(active0, 0x4003800L);
       case 83:
       case 115:
@@ -389,7 +392,7 @@
          return jjMoveStringLiteralDfa2_0(active0, 0x1000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x300000080000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x600000100000000L);
       case 88:
       case 120:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
@@ -410,22 +413,22 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000001400000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000001400000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa3_0(active0, 0x80000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x84000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x108000000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 33, 1);
-         else if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 58, 1);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 34, 1);
+         else if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 59, 1);
          break;
       case 69:
       case 101:
@@ -435,16 +438,16 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x30300020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x60300020L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x3008001c0000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x601000380000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x12000004001100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x24000004001100L);
       case 82:
       case 114:
          if ((active0 & 0x8000L) != 0L)
@@ -455,20 +458,20 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x820600L);
       case 84:
       case 116:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 41, 1);
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000040040L);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 42, 1);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000008040040L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000002000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000002000L);
       case 87:
       case 119:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 27, 1);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 28, 1);
          break;
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa3_0(active0, 0x600000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc00000000000L);
       default :
          break;
    }
@@ -486,7 +489,7 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa4_0(active0, 0x300600080000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x600c00100000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x800880L);
@@ -500,15 +503,15 @@
             jjmatchedKind = 10;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000200L);
       case 69:
       case 101:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 48, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x40320040L);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 49, 1);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80320040L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x208000000L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
@@ -516,22 +519,22 @@
       case 109:
          if ((active0 & 0x4000000L) != 0L)
             return jjStartNfaWithStates_0(3, 26, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x820000000002000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1040000000002000L);
       case 79:
       case 111:
          if ((active0 & 0x40000L) != 0L)
             return jjStartNfaWithStates_0(3, 18, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x54000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xa8000000000000L);
       case 80:
       case 112:
          if ((active0 & 0x20L) != 0L)
             return jjStartNfaWithStates_0(3, 5, 1);
          else if ((active0 & 0x1000L) != 0L)
             return jjStartNfaWithStates_0(3, 12, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L);
       case 82:
       case 114:
          return jjMoveStringLiteralDfa4_0(active0, 0x3000000L);
@@ -539,10 +542,10 @@
       case 116:
          if ((active0 & 0x10000L) != 0L)
             return jjStartNfaWithStates_0(3, 16, 1);
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x30000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x60000000L);
       case 87:
       case 119:
          if ((active0 & 0x100L) != 0L)
@@ -576,48 +579,50 @@
             return jjStartNfaWithStates_0(4, 19, 1);
          else if ((active0 & 0x2000000L) != 0L)
             return jjStartNfaWithStates_0(4, 25, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x208000010000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x410000020000000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L);
       case 75:
       case 107:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 49, 1);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 50, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x400000400000L);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 27, 1);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000400000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000020000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000040000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
       case 82:
       case 114:
          if ((active0 & 0x40L) != 0L)
             return jjStartNfaWithStates_0(4, 6, 1);
          else if ((active0 & 0x80L) != 0L)
             return jjStartNfaWithStates_0(4, 7, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x4800000020200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x9000000020200L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000000L);
       case 84:
       case 116:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 32, 1);
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000001100800L);
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 33, 1);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000001100800L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa5_0(active0, 0x200080000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400100000000L);
       default :
          break;
    }
@@ -636,14 +641,14 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x100000000002000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000000002000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
       case 68:
       case 100:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 50, 1);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 51, 1);
          break;
       case 69:
       case 101:
@@ -653,31 +658,31 @@
             return jjStartNfaWithStates_0(5, 20, 1);
          else if ((active0 & 0x400000L) != 0L)
             return jjStartNfaWithStates_0(5, 22, 1);
-         else if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 59, 1);
-         return jjMoveStringLiteralDfa6_0(active0, 0xe00080000000L);
+         else if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 60, 1);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1c00100000000L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000001000200L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000001000200L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000020000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000040000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 28, 1);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 29, 1);
          break;
       case 84:
       case 116:
@@ -685,7 +690,7 @@
             return jjStartNfaWithStates_0(5, 17, 1);
          else if ((active0 & 0x200000L) != 0L)
             return jjStartNfaWithStates_0(5, 21, 1);
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000L);
       default :
          break;
    }
@@ -703,10 +708,10 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa7_0(active0, 0x200L);
@@ -717,28 +722,28 @@
          break;
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20400001000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40800001000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200080000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x400100000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100800000000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x201000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200000000002000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x400000000002000L);
       default :
          break;
    }
@@ -757,36 +762,36 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000L);
       case 69:
       case 101:
          if ((active0 & 0x200L) != 0L)
             return jjStartNfaWithStates_0(7, 9, 1);
          else if ((active0 & 0x2000L) != 0L)
             return jjStartNfaWithStates_0(7, 13, 1);
-         return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L);
       case 71:
       case 103:
          if ((active0 & 0x1000000L) != 0L)
             return jjStartNfaWithStates_0(7, 24, 1);
-         return jjMoveStringLiteralDfa8_0(active0, 0x20400000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40800000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 56, 1);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 57, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa8_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa8_0(active0, 0x208000000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x410000000000000L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa8_0(active0, 0x80a00080000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x101400100000000L);
       default :
          break;
    }
@@ -804,28 +809,28 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa9_0(active0, 0x280a00080000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x501400100000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x40000000L);
       case 80:
       case 112:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 30, 1);
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 31, 1);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa9_0(active0, 0x10400000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20800000000000L);
       case 89:
       case 121:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(8, 51, 1);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 52, 1);
          break;
       default :
          break;
@@ -844,27 +849,27 @@
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa10_0(active0, 0x210000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x420000000000000L);
       case 72:
       case 104:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(9, 46, 1);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 47, 1);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa10_0(active0, 0xa00080000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x1400100000000L);
       case 90:
       case 122:
-         return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x100000000000000L);
       default :
          break;
    }
@@ -883,29 +888,29 @@
    {
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x80000000000000L);
       case 69:
       case 101:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 55, 1);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 56, 1);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa11_0(active0, 0x20000020000000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x40000040000000L);
       case 78:
       case 110:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 47, 1);
-         return jjMoveStringLiteralDfa11_0(active0, 0x200080000000L);
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 48, 1);
+         return jjMoveStringLiteralDfa11_0(active0, 0x400100000000L);
       case 82:
       case 114:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 52, 1);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 53, 1);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_0(10, 57, 1);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(10, 58, 1);
          break;
       default :
          break;
@@ -925,19 +930,19 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x40000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x80000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_0(11, 31, 1);
-         else if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_0(11, 45, 1);
+         if ((active0 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 32, 1);
+         else if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 46, 1);
          break;
       default :
          break;
@@ -957,10 +962,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa13_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x40000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa13_0(active0, 0x60000000000000L);
+         return jjMoveStringLiteralDfa13_0(active0, 0xc0000000000000L);
       default :
          break;
    }
@@ -979,14 +984,14 @@
    {
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x80000000000000L);
       case 83:
       case 115:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_0(13, 29, 1);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_0(13, 30, 1);
          break;
       default :
          break;
@@ -1006,10 +1011,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x80000000000000L);
       default :
          break;
    }
@@ -1028,10 +1033,10 @@
    {
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x80000000000000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -1050,10 +1055,10 @@
    {
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x80000000000000L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa17_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -1072,10 +1077,10 @@
    {
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x80000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L);
       default :
          break;
    }
@@ -1094,10 +1099,10 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa19_0(active0, 0x20000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa19_0(active0, 0x80000000000000L);
       default :
          break;
    }
@@ -1116,11 +1121,11 @@
    {
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa20_0(active0, 0x40000000000000L);
+         return jjMoveStringLiteralDfa20_0(active0, 0x80000000000000L);
       case 82:
       case 114:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_0(19, 53, 1);
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(19, 54, 1);
          break;
       default :
          break;
@@ -1140,8 +1145,8 @@
    {
       case 82:
       case 114:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_0(20, 54, 1);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(20, 55, 1);
          break;
       default :
          break;
@@ -1203,14 +1208,14 @@
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 61)
-                        kind = 61;
+                     if (kind > 62)
+                        kind = 62;
                      jjCheckNAddStates(0, 6);
                   }
                   else if ((0x400e00000000000L & l) != 0L)
                   {
-                     if (kind > 60)
-                        kind = 60;
+                     if (kind > 61)
+                        kind = 61;
                      jjCheckNAdd(1);
                   }
                   else if (curChar == 39)
@@ -1223,8 +1228,8 @@
                case 1:
                   if ((0x7ffe00000000000L & l) == 0L)
                      break;
-                  if (kind > 60)
-                     kind = 60;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(1);
                   break;
                case 2:
@@ -1234,8 +1239,8 @@
                case 3:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
@@ -1245,8 +1250,8 @@
                case 6:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAdd(6);
                   break;
                case 7:
@@ -1258,8 +1263,8 @@
                      jjCheckNAddTwoStates(8, 9);
                   break;
                case 9:
-                  if (curChar == 34 && kind > 64)
-                     kind = 64;
+                  if (curChar == 34 && kind > 65)
+                     kind = 65;
                   break;
                case 10:
                   if (curChar == 39)
@@ -1282,21 +1287,21 @@
                      jjCheckNAddStates(10, 12);
                   break;
                case 15:
-                  if (curChar == 39 && kind > 65)
-                     kind = 65;
+                  if (curChar == 39 && kind > 66)
+                     kind = 66;
                   break;
                case 16:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAddStates(0, 6);
                   break;
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 61)
-                     kind = 61;
+                  if (kind > 62)
+                     kind = 62;
                   jjCheckNAdd(17);
                   break;
                case 18:
@@ -1310,8 +1315,8 @@
                case 20:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAddTwoStates(20, 21);
                   break;
                case 22:
@@ -1321,8 +1326,8 @@
                case 23:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAdd(23);
                   break;
                case 24:
@@ -1336,15 +1341,15 @@
                case 27:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAdd(27);
                   break;
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAddTwoStates(28, 29);
                   break;
                case 30:
@@ -1354,8 +1359,8 @@
                case 31:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 63)
+                     kind = 63;
                   jjCheckNAdd(31);
                   break;
                default : break;
@@ -1373,8 +1378,8 @@
                case 1:
                   if ((0x47fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 60)
-                     kind = 60;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(1);
                   break;
                case 4:
@@ -1450,14 +1455,15 @@
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, "\54", "\50", "\51", "\75", "\76", 
-"\74", null, null, "\41\75", "\52", null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, "\73", };
+null, null, null, null, null, null, null, null, null, "\54", "\50", "\51", "\75", 
+"\76", "\74", null, null, "\41\75", "\52", null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+"\73", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
 };
 static final long[] jjtoToken = {
-   0x7fffffffffffffe1L, 0x7L, 
+   0xffffffffffffffe1L, 0xeL, 
 };
 static final long[] jjtoSkip = {
    0x1eL, 0x0L, 



Mime
View raw message