Author: jimk
Date: Mon Feb 4 18:36:26 2008
New Revision: 618518
URL: http://svn.apache.org/viewvc?rev=618518&view=rev
Log:
2008/02/04 HBase is now a subproject of Hadoop. The first HBase release as a
subproject will be release 0.1.0 which will be equivalent to the version of
HBase included in Hadoop 0.16.0. In order to accomplish this, the HBase portion
of HBASE-288 (formerly HADOOP-1398) has been backed out. Once 0.1.0 is frozen
(depending mostly on changes to infrastructure due to becoming a sub project
instead of a contrib project), this patch will re-appear on HBase trunk.
Removed:
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/TestBlockFSInputStream.java
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/HQLParser.jj
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParser.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserConstants.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserTokenManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Feb 4 18:36:26 2008
@@ -28,6 +28,15 @@
Release 0.16.0
+ 2008/02/04 HBase is now a subproject of Hadoop. The first HBase release as
+ a subproject will be release 0.1.0 which will be equivalent to
+ the version of HBase included in Hadoop 0.16.0. In order to
+ accomplish this, the HBase portion of HBASE-288 (formerly
+ HADOOP-1398) has been backed out. Once 0.1.0 is frozen
(depending
+ mostly on changes to infrastructure due to becoming a sub
project
+ instead of a contrib project), this patch will re-appear on
HBase
+ trunk.
+
INCOMPATIBLE CHANGES
HADOOP-2056 A table with row keys containing colon fails to split regions
HADOOP-2079 Fix generated HLog, HRegion names
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/HQLParser.jj
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/HQLParser.jj?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/HQLParser.jj
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/HQLParser.jj Mon
Feb 4 18:36:26 2008
@@ -118,7 +118,6 @@
| <BLOCK: "block">
| <RECORD: "record">
| <IN_MEMORY: "in_memory">
- | <BLOCK_CACHE_ENABLED: "block_cache_enabled">
| <BLOOMFILTER: "bloomfilter">
| <COUNTING_BLOOMFILTER: "counting_bloomfilter">
| <RETOUCHED_BLOOMFILTER: "retouched_bloomfilter">
@@ -353,11 +352,6 @@
<IN_MEMORY>
{
columnSpec.put("IN_MEMORY", true);
- }
- |
- <BLOCK_CACHE_ENABLED>
- {
- columnSpec.put("BLOCK_CACHE_ENABLED", true);
}
|
<BLOOMFILTER>
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParser.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParser.java?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParser.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParser.java
Mon Feb 4 18:36:26 2008
@@ -75,7 +75,7 @@
case SELECT:
case ENABLE:
case DISABLE:
- case 69:
+ case 68:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case HELP:
case ALTER:
@@ -100,7 +100,7 @@
jj_la1[0] = jj_gen;
;
}
- jj_consume_token(69);
+ jj_consume_token(68);
break;
case 0:
jj_consume_token(0);
@@ -390,7 +390,6 @@
case MAX_LENGTH:
case COMPRESSION:
case IN_MEMORY:
- case BLOCK_CACHE_ENABLED:
case BLOOMFILTER:
case VECTOR_SIZE:
case NUM_HASH:
@@ -441,10 +440,6 @@
jj_consume_token(IN_MEMORY);
columnSpec.put("IN_MEMORY", true);
break;
- case BLOCK_CACHE_ENABLED:
- jj_consume_token(BLOCK_CACHE_ENABLED);
- columnSpec.put("BLOCK_CACHE_ENABLED", true);
- break;
case BLOOMFILTER:
jj_consume_token(BLOOMFILTER);
jj_consume_token(EQUALS);
@@ -1085,33 +1080,33 @@
finally { jj_save(0, xla); }
}
- final private boolean jj_3_1() {
- if (jj_scan_token(ADD)) return true;
- if (jj_3R_10()) return true;
+ final private boolean jj_3R_11() {
+ if (jj_scan_token(ID)) 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(67)) {
+ if (jj_3R_11()) {
jj_scanpos = xsp;
- if (jj_scan_token(68)) return true;
+ if (jj_3R_12()) return true;
}
return false;
}
- final private boolean jj_3R_11() {
- if (jj_scan_token(ID)) return true;
+ 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_10() {
+ final private boolean jj_3R_12() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_11()) {
+ if (jj_scan_token(66)) {
jj_scanpos = xsp;
- if (jj_3R_12()) return true;
+ if (jj_scan_token(67)) return true;
}
return false;
}
@@ -1138,10 +1133,10 @@
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,0x0,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,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000,0x0,0xe71c000,0xe0000,0x1c00000,0xe71c000,0x10,0x10,0x30000000,0x0,0x0,0x0,0x0,0xc0002000,0x0,0x0,0x0,0x0,0x1,0x2,0x10,0x0,0x80002000,0x80002000,0x80002000,0x0,0x80002000,0x10,0x10,0x10,0x80000000,0x0,0x80000000,};
+ jj_la1_1 = new int[]
{0x0,0x0,0x0,0x40000000,0xc0000000,0xc0000000,0x40000000,0x40000000,0x40000000,0x40000000,0x0,0x731c000,0xe0000,0xe00000,0x731c000,0x10,0x10,0x18000000,0x0,0x0,0x0,0x0,0xe0002000,0x0,0x0,0x0,0x0,0x1,0x2,0x10,0x0,0xc0002000,0xc0002000,0xc0002000,0x0,0xc0002000,0x10,0x10,0x10,0xc0000000,0x0,0x40000000,};
}
private static void jj_la1_2() {
- jj_la1_2 = new int[]
{0x0,0x20,0x0,0x0,0x3,0x3,0x18,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x18,0x0,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x1,0x19,0x1,0x18,0x19,0x0,0x0,0x0,0x1,0x18,0x18,};
+ jj_la1_2 = new int[]
{0x0,0x10,0x0,0x0,0x1,0x1,0xc,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0xc,0x0,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0xc,0x0,0xc,0xc,0x0,0x0,0x0,0x0,0xc,0xc,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
@@ -1318,8 +1313,8 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[70];
- for (int i = 0; i < 70; i++) {
+ boolean[] la1tokens = new boolean[69];
+ for (int i = 0; i < 69; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -1341,7 +1336,7 @@
}
}
}
- for (int i = 0; i < 70; i++) {
+ for (int i = 0; i < 69; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserConstants.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserConstants.java?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserConstants.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserConstants.java
Mon Feb 4 18:36:26 2008
@@ -52,22 +52,21 @@
int BLOCK = 50;
int RECORD = 51;
int IN_MEMORY = 52;
- int BLOCK_CACHE_ENABLED = 53;
- int BLOOMFILTER = 54;
- int COUNTING_BLOOMFILTER = 55;
- int RETOUCHED_BLOOMFILTER = 56;
- int VECTOR_SIZE = 57;
- int NUM_HASH = 58;
- int NUM_ENTRIES = 59;
- int ADD = 60;
- int CHANGE = 61;
- int COUNT = 62;
- int ID = 63;
- int INTEGER_LITERAL = 64;
- int FLOATING_POINT_LITERAL = 65;
- int EXPONENT = 66;
- int QUOTED_IDENTIFIER = 67;
- int STRING_LITERAL = 68;
+ 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 COUNT = 61;
+ int ID = 62;
+ int INTEGER_LITERAL = 63;
+ int FLOATING_POINT_LITERAL = 64;
+ int EXPONENT = 65;
+ int QUOTED_IDENTIFIER = 66;
+ int STRING_LITERAL = 67;
int DEFAULT = 0;
@@ -125,7 +124,6 @@
"\"block\"",
"\"record\"",
"\"in_memory\"",
- "\"block_cache_enabled\"",
"\"bloomfilter\"",
"\"counting_bloomfilter\"",
"\"retouched_bloomfilter\"",
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserTokenManager.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserTokenManager.java?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserTokenManager.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/hql/generated/HQLParserTokenManager.java
Mon Feb 4 18:36:26 2008
@@ -40,41 +40,41 @@
switch (pos)
{
case 0:
- if ((active0 & 0x7fffcc0fffffffe0L) != 0L)
+ if ((active0 & 0x3fffcc0fffffffe0L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
return 1;
}
return -1;
case 1:
- if ((active0 & 0x10080800064000L) != 0L)
- return 1;
- if ((active0 & 0x7fefc407fff9bfe0L) != 0L)
+ if ((active0 & 0x3fefc407fff9bfe0L) != 0L)
{
if (jjmatchedPos != 1)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 1;
}
return 1;
}
+ if ((active0 & 0x10080800064000L) != 0L)
+ return 1;
return -1;
case 2:
- if ((active0 & 0x1000040410008000L) != 0L)
- return 1;
- if ((active0 & 0x6fffc003efff3fe0L) != 0L)
+ if ((active0 & 0x37ffc003efff3fe0L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 2;
return 1;
}
+ if ((active0 & 0x800040410008000L) != 0L)
+ return 1;
return -1;
case 3:
- if ((active0 & 0x6ffdc003ebfa28c0L) != 0L)
+ if ((active0 & 0x37fdc003ebfa28c0L) != 0L)
{
if (jjmatchedPos != 3)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 3;
}
return 1;
@@ -83,74 +83,74 @@
return 1;
return -1;
case 4:
- if ((active0 & 0x2f59c001e1f22a00L) != 0L)
+ if ((active0 & 0x17b9c001e1f22a00L) != 0L)
{
if (jjmatchedPos != 4)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 4;
}
return 1;
}
- if ((active0 & 0x40a400020a0800c0L) != 0L)
+ if ((active0 & 0x204400020a0800c0L) != 0L)
return 1;
return -1;
case 5:
- if ((active0 & 0xff1c001c1802200L) != 0L)
+ if ((active0 & 0x1008000020720800L) != 0L)
+ return 1;
+ if ((active0 & 0x7f1c001c1802200L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 5;
return 1;
}
- if ((active0 & 0x2008000020720800L) != 0L)
- return 1;
return -1;
case 6:
- if ((active0 & 0xff1c001c1002200L) != 0L)
+ if ((active0 & 0x800000L) != 0L)
+ return 1;
+ if ((active0 & 0x7f1c001c1002200L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 6;
return 1;
}
- if ((active0 & 0x800000L) != 0L)
- return 1;
return -1;
case 7:
- if ((active0 & 0xbf1c001c0000000L) != 0L)
+ if ((active0 & 0x200000001002200L) != 0L)
+ return 1;
+ if ((active0 & 0x5f1c001c0000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 7;
return 1;
}
- if ((active0 & 0x400000001002200L) != 0L)
- return 1;
return -1;
case 8:
- if ((active0 & 0xbe1c00140000000L) != 0L)
+ if ((active0 & 0x10000080000000L) != 0L)
+ return 1;
+ if ((active0 & 0x5e1c00140000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 8;
return 1;
}
- if ((active0 & 0x10000080000000L) != 0L)
- return 1;
return -1;
case 9:
if ((active0 & 0x800000000000L) != 0L)
return 1;
- if ((active0 & 0xbe1400140000000L) != 0L)
+ if ((active0 & 0x5e1400140000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 9;
return 1;
}
return -1;
case 10:
- if ((active0 & 0xa41000000000000L) != 0L)
+ if ((active0 & 0x521000000000000L) != 0L)
return 1;
- if ((active0 & 0x1a0400140000000L) != 0L)
+ if ((active0 & 0xc0400140000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 10;
return 1;
}
@@ -158,17 +158,17 @@
case 11:
if ((active0 & 0x400100000000L) != 0L)
return 1;
- if ((active0 & 0x1a0000040000000L) != 0L)
+ if ((active0 & 0xc0000040000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 11;
return 1;
}
return -1;
case 12:
- if ((active0 & 0x1a0000040000000L) != 0L)
+ if ((active0 & 0xc0000040000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 12;
return 1;
}
@@ -176,63 +176,61 @@
case 13:
if ((active0 & 0x40000000L) != 0L)
return 1;
- if ((active0 & 0x1a0000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 13;
return 1;
}
return -1;
case 14:
- if ((active0 & 0x1a0000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 14;
return 1;
}
return -1;
case 15:
- if ((active0 & 0x1a0000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 15;
return 1;
}
return -1;
case 16:
- if ((active0 & 0x1a0000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 16;
return 1;
}
return -1;
case 17:
- if ((active0 & 0x1a0000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 17;
return 1;
}
return -1;
case 18:
- if ((active0 & 0x180000000000000L) != 0L)
+ if ((active0 & 0xc0000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 18;
return 1;
}
- if ((active0 & 0x20000000000000L) != 0L)
- return 1;
return -1;
case 19:
- if ((active0 & 0x100000000000000L) != 0L)
+ if ((active0 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 62;
jjmatchedPos = 19;
return 1;
}
- if ((active0 & 0x80000000000000L) != 0L)
+ if ((active0 & 0x40000000000000L) != 0L)
return 1;
return -1;
default :
@@ -272,7 +270,7 @@
case 44:
return jjStopAtPos(0, 36);
case 59:
- return jjStopAtPos(0, 69);
+ return jjStopAtPos(0, 68);
case 60:
return jjStopAtPos(0, 41);
case 61:
@@ -281,13 +279,13 @@
return jjStopAtPos(0, 40);
case 65:
case 97:
- return jjMoveStringLiteralDfa1_0(0x1000000400000040L);
+ return jjMoveStringLiteralDfa1_0(0x800000400000040L);
case 66:
case 98:
- return jjMoveStringLiteralDfa1_0(0x64000000000000L);
+ return jjMoveStringLiteralDfa1_0(0x24000000000000L);
case 67:
case 99:
- return jjMoveStringLiteralDfa1_0(0x6081000040000880L);
+ return jjMoveStringLiteralDfa1_0(0x3041000040000880L);
case 68:
case 100:
return jjMoveStringLiteralDfa1_0(0x901600L);
@@ -314,13 +312,13 @@
return jjMoveStringLiteralDfa1_0(0xc00000000000L);
case 78:
case 110:
- return jjMoveStringLiteralDfa1_0(0xc02040100000000L);
+ return jjMoveStringLiteralDfa1_0(0x602040100000000L);
case 79:
case 111:
return jjMoveStringLiteralDfa1_0(0x800000000L);
case 82:
case 114:
- return jjMoveStringLiteralDfa1_0(0x108000010000000L);
+ return jjMoveStringLiteralDfa1_0(0x88000010000000L);
case 83:
case 115:
return jjMoveStringLiteralDfa1_0(0x1200100L);
@@ -332,7 +330,7 @@
return jjMoveStringLiteralDfa1_0(0x8000000L);
case 86:
case 118:
- return jjMoveStringLiteralDfa1_0(0x200000020000000L);
+ return jjMoveStringLiteralDfa1_0(0x100000020000000L);
case 87:
case 119:
return jjMoveStringLiteralDfa1_0(0x2000000L);
@@ -358,19 +356,19 @@
return jjMoveStringLiteralDfa2_0(active0, 0xc00020088000L);
case 68:
case 100:
- return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000000L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
case 69:
case 101:
- return jjMoveStringLiteralDfa2_0(active0, 0x308000000300620L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x188000000300620L);
case 72:
case 104:
- return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000100L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000100L);
case 73:
case 105:
return jjMoveStringLiteralDfa2_0(active0, 0x280800000L);
case 76:
case 108:
- return jjMoveStringLiteralDfa2_0(active0, 0x640000000000c0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x240000000000c0L);
case 78:
case 110:
if ((active0 & 0x80000000000L) != 0L)
@@ -381,7 +379,7 @@
return jjMoveStringLiteralDfa2_0(active0, 0x10000408460000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa2_0(active0, 0x4083040050000000L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x2043040050000000L);
case 82:
case 114:
if ((active0 & 0x800000000L) != 0L)
@@ -397,7 +395,7 @@
return jjMoveStringLiteralDfa2_0(active0, 0x1000000L);
case 85:
case 117:
- return jjMoveStringLiteralDfa2_0(active0, 0xc00000100000000L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x600000100000000L);
case 88:
case 120:
return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
@@ -421,19 +419,19 @@
return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L);
case 65:
case 97:
- return jjMoveStringLiteralDfa3_0(active0, 0x2000000001400000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1000000001400000L);
case 66:
case 98:
return jjMoveStringLiteralDfa3_0(active0, 0x80000L);
case 67:
case 99:
- return jjMoveStringLiteralDfa3_0(active0, 0x208000000000000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x108000000000000L);
case 68:
case 100:
if ((active0 & 0x400000000L) != 0L)
return jjStartNfaWithStates_0(2, 34, 1);
- else if ((active0 & 0x1000000000000000L) != 0L)
- return jjStartNfaWithStates_0(2, 60, 1);
+ else if ((active0 & 0x800000000000000L) != 0L)
+ return jjStartNfaWithStates_0(2, 59, 1);
break;
case 69:
case 101:
@@ -446,13 +444,13 @@
return jjMoveStringLiteralDfa3_0(active0, 0x60300020L);
case 77:
case 109:
- return jjMoveStringLiteralDfa3_0(active0, 0xc01000380000000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x601000380000000L);
case 78:
case 110:
return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa3_0(active0, 0x64000004001100L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x24000004001100L);
case 82:
case 114:
if ((active0 & 0x8000L) != 0L)
@@ -465,10 +463,10 @@
case 116:
if ((active0 & 0x40000000000L) != 0L)
return jjStartNfaWithStates_0(2, 42, 1);
- return jjMoveStringLiteralDfa3_0(active0, 0x100000008040040L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x80000008040040L);
case 85:
case 117:
- return jjMoveStringLiteralDfa3_0(active0, 0x4080000000002000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x2040000000002000L);
case 87:
case 119:
if ((active0 & 0x10000000L) != 0L)
@@ -494,7 +492,7 @@
switch(curChar)
{
case 95:
- return jjMoveStringLiteralDfa4_0(active0, 0xc00c00100000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x600c00100000000L);
case 65:
case 97:
return jjMoveStringLiteralDfa4_0(active0, 0x800880L);
@@ -508,7 +506,7 @@
jjmatchedKind = 10;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x24000000000200L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000200L);
case 69:
case 101:
if ((active0 & 0x2000000000000L) != 0L)
@@ -527,12 +525,12 @@
return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L);
case 78:
case 110:
- return jjMoveStringLiteralDfa4_0(active0, 0x6080000000002000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x3040000000002000L);
case 79:
case 111:
if ((active0 & 0x40000L) != 0L)
return jjStartNfaWithStates_0(3, 18, 1);
- return jjMoveStringLiteralDfa4_0(active0, 0x148000000000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0xa8000000000000L);
case 80:
case 112:
if ((active0 & 0x20L) != 0L)
@@ -547,7 +545,7 @@
case 116:
if ((active0 & 0x10000L) != 0L)
return jjStartNfaWithStates_0(3, 16, 1);
- return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L);
case 85:
case 117:
return jjMoveStringLiteralDfa4_0(active0, 0x60000000L);
@@ -584,21 +582,18 @@
return jjStartNfaWithStates_0(4, 19, 1);
else if ((active0 & 0x2000000L) != 0L)
return jjStartNfaWithStates_0(4, 25, 1);
- return jjMoveStringLiteralDfa5_0(active0, 0x810000020000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x410000020000000L);
case 71:
case 103:
- return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L);
case 72:
case 104:
- return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L);
case 75:
case 107:
if ((active0 & 0x4000000000000L) != 0L)
- {
- jjmatchedKind = 50;
- jjmatchedPos = 4;
- }
- return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L);
+ return jjStartNfaWithStates_0(4, 50, 1);
+ break;
case 76:
case 108:
if ((active0 & 0x8000000L) != 0L)
@@ -606,10 +601,10 @@
return jjMoveStringLiteralDfa5_0(active0, 0x800000400000L);
case 77:
case 109:
- return jjMoveStringLiteralDfa5_0(active0, 0x40000040000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x20000040000000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
case 82:
case 114:
if ((active0 & 0x40L) != 0L)
@@ -624,15 +619,15 @@
case 116:
if ((active0 & 0x200000000L) != 0L)
return jjStartNfaWithStates_0(4, 33, 1);
- else if ((active0 & 0x4000000000000000L) != 0L)
+ else if ((active0 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 62;
+ jjmatchedKind = 61;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x80000001100800L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x40000001100800L);
case 85:
case 117:
- return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L);
case 86:
case 118:
return jjMoveStringLiteralDfa5_0(active0, 0x400100000000L);
@@ -652,14 +647,12 @@
}
switch(curChar)
{
- case 95:
- return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L);
case 65:
case 97:
- return jjMoveStringLiteralDfa6_0(active0, 0x400000000002000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000000002000L);
case 67:
case 99:
- return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
case 68:
case 100:
if ((active0 & 0x8000000000000L) != 0L)
@@ -673,15 +666,15 @@
return jjStartNfaWithStates_0(5, 20, 1);
else if ((active0 & 0x400000L) != 0L)
return jjStartNfaWithStates_0(5, 22, 1);
- else if ((active0 & 0x2000000000000000L) != 0L)
- return jjStartNfaWithStates_0(5, 61, 1);
+ else if ((active0 & 0x1000000000000000L) != 0L)
+ return jjStartNfaWithStates_0(5, 60, 1);
return jjMoveStringLiteralDfa6_0(active0, 0x1c00100000000L);
case 70:
case 102:
- return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L);
case 73:
case 105:
- return jjMoveStringLiteralDfa6_0(active0, 0x80000001000200L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x40000001000200L);
case 76:
case 108:
return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
@@ -690,10 +683,10 @@
return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L);
case 78:
case 110:
- return jjMoveStringLiteralDfa6_0(active0, 0x800000040000000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x400000040000000L);
case 82:
case 114:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L);
case 83:
case 115:
if ((active0 & 0x20000000L) != 0L)
@@ -723,16 +716,13 @@
switch(curChar)
{
case 95:
- return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L);
case 65:
case 97:
return jjMoveStringLiteralDfa7_0(active0, 0x80000000L);
case 66:
case 98:
return jjMoveStringLiteralDfa7_0(active0, 0x200L);
- case 67:
- case 99:
- return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L);
case 69:
case 101:
if ((active0 & 0x800000L) != 0L)
@@ -743,13 +733,13 @@
return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);
case 72:
case 104:
- return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
case 73:
case 105:
- return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L);
case 78:
case 110:
- return jjMoveStringLiteralDfa7_0(active0, 0x80800001000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x40800001000000L);
case 79:
case 111:
return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
@@ -758,10 +748,10 @@
return jjMoveStringLiteralDfa7_0(active0, 0x400100000000L);
case 83:
case 115:
- return jjMoveStringLiteralDfa7_0(active0, 0x401000000000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x201000000000000L);
case 84:
case 116:
- return jjMoveStringLiteralDfa7_0(active0, 0x800000000002000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x400000000002000L);
default :
break;
}
@@ -780,36 +770,36 @@
{
case 65:
case 97:
- return jjMoveStringLiteralDfa8_0(active0, 0x20000040000000L);
+ 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, 0x100000000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L);
case 71:
case 103:
if ((active0 & 0x1000000L) != 0L)
return jjStartNfaWithStates_0(7, 24, 1);
- return jjMoveStringLiteralDfa8_0(active0, 0x80800000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x40800000000000L);
case 72:
case 104:
- if ((active0 & 0x400000000000000L) != 0L)
- return jjStartNfaWithStates_0(7, 58, 1);
+ if ((active0 & 0x200000000000000L) != 0L)
+ return jjStartNfaWithStates_0(7, 57, 1);
break;
case 76:
case 108:
- return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L);
case 77:
case 109:
return jjMoveStringLiteralDfa8_0(active0, 0x80000000L);
case 82:
case 114:
- return jjMoveStringLiteralDfa8_0(active0, 0x810000000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x410000000000000L);
case 83:
case 115:
- return jjMoveStringLiteralDfa8_0(active0, 0x201400100000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x101400100000000L);
default :
break;
}
@@ -827,16 +817,13 @@
switch(curChar)
{
case 95:
- return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L);
- case 67:
- case 99:
- return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);
case 68:
case 100:
- return jjMoveStringLiteralDfa9_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L);
case 73:
case 105:
- return jjMoveStringLiteralDfa9_0(active0, 0xa01400100000000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0x501400100000000L);
case 77:
case 109:
return jjMoveStringLiteralDfa9_0(active0, 0x40000000L);
@@ -847,7 +834,7 @@
break;
case 84:
case 116:
- return jjMoveStringLiteralDfa9_0(active0, 0x40800000000000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0x20800000000000L);
case 89:
case 121:
if ((active0 & 0x10000000000000L) != 0L)
@@ -870,18 +857,18 @@
switch(curChar)
{
case 95:
- return jjMoveStringLiteralDfa10_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
case 66:
case 98:
- return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);
case 69:
case 101:
- return jjMoveStringLiteralDfa10_0(active0, 0x840000000000000L);
+ return jjMoveStringLiteralDfa10_0(active0, 0x420000000000000L);
case 72:
case 104:
if ((active0 & 0x800000000000L) != 0L)
return jjStartNfaWithStates_0(9, 47, 1);
- return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);
+ break;
case 73:
case 105:
return jjMoveStringLiteralDfa10_0(active0, 0x40000000L);
@@ -890,7 +877,7 @@
return jjMoveStringLiteralDfa10_0(active0, 0x1400100000000L);
case 90:
case 122:
- return jjMoveStringLiteralDfa10_0(active0, 0x200000000000000L);
+ return jjMoveStringLiteralDfa10_0(active0, 0x100000000000000L);
default :
break;
}
@@ -909,15 +896,15 @@
{
case 66:
case 98:
- return jjMoveStringLiteralDfa11_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa11_0(active0, 0x80000000000000L);
case 69:
case 101:
- if ((active0 & 0x200000000000000L) != 0L)
- return jjStartNfaWithStates_0(10, 57, 1);
- return jjMoveStringLiteralDfa11_0(active0, 0x20000000000000L);
+ if ((active0 & 0x100000000000000L) != 0L)
+ return jjStartNfaWithStates_0(10, 56, 1);
+ break;
case 76:
case 108:
- return jjMoveStringLiteralDfa11_0(active0, 0x80000040000000L);
+ return jjMoveStringLiteralDfa11_0(active0, 0x40000040000000L);
case 78:
case 110:
if ((active0 & 0x1000000000000L) != 0L)
@@ -925,13 +912,13 @@
return jjMoveStringLiteralDfa11_0(active0, 0x400100000000L);
case 82:
case 114:
- if ((active0 & 0x40000000000000L) != 0L)
- return jjStartNfaWithStates_0(10, 54, 1);
+ if ((active0 & 0x20000000000000L) != 0L)
+ return jjStartNfaWithStates_0(10, 53, 1);
break;
case 83:
case 115:
- if ((active0 & 0x800000000000000L) != 0L)
- return jjStartNfaWithStates_0(10, 59, 1);
+ if ((active0 & 0x400000000000000L) != 0L)
+ return jjStartNfaWithStates_0(10, 58, 1);
break;
default :
break;
@@ -949,17 +936,15 @@
}
switch(curChar)
{
- case 95:
- return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
case 73:
case 105:
return jjMoveStringLiteralDfa12_0(active0, 0x40000000L);
case 76:
case 108:
- return jjMoveStringLiteralDfa12_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa12_0(active0, 0x80000000000000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa12_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);
case 83:
case 115:
if ((active0 & 0x100000000L) != 0L)
@@ -985,10 +970,10 @@
{
case 69:
case 101:
- return jjMoveStringLiteralDfa13_0(active0, 0x20000040000000L);
+ return jjMoveStringLiteralDfa13_0(active0, 0x40000000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa13_0(active0, 0x180000000000000L);
+ return jjMoveStringLiteralDfa13_0(active0, 0xc0000000000000L);
default :
break;
}
@@ -1007,13 +992,10 @@
{
case 77:
case 109:
- return jjMoveStringLiteralDfa14_0(active0, 0x80000000000000L);
- case 78:
- case 110:
- return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
+ return jjMoveStringLiteralDfa14_0(active0, 0x40000000000000L);
case 79:
case 111:
- return jjMoveStringLiteralDfa14_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa14_0(active0, 0x80000000000000L);
case 83:
case 115:
if ((active0 & 0x40000000L) != 0L)
@@ -1035,15 +1017,12 @@
}
switch(curChar)
{
- case 65:
- case 97:
- return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
case 70:
case 102:
- return jjMoveStringLiteralDfa15_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa15_0(active0, 0x40000000000000L);
case 77:
case 109:
- return jjMoveStringLiteralDfa15_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa15_0(active0, 0x80000000000000L);
default :
break;
}
@@ -1060,15 +1039,12 @@
}
switch(curChar)
{
- case 66:
- case 98:
- return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
case 70:
case 102:
- return jjMoveStringLiteralDfa16_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa16_0(active0, 0x80000000000000L);
case 73:
case 105:
- return jjMoveStringLiteralDfa16_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa16_0(active0, 0x40000000000000L);
default :
break;
}
@@ -1087,10 +1063,10 @@
{
case 73:
case 105:
- return jjMoveStringLiteralDfa17_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa17_0(active0, 0x80000000000000L);
case 76:
case 108:
- return jjMoveStringLiteralDfa17_0(active0, 0xa0000000000000L);
+ return jjMoveStringLiteralDfa17_0(active0, 0x40000000000000L);
default :
break;
}
@@ -1107,15 +1083,12 @@
}
switch(curChar)
{
- case 69:
- case 101:
- return jjMoveStringLiteralDfa18_0(active0, 0x20000000000000L);
case 76:
case 108:
- return jjMoveStringLiteralDfa18_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa18_0(active0, 0x80000000000000L);
case 84:
case 116:
- return jjMoveStringLiteralDfa18_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa18_0(active0, 0x40000000000000L);
default :
break;
}
@@ -1132,17 +1105,12 @@
}
switch(curChar)
{
- case 68:
- case 100:
- if ((active0 & 0x20000000000000L) != 0L)
- return jjStartNfaWithStates_0(18, 53, 1);
- break;
case 69:
case 101:
- return jjMoveStringLiteralDfa19_0(active0, 0x80000000000000L);
+ return jjMoveStringLiteralDfa19_0(active0, 0x40000000000000L);
case 84:
case 116:
- return jjMoveStringLiteralDfa19_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa19_0(active0, 0x80000000000000L);
default :
break;
}
@@ -1161,11 +1129,11 @@
{
case 69:
case 101:
- return jjMoveStringLiteralDfa20_0(active0, 0x100000000000000L);
+ return jjMoveStringLiteralDfa20_0(active0, 0x80000000000000L);
case 82:
case 114:
- if ((active0 & 0x80000000000000L) != 0L)
- return jjStartNfaWithStates_0(19, 55, 1);
+ if ((active0 & 0x40000000000000L) != 0L)
+ return jjStartNfaWithStates_0(19, 54, 1);
break;
default :
break;
@@ -1185,8 +1153,8 @@
{
case 82:
case 114:
- if ((active0 & 0x100000000000000L) != 0L)
- return jjStartNfaWithStates_0(20, 56, 1);
+ if ((active0 & 0x80000000000000L) != 0L)
+ return jjStartNfaWithStates_0(20, 55, 1);
break;
default :
break;
@@ -1248,14 +1216,14 @@
case 0:
if ((0x3ff000000000000L & l) != 0L)
{
- if (kind > 64)
- kind = 64;
+ if (kind > 63)
+ kind = 63;
jjCheckNAddStates(0, 6);
}
else if ((0x400e00000000000L & l) != 0L)
{
- if (kind > 63)
- kind = 63;
+ if (kind > 62)
+ kind = 62;
jjCheckNAdd(1);
}
else if (curChar == 39)
@@ -1268,8 +1236,8 @@
case 1:
if ((0x7ffe00000000000L & l) == 0L)
break;
- if (kind > 63)
- kind = 63;
+ if (kind > 62)
+ kind = 62;
jjCheckNAdd(1);
break;
case 2:
@@ -1279,8 +1247,8 @@
case 3:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAddTwoStates(3, 4);
break;
case 5:
@@ -1290,8 +1258,8 @@
case 6:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAdd(6);
break;
case 7:
@@ -1303,8 +1271,8 @@
jjCheckNAddTwoStates(8, 9);
break;
case 9:
- if (curChar == 34 && kind > 67)
- kind = 67;
+ if (curChar == 34 && kind > 66)
+ kind = 66;
break;
case 10:
if (curChar == 39)
@@ -1327,21 +1295,21 @@
jjCheckNAddStates(10, 12);
break;
case 15:
- if (curChar == 39 && kind > 68)
- kind = 68;
+ if (curChar == 39 && kind > 67)
+ kind = 67;
break;
case 16:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 64)
- kind = 64;
+ if (kind > 63)
+ kind = 63;
jjCheckNAddStates(0, 6);
break;
case 17:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 64)
- kind = 64;
+ if (kind > 63)
+ kind = 63;
jjCheckNAdd(17);
break;
case 18:
@@ -1355,8 +1323,8 @@
case 20:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAddTwoStates(20, 21);
break;
case 22:
@@ -1366,8 +1334,8 @@
case 23:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAdd(23);
break;
case 24:
@@ -1381,15 +1349,15 @@
case 27:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAdd(27);
break;
case 28:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAddTwoStates(28, 29);
break;
case 30:
@@ -1399,8 +1367,8 @@
case 31:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 65)
- kind = 65;
+ if (kind > 64)
+ kind = 64;
jjCheckNAdd(31);
break;
default : break;
@@ -1418,8 +1386,8 @@
case 1:
if ((0x47fffffe87fffffeL & l) == 0L)
break;
- if (kind > 63)
- kind = 63;
+ if (kind > 62)
+ kind = 62;
jjCheckNAdd(1);
break;
case 4:
@@ -1498,12 +1466,12 @@
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,
-null, null, "\73", };
+null, "\73", };
public static final String[] lexStateNames = {
"DEFAULT",
};
static final long[] jjtoToken = {
- 0xffffffffffffffe1L, 0x3bL,
+ 0xffffffffffffffe1L, 0x1dL,
};
static final long[] jjtoSkip = {
0x1eL, 0x0L,
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift Mon
Feb 4 18:36:26 2008
@@ -64,8 +64,7 @@
5:i32 maxValueLength = 2147483647,
6:string bloomFilterType = "NONE",
7:i32 bloomFilterVectorSize = 0,
- 8:i32 bloomFilterNbHashes = 0,
- 9:bool blockCacheEnabled = 0
+ 8:i32 bloomFilterNbHashes = 0
}
/**
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
Mon Feb 4 18:36:26 2008
@@ -46,7 +46,6 @@
public String bloomFilterType;
public int bloomFilterVectorSize;
public int bloomFilterNbHashes;
- public boolean blockCacheEnabled;
public final Isset __isset = new Isset();
public static final class Isset {
@@ -58,7 +57,6 @@
public boolean bloomFilterType = false;
public boolean bloomFilterVectorSize = false;
public boolean bloomFilterNbHashes = false;
- public boolean blockCacheEnabled = false;
}
public ColumnDescriptor() {
@@ -76,8 +74,6 @@
this.bloomFilterNbHashes = 0;
- this.blockCacheEnabled = false;
-
}
public ColumnDescriptor(
@@ -88,8 +84,7 @@
int maxValueLength,
String bloomFilterType,
int bloomFilterVectorSize,
- int bloomFilterNbHashes,
- boolean blockCacheEnabled)
+ int bloomFilterNbHashes)
{
this();
this.name = name;
@@ -108,8 +103,6 @@
this.__isset.bloomFilterVectorSize = true;
this.bloomFilterNbHashes = bloomFilterNbHashes;
this.__isset.bloomFilterNbHashes = true;
- this.blockCacheEnabled = blockCacheEnabled;
- this.__isset.blockCacheEnabled = true;
}
public void read(TProtocol iprot) throws TException {
@@ -187,14 +180,6 @@
TProtocolUtil.skip(iprot, field.type);
}
break;
- case 9:
- if (field.type == TType.BOOL) {
- this.blockCacheEnabled = iprot.readBool();
- this.__isset.blockCacheEnabled = true;
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
default:
TProtocolUtil.skip(iprot, field.type);
break;
@@ -262,12 +247,6 @@
oprot.writeFieldBegin(field);
oprot.writeI32(this.bloomFilterNbHashes);
oprot.writeFieldEnd();
- field.name = "blockCacheEnabled";
- field.type = TType.BOOL;
- field.id = 9;
- oprot.writeFieldBegin(field);
- oprot.writeBool(this.blockCacheEnabled);
- oprot.writeFieldEnd();
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -290,8 +269,6 @@
sb.append(this.bloomFilterVectorSize);
sb.append(",bloomFilterNbHashes:");
sb.append(this.bloomFilterNbHashes);
- sb.append(",blockCacheEnabled:");
- sb.append(this.blockCacheEnabled);
sb.append(")");
return sb.toString();
}
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java?rev=618518&r1=618517&r2=618518&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java
(original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java Mon
Feb 4 18:36:26 2008
@@ -57,7 +57,7 @@
assertEquals("HRegionInfo",
"regionname: -ROOT-,,0, startKey: <>, endKey: <>, encodedName: 70236052,
tableDesc: " +
"{name: -ROOT-, families: {info:={name: info, max versions: 1, " +
- "compression: NONE, in memory: false, block cache enabled: false, " +
- "max length: 2147483647, bloom filter: none}}}", hri.toString());
+ "compression: NONE, in memory: false, max length: 2147483647, bloom " +
+ "filter: none}}}", hri.toString());
}
}
