Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.



git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@567292 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2007-08-18 16:29:09 +00:00
parent b7f01dce98
commit 17cc1759fc
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGES.txt
View File

@ -3,6 +3,20 @@ HBase Change Log
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)

2
src/java/org/apache/hadoop/hbase/shell/HBaseShell.jj
View File

@ -92,7 +92,7 @@ TOKEN:
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: "\"" (~["\""])+ "\"" >

18
src/java/org/apache/hadoop/hbase/shell/generated/ParserTokenManager.java
View File

@ -41,7 +41,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0)
jjmatchedKind = 31;
return 13;
}
if ((active0 & 0x40000000L) != 0L)
if ((active0 & 0x42000000L) != 0L)
return 1;
return -1;
case 1:
@ -190,7 +190,7 @@ private final int jjMoveStringLiteralDfa0_0()
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 @@ private final int jjMoveNfa_0(int startState, int curPos)
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 @@ private final int jjMoveNfa_0(int startState, int curPos)
}
break;
case 13:
if ((0x3ff200000000000L & l) != 0L)
if ((0x3ff600000000000L & l) != 0L)
{
if (kind > 31)
kind = 31;
@ -720,7 +720,7 @@ private final int jjMoveNfa_0(int startState, int curPos)
}
break;
case 1:
if ((0x3ff200000000000L & l) == 0L)
if ((0x3ff600000000000L & l) == 0L)
break;
if (kind > 31)
kind = 31;