You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2007/11/30 18:15:40 UTC
svn commit: r599878 - in /lucene/hadoop/trunk/src/contrib/hbase: ./
src/java/org/apache/hadoop/hbase/shell/
src/java/org/apache/hadoop/hbase/shell/algebra/generated/
src/java/org/apache/hadoop/hbase/shell/generated/
Author: stack
Date: Fri Nov 30 09:15:33 2007
New Revision: 599878
URL: http://svn.apache.org/viewvc?rev=599878&view=rev
Log:
HADOOP-2304 Abbreviated symbol parsing error of dir path in jar command
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/algebra/generated/ExpressionParserTokenManager.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/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=599878&r1=599877&r2=599878&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Fri Nov 30 09:15:33 2007
@@ -42,6 +42,8 @@
HADOOP-2295 Fix assigning a region to multiple servers
HADOOP-2234 TableInputFormat erroneously aggregates map values
HADOOP-2308 null regioninfo breaks meta scanner
+ HADOOP-2304 Abbreviated symbol parsing error of dir path in jar command
+ (Edward Yoon via Stack)
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable
@@ -68,6 +70,7 @@
HADOOP-2198 HTable should have method to return table metadata
HADOOP-2296 hbase shell: phantom columns show up from select command
HADOOP-2297 System.exit() Handling in hbase shell jar command
+ (Edward Yoon via Stack)
Release 0.15.1
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=599878&r1=599877&r2=599878&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 Fri Nov 30 09:15:33 2007
@@ -137,7 +137,7 @@
TOKEN : /** Literals */
{
- <ID: ["A"-"Z","a"-"z","_","-",":","/"] (["A"-"Z","a"-"z","0"-"9","_","-",":","/"])* >
+ <ID: ["A"-"Z","a"-"z","_","-",":","/","~"] (["A"-"Z","a"-"z","0"-"9","_","-",":","/","~"])* >
| <INTEGER_LITERAL: (["0"-"9"])+ >
| <FLOATING_POINT_LITERAL:
(["0"-"9"])+ "." (["0"-"9"])+ (<EXPONENT>)?
@@ -228,11 +228,19 @@
Token t = null;
JarCommand jar = new JarCommand(this.out);
List<String> query = new ArrayList<String>();
+ String path = "";
}
{
<JAR>
(
- ( t = <ID> | t = <INTEGER_LITERAL> )
+ ( t=<ID> | t=<INTEGER_LITERAL> | t=<DOT> | t=<FLOATING_POINT_LITERAL> )
+ { path += t.image.toString(); }
+ )*
+ t=<JAR>
+ { query.add(path + t.image.toString()); }
+
+ (
+ ( t=<ID> | t=<INTEGER_LITERAL> | t=<FLOATING_POINT_LITERAL> )
{ query.add(t.image.toString()); }
)*
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/algebra/generated/ExpressionParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/algebra/generated/ExpressionParserTokenManager.java?rev=599878&r1=599877&r2=599878&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/algebra/generated/ExpressionParserTokenManager.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/algebra/generated/ExpressionParserTokenManager.java Fri Nov 30 09:15:33 2007
@@ -30,7 +30,6 @@
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTable;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
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=599878&r1=599877&r2=599878&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 Fri Nov 30 09:15:33 2007
@@ -215,12 +215,15 @@
Token t = null;
JarCommand jar = new JarCommand(this.out);
List<String> query = new ArrayList<String>();
+ String path = "";
jj_consume_token(JAR);
label_2:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOT:
case ID:
case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
;
break;
default:
@@ -234,11 +237,48 @@
case INTEGER_LITERAL:
t = jj_consume_token(INTEGER_LITERAL);
break;
+ case DOT:
+ t = jj_consume_token(DOT);
+ break;
+ case FLOATING_POINT_LITERAL:
+ t = jj_consume_token(FLOATING_POINT_LITERAL);
+ break;
default:
jj_la1[5] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
+ path += t.image.toString();
+ }
+ t = jj_consume_token(JAR);
+ query.add(path + t.image.toString());
+ label_3:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ID:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ ;
+ break;
+ default:
+ jj_la1[6] = jj_gen;
+ break label_3;
+ }
+ 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;
+ case FLOATING_POINT_LITERAL:
+ t = jj_consume_token(FLOATING_POINT_LITERAL);
+ break;
+ default:
+ jj_la1[7] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
query.add(t.image.toString());
}
jar.setQuery(query);
@@ -314,14 +354,14 @@
t = jj_consume_token(ID);
break;
default:
- jj_la1[6] = jj_gen;
+ jj_la1[8] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
argument = t.image.toString();
break;
default:
- jj_la1[7] = jj_gen;
+ jj_la1[9] = jj_gen;
;
}
help.setArgument(argument);
@@ -340,7 +380,7 @@
argument = identifier();
break;
default:
- jj_la1[8] = jj_gen;
+ jj_la1[10] = jj_gen;
;
}
show.setArgument(argument);
@@ -359,7 +399,7 @@
jj_consume_token(DESC);
break;
default:
- jj_la1[9] = jj_gen;
+ jj_la1[11] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -373,7 +413,7 @@
Map<String, Object> columnSpec = new HashMap<String, Object>();
int n = -1;
Token t = null;
- label_3:
+ label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case MAX_VERSIONS:
@@ -387,8 +427,8 @@
;
break;
default:
- jj_la1[10] = jj_gen;
- break label_3;
+ jj_la1[12] = jj_gen;
+ break label_4;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case MAX_VERSIONS:
@@ -417,7 +457,7 @@
t = jj_consume_token(RECORD);
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -441,7 +481,7 @@
t = jj_consume_token(RETOUCHED_BLOOMFILTER);
break;
default:
- jj_la1[12] = jj_gen;
+ jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -466,7 +506,7 @@
columnSpec.put("NUM_ENTRIES", n);
break;
default:
- jj_la1[13] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -488,15 +528,15 @@
column = identifier();
columnSpec = ColumnSpec();
createCommand.addColumnSpec(column, columnSpec);
- label_4:
+ label_5:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[14] = jj_gen;
- break label_4;
+ jj_la1[16] = jj_gen;
+ break label_5;
}
jj_consume_token(COMMA);
column = identifier();
@@ -532,15 +572,15 @@
column = identifier();
columnSpec = ColumnSpec();
alterCommand.addColumnSpec(column, columnSpec);
- label_5:
+ label_6:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[15] = jj_gen;
- break label_5;
+ jj_la1[17] = jj_gen;
+ break label_6;
}
jj_consume_token(COMMA);
column = identifier();
@@ -563,7 +603,7 @@
alterCommand.addColumnSpec(column, columnSpec);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[18] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -609,7 +649,7 @@
t = jj_consume_token(QUOTED_IDENTIFIER);
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[19] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -640,7 +680,7 @@
t = jj_consume_token(QUOTED_IDENTIFIER);
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[20] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -678,7 +718,7 @@
jj_consume_token(FROM);
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[21] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -686,7 +726,7 @@
select.setRowKey(rowKey);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[22] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -696,7 +736,7 @@
select.setTimestamp(timestamp);
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[23] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -707,7 +747,7 @@
select.setVersion(numVersion);
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[24] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -722,7 +762,7 @@
}
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[25] = jj_gen;
;
}
{if (true) return select;}
@@ -803,7 +843,7 @@
}
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[26] = jj_gen;
;
}
break;
@@ -829,7 +869,7 @@
substitute.setCondition(condition);
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[27] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -860,7 +900,7 @@
jj_consume_token(LPAREN);
literal = getStringLiteral();
if(literal != null) values.add(literal);
- label_6:
+ label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -870,8 +910,8 @@
;
break;
default:
- jj_la1[26] = jj_gen;
- break label_6;
+ jj_la1[28] = jj_gen;
+ break label_7;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -893,14 +933,14 @@
jj_consume_token(QUOTED_IDENTIFIER);
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[29] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
values.removeAll(values);
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[30] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -920,7 +960,7 @@
s = jj_consume_token(QUOTED_IDENTIFIER);
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[31] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -946,7 +986,7 @@
col = jj_consume_token(ASTERISK);
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -962,14 +1002,14 @@
col = jj_consume_token(STRING_LITERAL);
break;
default:
- jj_la1[31] = 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[32] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -982,15 +1022,15 @@
jj_consume_token(LPAREN);
literal = getColumn();
if(literal != null) values.add(literal);
- label_7:
+ label_8:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[33] = jj_gen;
- break label_7;
+ jj_la1[35] = jj_gen;
+ break label_8;
}
jj_consume_token(COMMA);
literal = getColumn();
@@ -1006,15 +1046,15 @@
String table = null;
table = identifier();
tableList.add(table);
- label_8:
+ label_9:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[34] = jj_gen;
- break label_8;
+ jj_la1[36] = jj_gen;
+ break label_9;
}
jj_consume_token(COMMA);
table = identifier();
@@ -1033,15 +1073,15 @@
} else {
{if (true) return columnList;}
}
- label_9:
+ label_10:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[35] = jj_gen;
- break label_9;
+ jj_la1[37] = jj_gen;
+ break label_10;
}
jj_consume_token(COMMA);
column = getColumn();
@@ -1075,14 +1115,14 @@
t = jj_consume_token(STRING_LITERAL);
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[38] = 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[37] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1099,7 +1139,7 @@
joinTerm = query;
query = "";
}
- label_10:
+ label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AND:
@@ -1107,8 +1147,8 @@
;
break;
default:
- jj_la1[38] = jj_gen;
- break label_10;
+ jj_la1[40] = jj_gen;
+ break label_11;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AND:
@@ -1120,7 +1160,7 @@
connector = " OR ";
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[41] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1164,13 +1204,13 @@
searchName += ".ROW";
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[43] = jj_gen;
;
}
comparator = getComparator();
@@ -1200,13 +1240,13 @@
comparand += "." + joinColumn.image.toString();
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[44] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[45] = jj_gen;
;
}
break;
@@ -1226,7 +1266,7 @@
}
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1255,7 +1295,7 @@
comparator += "=";
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
break;
@@ -1268,7 +1308,7 @@
comparator += "=";
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[48] = jj_gen;
;
}
break;
@@ -1281,7 +1321,7 @@
comparator = ">" + comparator;
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[49] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1290,7 +1330,7 @@
comparator = "<" + comparator;
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[50] = jj_gen;
;
}
break;
@@ -1308,7 +1348,7 @@
comparator = "==";
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[51] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1330,23 +1370,28 @@
finally { jj_save(0, xla); }
}
+ final private boolean jj_3R_13() {
+ 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_11()) return true;
+ if (jj_3R_12()) return true;
return false;
}
- final private boolean jj_3R_11() {
+ final private boolean jj_3R_12() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_12()) {
+ if (jj_3R_13()) {
jj_scanpos = xsp;
- if (jj_3R_13()) return true;
+ if (jj_3R_14()) return true;
}
return false;
}
- final private boolean jj_3R_13() {
+ final private boolean jj_3R_14() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(67)) {
@@ -1356,11 +1401,6 @@
return false;
}
- final private boolean jj_3R_12() {
- if (jj_scan_token(ID)) return true;
- return false;
- }
-
public ParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
@@ -1370,7 +1410,7 @@
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
- final private int[] jj_la1 = new int[50];
+ final private int[] jj_la1 = new int[52];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -1380,13 +1420,13 @@
jj_la1_2();
}
private static void jj_la1_0() {
- 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,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_0 = new int[] {0x79ffe0,0x79ffe1,0x79ffe0,0x0,0x0,0x0,0x0,0x0,0x19fbc0,0x19fbc0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1800000,0x1800000,0x20000000,0x40000000,0x80000000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x90000000,0x90000000,0x90000000,0x80000000,0x80000000,0x80000000,0xb0000000,0xb0000000,0x80000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x4,0x4,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0xa0000000,0x80000004,0x80000000,0x80000004,0x0,0x80001000,0x0,0x80001000,0x4,0x4,0x4,0x0,0x80000000,0x3,0x3,0x80000000,0x8,0x80000000,0x8,0x80000010,0x40,0x40,0x80,0x100,0xfc0,};
+ jj_la1_1 = new int[] {0x90000000,0x90000000,0x90000000,0x80000000,0x80000008,0x80000008,0x80000000,0x80000000,0xb0000000,0xb0000000,0x80000000,0x0,0x398e000,0x70000,0x700000,0x398e000,0x4,0x4,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0xa0000000,0x80000004,0x80000000,0x80000004,0x0,0x80001000,0x0,0x80001000,0x4,0x4,0x4,0x0,0x80000000,0x3,0x3,0x80000000,0x8,0x80000000,0x8,0x80000010,0x40,0x40,0x80,0x100,0xfc0,};
}
private static void jj_la1_2() {
- jj_la1_2 = new int[] {0x0,0x20,0x0,0x0,0x1,0x1,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x18,0x18,0x1,0x18,0x19,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_2 = new int[] {0x0,0x20,0x0,0x0,0x3,0x3,0x3,0x3,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x18,0x18,0x18,0x1,0x18,0x19,0x0,0x0,0x0,0x18,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x0,0x0,0x0,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
@@ -1401,7 +1441,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1414,7 +1454,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1424,7 +1464,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1434,7 +1474,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1443,7 +1483,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1452,7 +1492,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 50; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 52; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1571,7 +1611,7 @@
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 52; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
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=599878&r1=599877&r2=599878&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 Fri Nov 30 09:15:33 2007
@@ -1391,7 +1391,7 @@
{
case 0:
case 1:
- if ((0x7fffffe87fffffeL & l) == 0L)
+ if ((0x47fffffe87fffffeL & l) == 0L)
break;
if (kind > 63)
kind = 63;