Author: stack
Date: Sat Aug 18 09:29:09 2007
New Revision: 567292
URL: http://svn.apache.org/viewvc?view=rev&rev=567292
Log:
HADOOP-1729 Recent renaming or META tables breaks hbase shell
M src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
Add '.' to list of ID characters.
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/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?view=diff&rev=567292&r1=567291&r2=567292
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Sat Aug 18 09:29:09 2007
@@ -3,6 +3,20 @@
Trunk (unreleased changes)
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+ HADOOP-1729 Recent renaming or META tables breaks hbase shell
+
+ IMPROVEMENTS
+
+
+Below are the list of changes before 2007-08-18
+
1. HADOOP-1384. HBase omnibus patch. (jimk, Vuk Ercegovac, and Michael Stack)
2. HADOOP-1402. Fix javadoc warnings in hbase contrib. (Michael Stack)
3. HADOOP-1404. HBase command-line shutdown failing (Michael 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?view=diff&rev=567292&r1=567291&r2=567292
==============================================================================
---
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
Sat Aug 18 09:29:09 2007
@@ -92,7 +92,7 @@
TOKEN :
{
- <ID: ["a"-"z","A"-"Z","_","-"] ( ["a"-"z","A"-"Z","_","0"-"9","-"] )* >
+ <ID: ["a"-"z","A"-"Z","_","-","."] ( ["a"-"z","A"-"Z","_","0"-"9","-","."]
)* >
| <NUM: ( ["0"-"9"] )+ >
| <STRING: (["A"-"Z","a"-"z","0"-"9"])+ >
| <QUOTED_STRING: "\"" (~["\""])+ "\"" >
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?view=diff&rev=567292&r1=567291&r2=567292
==============================================================================
---
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
Sat Aug 18 09:29:09 2007
@@ -41,7 +41,7 @@
jjmatchedKind = 31;
return 13;
}
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x42000000L) != 0L)
return 1;
return -1;
case 1:
@@ -190,7 +190,7 @@
case 45:
return jjStartNfaWithStates_0(0, 30, 1);
case 46:
- return jjStopAtPos(0, 25);
+ return jjStartNfaWithStates_0(0, 25, 1);
case 59:
return jjStopAtPos(0, 36);
case 60:
@@ -688,16 +688,16 @@
kind = 33;
jjCheckNAdd(3);
}
- else if (curChar == 39)
- jjCheckNAddStates(0, 2);
- else if (curChar == 34)
- jjCheckNAdd(5);
- else if (curChar == 45)
+ else if ((0x600000000000L & l) != 0L)
{
if (kind > 31)
kind = 31;
jjCheckNAdd(1);
}
+ else if (curChar == 39)
+ jjCheckNAddStates(0, 2);
+ else if (curChar == 34)
+ jjCheckNAdd(5);
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 32)
@@ -706,7 +706,7 @@
}
break;
case 13:
- if ((0x3ff200000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
{
if (kind > 31)
kind = 31;
@@ -720,7 +720,7 @@
}
break;
case 1:
- if ((0x3ff200000000000L & l) == 0L)
+ if ((0x3ff600000000000L & l) == 0L)
break;
if (kind > 31)
kind = 31;
