Changes - j0ke.net Open Build Service

Changes of Revision 45

[-] [+]	Changed	cego.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 1 10:59:56 UTC 2013 - cs@linux-administrator.com + +- Update to version 2.15.4 + +------------------------------------------------------------------- Mon Dec 31 10:08:27 UTC 2012 - cs@linux-administrator.com - Update to version 2.15.3
[-] [+]	Changed	cego.spec ^
@@ -1,5 +1,5 @@ Name: cego -Version: 2.15.3 +Version: 2.15.4 Release: 1 Group: Productivity/Databases Summary: Cego relational database
[-] [+]	Deleted	cego-2.15.3.tar.bz2/samples/chkdb/cglogmng~ ^
@@ -1,28 +0,0 @@ -#!/bin/bash - -ARCHFILE=$1 -ARCHPATH=$2 -TAPEPATH=./arch - -for i in 1 2 3 -do - - if [ -e "$TAPEPATH/$ARCHFILE" ] - then - TARGETPATH=`echo $ARCHPATH \| awk -F: '{ print $1 }'` - echo "Restoring $ARCHFILE ..." - sleep 1 - # cp $TAPEPATH/$ARCHFILE $TARGETPATH - if [ $? -eq 0 ] - then - exit 0 - else - exit 2 - fi - fi - echo "Waiting for log .." - sleep 2 -done - -exit 1 -
[-] [+]	Changed	cego-2.15.4.tar.bz2/README ^
@@ -4,9 +4,9 @@ ---- A relational and transactional database system - Version 2.15.3 + Version 2.15.4 - (C)opyright 2006,2007,2008,2009,2010,2011,2012 by Bjoern Lemke + (C)opyright 2006,2007,2008,2009,2010,2011,2012,2013 by Bjoern Lemke This software comes under the GNU general public license
[-] [+]	Changed	cego-2.15.4.tar.bz2/samples/chkdb/pid ^
@@ -1 +1 @@ -28360 \ No newline at end of file +34937 \ No newline at end of file
[-] [+]	Added	cego-2.15.4.tar.bz2/samples/chkdb/saveTS ^
@@ -0,0 +1,5 @@ +#!/bin/bash + +echo Saving tableset ... +sleep 3 +echo Saving done. \ No newline at end of file
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdm.cc ^
@@ -2036,79 +2036,59 @@ } void CegoAdm::loadParser0() { - _actionMap[353][SEMICOLON] = ActionEntry(REDUCE, 85); - _actionMap[348][SEMICOLON] = ActionEntry(REDUCE, 39); - _actionMap[349][SEMICOLON] = ActionEntry(REDUCE, 82); - _actionMap[350][NOLOGGING] = ActionEntry(SHIFT, 342); - _actionMap[350][SEMICOLON] = ActionEntry(REDUCE, 93); - _jumpMap[350][LogOpt] = 353; - _actionMap[351][SEMICOLON] = ActionEntry(REDUCE, 87); - _actionMap[352][SEMICOLON] = ActionEntry(REDUCE, 53); - _actionMap[326][SEMICOLON] = ActionEntry(REDUCE, 64); - _actionMap[327][IDENTIFIER] = ActionEntry(SHIFT, 348); - _actionMap[328][SEMICOLON] = ActionEntry(REDUCE, 114); - _actionMap[328][PRIMARY] = ActionEntry(REDUCE, 114); - _actionMap[328][SECONDARY] = ActionEntry(REDUCE, 114); - _actionMap[328][SYSSIZE] = ActionEntry(REDUCE, 114); - _actionMap[328][TMPSIZE] = ActionEntry(REDUCE, 114); - _actionMap[328][LOGSIZE] = ActionEntry(REDUCE, 114); - _actionMap[328][LOGNUM] = ActionEntry(REDUCE, 114); - _actionMap[328][SORTAREASIZE] = ActionEntry(REDUCE, 114); - _actionMap[328][TSROOT] = ActionEntry(REDUCE, 114); - _actionMap[328][TSTICKET] = ActionEntry(REDUCE, 114); - _actionMap[329][SEMICOLON] = ActionEntry(REDUCE, 111); - _actionMap[329][PRIMARY] = ActionEntry(REDUCE, 111); - _actionMap[329][SECONDARY] = ActionEntry(REDUCE, 111); - _actionMap[329][SYSSIZE] = ActionEntry(REDUCE, 111); - _actionMap[329][TMPSIZE] = ActionEntry(REDUCE, 111); - _actionMap[329][LOGSIZE] = ActionEntry(REDUCE, 111); - _actionMap[329][LOGNUM] = ActionEntry(REDUCE, 111); - _actionMap[329][SORTAREASIZE] = ActionEntry(REDUCE, 111); - _actionMap[329][TSROOT] = ActionEntry(REDUCE, 111); - _actionMap[329][TSTICKET] = ActionEntry(REDUCE, 111); - _actionMap[330][SEMICOLON] = ActionEntry(REDUCE, 110); - _actionMap[330][PRIMARY] = ActionEntry(REDUCE, 110); - _actionMap[330][SECONDARY] = ActionEntry(REDUCE, 110); - _actionMap[330][SYSSIZE] = ActionEntry(REDUCE, 110); - _actionMap[330][TMPSIZE] = ActionEntry(REDUCE, 110); - _actionMap[330][LOGSIZE] = ActionEntry(REDUCE, 110); - _actionMap[330][LOGNUM] = ActionEntry(REDUCE, 110); - _actionMap[330][SORTAREASIZE] = ActionEntry(REDUCE, 110); - _actionMap[330][TSROOT] = ActionEntry(REDUCE, 110); - _actionMap[330][TSTICKET] = ActionEntry(REDUCE, 110); - _actionMap[331][SEMICOLON] = ActionEntry(REDUCE, 106); - _actionMap[331][PRIMARY] = ActionEntry(REDUCE, 106); - _actionMap[331][SECONDARY] = ActionEntry(REDUCE, 106); - _actionMap[331][SYSSIZE] = ActionEntry(REDUCE, 106); - _actionMap[331][TMPSIZE] = ActionEntry(REDUCE, 106); - _actionMap[331][LOGSIZE] = ActionEntry(REDUCE, 106); - _actionMap[331][LOGNUM] = ActionEntry(REDUCE, 106); - _actionMap[331][SORTAREASIZE] = ActionEntry(REDUCE, 106); - _actionMap[331][TSROOT] = ActionEntry(REDUCE, 106); - _actionMap[331][TSTICKET] = ActionEntry(REDUCE, 106); + _actionMap[355][SEMICOLON] = ActionEntry(REDUCE, 84); + _actionMap[350][SEMICOLON] = ActionEntry(REDUCE, 39); + _actionMap[351][SEMICOLON] = ActionEntry(REDUCE, 81); + _actionMap[352][NOLOGGING] = ActionEntry(SHIFT, 344); + _actionMap[352][SEMICOLON] = ActionEntry(REDUCE, 94); + _jumpMap[352][LogOpt] = 355; + _actionMap[353][SEMICOLON] = ActionEntry(REDUCE, 86); + _actionMap[354][SEMICOLON] = ActionEntry(REDUCE, 53); + _actionMap[328][SEMICOLON] = ActionEntry(REDUCE, 64); + _actionMap[329][IDENTIFIER] = ActionEntry(SHIFT, 350); + _actionMap[330][SEMICOLON] = ActionEntry(REDUCE, 115); + _actionMap[330][PRIMARY] = ActionEntry(REDUCE, 115); + _actionMap[330][SECONDARY] = ActionEntry(REDUCE, 115); + _actionMap[330][SYSSIZE] = ActionEntry(REDUCE, 115); + _actionMap[330][TMPSIZE] = ActionEntry(REDUCE, 115); + _actionMap[330][LOGSIZE] = ActionEntry(REDUCE, 115); + _actionMap[330][LOGNUM] = ActionEntry(REDUCE, 115); + _actionMap[330][SORTAREASIZE] = ActionEntry(REDUCE, 115); + _actionMap[330][TSROOT] = ActionEntry(REDUCE, 115); + _actionMap[330][TSTICKET] = ActionEntry(REDUCE, 115); + _actionMap[331][SEMICOLON] = ActionEntry(REDUCE, 112); + _actionMap[331][PRIMARY] = ActionEntry(REDUCE, 112); + _actionMap[331][SECONDARY] = ActionEntry(REDUCE, 112); + _actionMap[331][SYSSIZE] = ActionEntry(REDUCE, 112); + _actionMap[331][TMPSIZE] = ActionEntry(REDUCE, 112); + _actionMap[331][LOGSIZE] = ActionEntry(REDUCE, 112); + _actionMap[331][LOGNUM] = ActionEntry(REDUCE, 112); + _actionMap[331][SORTAREASIZE] = ActionEntry(REDUCE, 112); + _actionMap[331][TSROOT] = ActionEntry(REDUCE, 112); + _actionMap[331][TSTICKET] = ActionEntry(REDUCE, 112); + _actionMap[332][SEMICOLON] = ActionEntry(REDUCE, 111); + _actionMap[332][PRIMARY] = ActionEntry(REDUCE, 111); + _actionMap[332][SECONDARY] = ActionEntry(REDUCE, 111); + _actionMap[332][SYSSIZE] = ActionEntry(REDUCE, 111); + _actionMap[332][TMPSIZE] = ActionEntry(REDUCE, 111); + _actionMap[332][LOGSIZE] = ActionEntry(REDUCE, 111); + _actionMap[332][LOGNUM] = ActionEntry(REDUCE, 111); + _actionMap[332][SORTAREASIZE] = ActionEntry(REDUCE, 111); + _actionMap[332][TSROOT] = ActionEntry(REDUCE, 111); + _actionMap[332][TSTICKET] = ActionEntry(REDUCE, 111); + _actionMap[333][SEMICOLON] = ActionEntry(REDUCE, 107); + _actionMap[333][PRIMARY] = ActionEntry(REDUCE, 107); + _actionMap[333][SECONDARY] = ActionEntry(REDUCE, 107); + _actionMap[333][SYSSIZE] = ActionEntry(REDUCE, 107); + _actionMap[333][TMPSIZE] = ActionEntry(REDUCE, 107); + _actionMap[333][LOGSIZE] = ActionEntry(REDUCE, 107); + _actionMap[333][LOGNUM] = ActionEntry(REDUCE, 107); + _actionMap[333][SORTAREASIZE] = ActionEntry(REDUCE, 107); + _actionMap[333][TSROOT] = ActionEntry(REDUCE, 107); + _actionMap[333][TSTICKET] = ActionEntry(REDUCE, 107); } void CegoAdm::loadParser1() { - _actionMap[332][SEMICOLON] = ActionEntry(REDUCE, 107); - _actionMap[332][PRIMARY] = ActionEntry(REDUCE, 107); - _actionMap[332][SECONDARY] = ActionEntry(REDUCE, 107); - _actionMap[332][SYSSIZE] = ActionEntry(REDUCE, 107); - _actionMap[332][TMPSIZE] = ActionEntry(REDUCE, 107); - _actionMap[332][LOGSIZE] = ActionEntry(REDUCE, 107); - _actionMap[332][LOGNUM] = ActionEntry(REDUCE, 107); - _actionMap[332][SORTAREASIZE] = ActionEntry(REDUCE, 107); - _actionMap[332][TSROOT] = ActionEntry(REDUCE, 107); - _actionMap[332][TSTICKET] = ActionEntry(REDUCE, 107); - _actionMap[333][SEMICOLON] = ActionEntry(REDUCE, 112); - _actionMap[333][PRIMARY] = ActionEntry(REDUCE, 112); - _actionMap[333][SECONDARY] = ActionEntry(REDUCE, 112); - _actionMap[333][SYSSIZE] = ActionEntry(REDUCE, 112); - _actionMap[333][TMPSIZE] = ActionEntry(REDUCE, 112); - _actionMap[333][LOGSIZE] = ActionEntry(REDUCE, 112); - _actionMap[333][LOGNUM] = ActionEntry(REDUCE, 112); - _actionMap[333][SORTAREASIZE] = ActionEntry(REDUCE, 112); - _actionMap[333][TSROOT] = ActionEntry(REDUCE, 112); - _actionMap[333][TSTICKET] = ActionEntry(REDUCE, 112); _actionMap[334][SEMICOLON] = ActionEntry(REDUCE, 108); _actionMap[334][PRIMARY] = ActionEntry(REDUCE, 108); _actionMap[334][SECONDARY] = ActionEntry(REDUCE, 108); @@ -2119,103 +2099,120 @@ _actionMap[334][SORTAREASIZE] = ActionEntry(REDUCE, 108); _actionMap[334][TSROOT] = ActionEntry(REDUCE, 108); _actionMap[334][TSTICKET] = ActionEntry(REDUCE, 108); - _actionMap[335][SEMICOLON] = ActionEntry(REDUCE, 109); - _actionMap[335][PRIMARY] = ActionEntry(REDUCE, 109); - _actionMap[335][SECONDARY] = ActionEntry(REDUCE, 109); - _actionMap[335][SYSSIZE] = ActionEntry(REDUCE, 109); - _actionMap[335][TMPSIZE] = ActionEntry(REDUCE, 109); - _actionMap[335][LOGSIZE] = ActionEntry(REDUCE, 109); - _actionMap[335][LOGNUM] = ActionEntry(REDUCE, 109); - _actionMap[335][SORTAREASIZE] = ActionEntry(REDUCE, 109); - _actionMap[335][TSROOT] = ActionEntry(REDUCE, 109); - _actionMap[335][TSTICKET] = ActionEntry(REDUCE, 109); - _actionMap[336][SEMICOLON] = ActionEntry(REDUCE, 113); - _actionMap[336][PRIMARY] = ActionEntry(REDUCE, 113); - _actionMap[336][SECONDARY] = ActionEntry(REDUCE, 113); - _actionMap[336][SYSSIZE] = ActionEntry(REDUCE, 113); - _actionMap[336][TMPSIZE] = ActionEntry(REDUCE, 113); - _actionMap[336][LOGSIZE] = ActionEntry(REDUCE, 113); - _actionMap[336][LOGNUM] = ActionEntry(REDUCE, 113); - _actionMap[336][SORTAREASIZE] = ActionEntry(REDUCE, 113); - _actionMap[336][TSROOT] = ActionEntry(REDUCE, 113); - _actionMap[336][TSTICKET] = ActionEntry(REDUCE, 113); + _actionMap[335][SEMICOLON] = ActionEntry(REDUCE, 113); + _actionMap[335][PRIMARY] = ActionEntry(REDUCE, 113); + _actionMap[335][SECONDARY] = ActionEntry(REDUCE, 113); + _actionMap[335][SYSSIZE] = ActionEntry(REDUCE, 113); + _actionMap[335][TMPSIZE] = ActionEntry(REDUCE, 113); + _actionMap[335][LOGSIZE] = ActionEntry(REDUCE, 113); + _actionMap[335][LOGNUM] = ActionEntry(REDUCE, 113); + _actionMap[335][SORTAREASIZE] = ActionEntry(REDUCE, 113); + _actionMap[335][TSROOT] = ActionEntry(REDUCE, 113); + _actionMap[335][TSTICKET] = ActionEntry(REDUCE, 113); + _actionMap[336][SEMICOLON] = ActionEntry(REDUCE, 109); + _actionMap[336][PRIMARY] = ActionEntry(REDUCE, 109); + _actionMap[336][SECONDARY] = ActionEntry(REDUCE, 109); + _actionMap[336][SYSSIZE] = ActionEntry(REDUCE, 109); + _actionMap[336][TMPSIZE] = ActionEntry(REDUCE, 109); + _actionMap[336][LOGSIZE] = ActionEntry(REDUCE, 109); + _actionMap[336][LOGNUM] = ActionEntry(REDUCE, 109); + _actionMap[336][SORTAREASIZE] = ActionEntry(REDUCE, 109); + _actionMap[336][TSROOT] = ActionEntry(REDUCE, 109); + _actionMap[336][TSTICKET] = ActionEntry(REDUCE, 109); + _actionMap[337][SEMICOLON] = ActionEntry(REDUCE, 110); + _actionMap[337][PRIMARY] = ActionEntry(REDUCE, 110); + _actionMap[337][SECONDARY] = ActionEntry(REDUCE, 110); + _actionMap[337][SYSSIZE] = ActionEntry(REDUCE, 110); + _actionMap[337][TMPSIZE] = ActionEntry(REDUCE, 110); + _actionMap[337][LOGSIZE] = ActionEntry(REDUCE, 110); + _actionMap[337][LOGNUM] = ActionEntry(REDUCE, 110); + _actionMap[337][SORTAREASIZE] = ActionEntry(REDUCE, 110); + _actionMap[337][TSROOT] = ActionEntry(REDUCE, 110); + _actionMap[337][TSTICKET] = ActionEntry(REDUCE, 110); + _actionMap[338][SEMICOLON] = ActionEntry(REDUCE, 114); + _actionMap[338][PRIMARY] = ActionEntry(REDUCE, 114); + _actionMap[338][SECONDARY] = ActionEntry(REDUCE, 114); + _actionMap[338][SYSSIZE] = ActionEntry(REDUCE, 114); + _actionMap[338][TMPSIZE] = ActionEntry(REDUCE, 114); + _actionMap[338][LOGSIZE] = ActionEntry(REDUCE, 114); + _actionMap[338][LOGNUM] = ActionEntry(REDUCE, 114); + _actionMap[338][SORTAREASIZE] = ActionEntry(REDUCE, 114); + _actionMap[338][TSROOT] = ActionEntry(REDUCE, 114); + _actionMap[338][TSTICKET] = ActionEntry(REDUCE, 114); } void CegoAdm::loadParser2() { - _actionMap[337][STRINGVAL] = ActionEntry(SHIFT, 349); - _actionMap[338][SEMICOLON] = ActionEntry(REDUCE, 84); - _actionMap[339][STRINGVAL] = ActionEntry(SHIFT, 350); - _actionMap[340][NOLOGGING] = ActionEntry(SHIFT, 342); - _actionMap[340][SEMICOLON] = ActionEntry(REDUCE, 93); - _jumpMap[340][LogOpt] = 351; - _actionMap[341][SEMICOLON] = ActionEntry(REDUCE, 86); - _actionMap[342][SEMICOLON] = ActionEntry(REDUCE, 92); - _actionMap[343][IDENTIFIER] = ActionEntry(SHIFT, 352); - _actionMap[344][KSEP] = ActionEntry(REDUCE, 54); - _actionMap[344][TO] = ActionEntry(REDUCE, 54); - _actionMap[345][KSEP] = ActionEntry(REDUCE, 57); - _actionMap[345][TO] = ActionEntry(REDUCE, 57); - _actionMap[346][KSEP] = ActionEntry(REDUCE, 58); - _actionMap[346][TO] = ActionEntry(REDUCE, 58); - _actionMap[347][KSEP] = ActionEntry(REDUCE, 56); - _actionMap[347][TO] = ActionEntry(REDUCE, 56); - _actionMap[296][IDENTIFIER] = ActionEntry(SHIFT, 326); - _actionMap[297][SEMICOLON] = ActionEntry(REDUCE, 43); - _actionMap[298][TO] = ActionEntry(SHIFT, 327); - _actionMap[299][KEEP] = ActionEntry(REDUCE, 94); - _actionMap[299][SEMICOLON] = ActionEntry(REDUCE, 94); - _actionMap[300][STRINGVAL] = ActionEntry(SHIFT, 328); - _actionMap[301][INTVAL] = ActionEntry(SHIFT, 329); - _actionMap[302][INTVAL] = ActionEntry(SHIFT, 330); - _actionMap[303][STRINGVAL] = ActionEntry(SHIFT, 331); - _actionMap[304][STRINGVAL] = ActionEntry(SHIFT, 332); - _actionMap[305][INTVAL] = ActionEntry(SHIFT, 333); - _actionMap[306][INTVAL] = ActionEntry(SHIFT, 334); + _actionMap[339][STRINGVAL] = ActionEntry(SHIFT, 351); + _actionMap[340][SEMICOLON] = ActionEntry(REDUCE, 83); + _actionMap[341][STRINGVAL] = ActionEntry(SHIFT, 352); + _actionMap[342][NOLOGGING] = ActionEntry(SHIFT, 344); + _actionMap[342][SEMICOLON] = ActionEntry(REDUCE, 94); + _jumpMap[342][LogOpt] = 353; + _actionMap[343][SEMICOLON] = ActionEntry(REDUCE, 85); + _actionMap[344][SEMICOLON] = ActionEntry(REDUCE, 93); + _actionMap[345][IDENTIFIER] = ActionEntry(SHIFT, 354); + _actionMap[346][KSEP] = ActionEntry(REDUCE, 54); + _actionMap[346][TO] = ActionEntry(REDUCE, 54); + _actionMap[347][KSEP] = ActionEntry(REDUCE, 57); + _actionMap[347][TO] = ActionEntry(REDUCE, 57); + _actionMap[348][KSEP] = ActionEntry(REDUCE, 58); + _actionMap[348][TO] = ActionEntry(REDUCE, 58); + _actionMap[349][KSEP] = ActionEntry(REDUCE, 56); + _actionMap[349][TO] = ActionEntry(REDUCE, 56); + _actionMap[299][IDENTIFIER] = ActionEntry(SHIFT, 328); + _actionMap[300][SEMICOLON] = ActionEntry(REDUCE, 43); + _actionMap[301][TO] = ActionEntry(SHIFT, 329); + _actionMap[302][STRINGVAL] = ActionEntry(SHIFT, 330); + _actionMap[303][INTVAL] = ActionEntry(SHIFT, 331); + _actionMap[304][INTVAL] = ActionEntry(SHIFT, 332); + _actionMap[305][STRINGVAL] = ActionEntry(SHIFT, 333); + _actionMap[306][STRINGVAL] = ActionEntry(SHIFT, 334); _actionMap[307][INTVAL] = ActionEntry(SHIFT, 335); - _actionMap[308][STRINGVAL] = ActionEntry(SHIFT, 336); - _actionMap[309][SEMICOLON] = ActionEntry(REDUCE, 88); - _actionMap[310][TO] = ActionEntry(SHIFT, 337); - _actionMap[311][STRINGVAL] = ActionEntry(SHIFT, 338); - _actionMap[312][SEMICOLON] = ActionEntry(REDUCE, 83); - _actionMap[313][FROM] = ActionEntry(SHIFT, 339); - _actionMap[314][STRINGVAL] = ActionEntry(SHIFT, 340); - _actionMap[315][NOLOGGING] = ActionEntry(SHIFT, 342); - _actionMap[315][SEMICOLON] = ActionEntry(REDUCE, 93); - _jumpMap[315][LogOpt] = 341; - _actionMap[316][SEMICOLON] = ActionEntry(REDUCE, 46); - _actionMap[317][SEMICOLON] = ActionEntry(REDUCE, 36); - _actionMap[318][SEMICOLON] = ActionEntry(REDUCE, 35); - _actionMap[319][SEMICOLON] = ActionEntry(REDUCE, 59); - _actionMap[320][ROLE] = ActionEntry(SHIFT, 343); - _actionMap[321][TABLESET] = ActionEntry(SHIFT, 286); - _actionMap[321][FILTER] = ActionEntry(SHIFT, 284); - _actionMap[321][RIGHT] = ActionEntry(SHIFT, 285); - _jumpMap[321][PermEntry] = 344; - _actionMap[322][STRINGVAL] = ActionEntry(SHIFT, 345); + _actionMap[308][INTVAL] = ActionEntry(SHIFT, 336); + _actionMap[309][INTVAL] = ActionEntry(SHIFT, 337); + _actionMap[310][STRINGVAL] = ActionEntry(SHIFT, 338); + _actionMap[311][SEMICOLON] = ActionEntry(REDUCE, 87); + _actionMap[312][TO] = ActionEntry(SHIFT, 339); + _actionMap[313][STRINGVAL] = ActionEntry(SHIFT, 340); + _actionMap[314][SEMICOLON] = ActionEntry(REDUCE, 82); + _actionMap[315][FROM] = ActionEntry(SHIFT, 341); + _actionMap[316][STRINGVAL] = ActionEntry(SHIFT, 342); + _actionMap[317][NOLOGGING] = ActionEntry(SHIFT, 344); + _actionMap[317][SEMICOLON] = ActionEntry(REDUCE, 94); + _jumpMap[317][LogOpt] = 343; + _actionMap[318][SEMICOLON] = ActionEntry(REDUCE, 46); + _actionMap[319][SEMICOLON] = ActionEntry(REDUCE, 36); + _actionMap[320][SEMICOLON] = ActionEntry(REDUCE, 35); + _actionMap[321][SEMICOLON] = ActionEntry(REDUCE, 59); + _actionMap[322][ROLE] = ActionEntry(SHIFT, 345); + _actionMap[323][TABLESET] = ActionEntry(SHIFT, 288); + _actionMap[323][FILTER] = ActionEntry(SHIFT, 286); + _actionMap[323][RIGHT] = ActionEntry(SHIFT, 287); + _jumpMap[323][PermEntry] = 346; + _actionMap[324][STRINGVAL] = ActionEntry(SHIFT, 347); + _actionMap[325][IDENTIFIER] = ActionEntry(SHIFT, 348); + _actionMap[326][IDENTIFIER] = ActionEntry(SHIFT, 349); } void CegoAdm::loadParser3() { - _actionMap[323][IDENTIFIER] = ActionEntry(SHIFT, 346); - _actionMap[324][IDENTIFIER] = ActionEntry(SHIFT, 347); - _actionMap[325][SEMICOLON] = ActionEntry(REDUCE, 69); - _actionMap[242][TO] = ActionEntry(SHIFT, 296); - _actionMap[243][STRINGVAL] = ActionEntry(SHIFT, 297); - _actionMap[244][INTVAL] = ActionEntry(SHIFT, 298); - _actionMap[245][SEMICOLON] = ActionEntry(REDUCE, 47); - _actionMap[246][SEMICOLON] = ActionEntry(REDUCE, 66); - _actionMap[247][STRINGVAL] = ActionEntry(SHIFT, 299); - _actionMap[248][SEMICOLON] = ActionEntry(REDUCE, 104); - _actionMap[248][PRIMARY] = ActionEntry(REDUCE, 104); - _actionMap[248][SECONDARY] = ActionEntry(REDUCE, 104); - _actionMap[248][SYSSIZE] = ActionEntry(REDUCE, 104); - _actionMap[248][TMPSIZE] = ActionEntry(REDUCE, 104); - _actionMap[248][LOGSIZE] = ActionEntry(REDUCE, 104); - _actionMap[248][LOGNUM] = ActionEntry(REDUCE, 104); - _actionMap[248][SORTAREASIZE] = ActionEntry(REDUCE, 104); - _actionMap[248][TSROOT] = ActionEntry(REDUCE, 104); - _actionMap[248][TSTICKET] = ActionEntry(REDUCE, 104); - _actionMap[249][EQU] = ActionEntry(SHIFT, 300); - _actionMap[250][EQU] = ActionEntry(SHIFT, 301); + _actionMap[327][MESSAGE] = ActionEntry(REDUCE, 89); + _actionMap[327][KEEP] = ActionEntry(REDUCE, 89); + _actionMap[327][SEMICOLON] = ActionEntry(REDUCE, 89); + _actionMap[245][TO] = ActionEntry(SHIFT, 299); + _actionMap[246][STRINGVAL] = ActionEntry(SHIFT, 300); + _actionMap[247][INTVAL] = ActionEntry(SHIFT, 301); + _actionMap[248][SEMICOLON] = ActionEntry(REDUCE, 47); + _actionMap[249][SEMICOLON] = ActionEntry(REDUCE, 66); + _actionMap[250][SEMICOLON] = ActionEntry(REDUCE, 105); + _actionMap[250][PRIMARY] = ActionEntry(REDUCE, 105); + _actionMap[250][SECONDARY] = ActionEntry(REDUCE, 105); + _actionMap[250][SYSSIZE] = ActionEntry(REDUCE, 105); + _actionMap[250][TMPSIZE] = ActionEntry(REDUCE, 105); + _actionMap[250][LOGSIZE] = ActionEntry(REDUCE, 105); + _actionMap[250][LOGNUM] = ActionEntry(REDUCE, 105); + _actionMap[250][SORTAREASIZE] = ActionEntry(REDUCE, 105); + _actionMap[250][TSROOT] = ActionEntry(REDUCE, 105); + _actionMap[250][TSTICKET] = ActionEntry(REDUCE, 105); _actionMap[251][EQU] = ActionEntry(SHIFT, 302); _actionMap[252][EQU] = ActionEntry(SHIFT, 303); _actionMap[253][EQU] = ActionEntry(SHIFT, 304); @@ -2223,96 +2220,104 @@ _actionMap[255][EQU] = ActionEntry(SHIFT, 306); _actionMap[256][EQU] = ActionEntry(SHIFT, 307); _actionMap[257][EQU] = ActionEntry(SHIFT, 308); - _actionMap[258][SEMICOLON] = ActionEntry(REDUCE, 122); - _actionMap[259][SEMICOLON] = ActionEntry(REDUCE, 121); - _actionMap[260][SEMICOLON] = ActionEntry(REDUCE, 67); - _actionMap[261][KEEP] = ActionEntry(SHIFT, 262); - _actionMap[261][SEMICOLON] = ActionEntry(REDUCE, 89); - _jumpMap[261][KeepTicketOpt] = 260; - _actionMap[262][TSTICKET] = ActionEntry(SHIFT, 309); - _actionMap[263][IDENTIFIER] = ActionEntry(SHIFT, 310); - _actionMap[264][TO] = ActionEntry(SHIFT, 311); - _actionMap[265][STRINGVAL] = ActionEntry(SHIFT, 312); - _actionMap[266][IDENTIFIER] = ActionEntry(SHIFT, 313); - _actionMap[267][FROM] = ActionEntry(SHIFT, 314); - _actionMap[268][STRINGVAL] = ActionEntry(SHIFT, 315); - _actionMap[269][STRINGVAL] = ActionEntry(SHIFT, 316); + _actionMap[258][EQU] = ActionEntry(SHIFT, 309); + _actionMap[259][EQU] = ActionEntry(SHIFT, 310); + _actionMap[260][SEMICOLON] = ActionEntry(REDUCE, 123); + _actionMap[261][SEMICOLON] = ActionEntry(REDUCE, 122); + _actionMap[262][SEMICOLON] = ActionEntry(REDUCE, 67); + _actionMap[263][KEEP] = ActionEntry(SHIFT, 264); + _actionMap[263][SEMICOLON] = ActionEntry(REDUCE, 88); + _jumpMap[263][KeepTicketOpt] = 262; + _actionMap[264][TSTICKET] = ActionEntry(SHIFT, 311); + _actionMap[265][IDENTIFIER] = ActionEntry(SHIFT, 312); + _actionMap[266][TO] = ActionEntry(SHIFT, 313); + _actionMap[267][STRINGVAL] = ActionEntry(SHIFT, 314); + _actionMap[268][IDENTIFIER] = ActionEntry(SHIFT, 315); + _actionMap[269][FROM] = ActionEntry(SHIFT, 316); _actionMap[270][STRINGVAL] = ActionEntry(SHIFT, 317); _actionMap[271][STRINGVAL] = ActionEntry(SHIFT, 318); - _actionMap[272][SEMICOLON] = ActionEntry(REDUCE, 65); - _actionMap[273][IDENTIFIER] = ActionEntry(SHIFT, 319); - _actionMap[274][SEMICOLON] = ActionEntry(REDUCE, 48); - _actionMap[275][SEMICOLON] = ActionEntry(REDUCE, 115); - _actionMap[276][SEMICOLON] = ActionEntry(REDUCE, 78); - _actionMap[277][SEMICOLON] = ActionEntry(REDUCE, 74); + _actionMap[272][STRINGVAL] = ActionEntry(SHIFT, 319); + _actionMap[273][STRINGVAL] = ActionEntry(SHIFT, 320); + _actionMap[274][SEMICOLON] = ActionEntry(REDUCE, 65); + _actionMap[275][IDENTIFIER] = ActionEntry(SHIFT, 321); + _actionMap[276][SEMICOLON] = ActionEntry(REDUCE, 48); + _actionMap[277][SEMICOLON] = ActionEntry(REDUCE, 116); + _actionMap[278][SEMICOLON] = ActionEntry(REDUCE, 77); + _actionMap[279][SEMICOLON] = ActionEntry(REDUCE, 73); + _actionMap[280][SEMICOLON] = ActionEntry(REDUCE, 72); } void CegoAdm::loadParser4() { - _actionMap[278][SEMICOLON] = ActionEntry(REDUCE, 73); - _actionMap[279][SEMICOLON] = ActionEntry(REDUCE, 90); - _actionMap[280][SEMICOLON] = ActionEntry(REDUCE, 79); - _actionMap[281][SEMICOLON] = ActionEntry(REDUCE, 80); - _actionMap[282][TO] = ActionEntry(SHIFT, 320); - _actionMap[282][KSEP] = ActionEntry(SHIFT, 321); - _actionMap[283][KSEP] = ActionEntry(REDUCE, 55); - _actionMap[283][TO] = ActionEntry(REDUCE, 55); - _actionMap[284][EQU] = ActionEntry(SHIFT, 322); - _actionMap[285][EQU] = ActionEntry(SHIFT, 323); + _actionMap[281][MESSAGE] = ActionEntry(REDUCE, 91); + _actionMap[281][KEEP] = ActionEntry(REDUCE, 91); + _actionMap[281][SEMICOLON] = ActionEntry(REDUCE, 91); + _actionMap[282][SEMICOLON] = ActionEntry(REDUCE, 78); + _actionMap[283][SEMICOLON] = ActionEntry(REDUCE, 79); + _actionMap[284][TO] = ActionEntry(SHIFT, 322); + _actionMap[284][KSEP] = ActionEntry(SHIFT, 323); + _actionMap[285][KSEP] = ActionEntry(REDUCE, 55); + _actionMap[285][TO] = ActionEntry(REDUCE, 55); _actionMap[286][EQU] = ActionEntry(SHIFT, 324); - _actionMap[287][SEMICOLON] = ActionEntry(REDUCE, 81); - _actionMap[288][SEMICOLON] = ActionEntry(REDUCE, 75); - _actionMap[289][SEMICOLON] = ActionEntry(REDUCE, 76); - _actionMap[290][SEMICOLON] = ActionEntry(REDUCE, 77); - _actionMap[291][SEMICOLON] = ActionEntry(REDUCE, 119); - _actionMap[292][SEMICOLON] = ActionEntry(REDUCE, 96); - _actionMap[292][CLEANUP] = ActionEntry(REDUCE, 96); - _actionMap[292][FORCELOAD] = ActionEntry(REDUCE, 96); - _actionMap[293][SEMICOLON] = ActionEntry(REDUCE, 98); - _actionMap[293][CLEANUP] = ActionEntry(REDUCE, 98); - _actionMap[293][FORCELOAD] = ActionEntry(REDUCE, 98); - _actionMap[294][SEMICOLON] = ActionEntry(REDUCE, 99); - _actionMap[294][CLEANUP] = ActionEntry(REDUCE, 99); - _actionMap[294][FORCELOAD] = ActionEntry(REDUCE, 99); - _actionMap[295][TIMEOUT] = ActionEntry(SHIFT, 227); - _actionMap[295][SEMICOLON] = ActionEntry(REDUCE, 91); - _jumpMap[295][TimeoutOpt] = 325; + _actionMap[287][EQU] = ActionEntry(SHIFT, 325); + _actionMap[288][EQU] = ActionEntry(SHIFT, 326); + _actionMap[289][SEMICOLON] = ActionEntry(REDUCE, 80); + _actionMap[290][SEMICOLON] = ActionEntry(REDUCE, 74); + _actionMap[291][SEMICOLON] = ActionEntry(REDUCE, 75); + _actionMap[292][SEMICOLON] = ActionEntry(REDUCE, 76); + _actionMap[293][SEMICOLON] = ActionEntry(REDUCE, 120); + _actionMap[294][SEMICOLON] = ActionEntry(REDUCE, 97); + _actionMap[294][CLEANUP] = ActionEntry(REDUCE, 97); + _actionMap[294][FORCELOAD] = ActionEntry(REDUCE, 97); + _actionMap[295][SEMICOLON] = ActionEntry(REDUCE, 99); + _actionMap[295][CLEANUP] = ActionEntry(REDUCE, 99); + _actionMap[295][FORCELOAD] = ActionEntry(REDUCE, 99); + _actionMap[296][SEMICOLON] = ActionEntry(REDUCE, 100); + _actionMap[296][CLEANUP] = ActionEntry(REDUCE, 100); + _actionMap[296][FORCELOAD] = ActionEntry(REDUCE, 100); + _actionMap[297][KEEP] = ActionEntry(REDUCE, 95); + _actionMap[297][SEMICOLON] = ActionEntry(REDUCE, 95); + _actionMap[298][TIMEOUT] = ActionEntry(SHIFT, 227); + _actionMap[298][MESSAGE] = ActionEntry(REDUCE, 92); + _actionMap[298][KEEP] = ActionEntry(REDUCE, 92); + _actionMap[298][SEMICOLON] = ActionEntry(REDUCE, 92); + _jumpMap[298][TimeoutOpt] = 327; _actionMap[188][SEMICOLON] = ActionEntry(REDUCE, 25); - _actionMap[189][STRINGVAL] = ActionEntry(SHIFT, 242); - _actionMap[190][BY] = ActionEntry(SHIFT, 243); - _actionMap[191][SIZE] = ActionEntry(SHIFT, 244); - _actionMap[192][IDENTIFIER] = ActionEntry(SHIFT, 245); - _actionMap[193][MESSAGE] = ActionEntry(SHIFT, 247); - _actionMap[193][SEMICOLON] = ActionEntry(REDUCE, 95); - _jumpMap[193][MsgOption] = 246; + _actionMap[189][STRINGVAL] = ActionEntry(SHIFT, 245); + _actionMap[190][BY] = ActionEntry(SHIFT, 246); + _actionMap[191][SIZE] = ActionEntry(SHIFT, 247); + _actionMap[192][IDENTIFIER] = ActionEntry(SHIFT, 248); + _actionMap[193][MESSAGE] = ActionEntry(SHIFT, 241); + _actionMap[193][SEMICOLON] = ActionEntry(REDUCE, 96); + _jumpMap[193][MsgOption] = 249; _actionMap[194][SEMICOLON] = ActionEntry(REDUCE, 27); - _actionMap[194][PRIMARY] = ActionEntry(SHIFT, 252); - _actionMap[194][SECONDARY] = ActionEntry(SHIFT, 253); - _actionMap[194][SYSSIZE] = ActionEntry(SHIFT, 255); - _actionMap[194][TMPSIZE] = ActionEntry(SHIFT, 256); - _actionMap[194][LOGSIZE] = ActionEntry(SHIFT, 251); - _actionMap[194][LOGNUM] = ActionEntry(SHIFT, 250); - _actionMap[194][SORTAREASIZE] = ActionEntry(SHIFT, 254); - _actionMap[194][TSROOT] = ActionEntry(SHIFT, 257); - _actionMap[194][TSTICKET] = ActionEntry(SHIFT, 249); - _jumpMap[194][Attr] = 248; - _actionMap[195][SEMICOLON] = ActionEntry(REDUCE, 63); - _actionMap[196][IDENTIFIER] = ActionEntry(SHIFT, 258); - _actionMap[197][IDENTIFIER] = ActionEntry(SHIFT, 259); + _actionMap[194][PRIMARY] = ActionEntry(SHIFT, 254); + _actionMap[194][SECONDARY] = ActionEntry(SHIFT, 255); + _actionMap[194][SYSSIZE] = ActionEntry(SHIFT, 257); + _actionMap[194][TMPSIZE] = ActionEntry(SHIFT, 258); + _actionMap[194][LOGSIZE] = ActionEntry(SHIFT, 253); + _actionMap[194][LOGNUM] = ActionEntry(SHIFT, 252); + _actionMap[194][SORTAREASIZE] = ActionEntry(SHIFT, 256); + _actionMap[194][TSROOT] = ActionEntry(SHIFT, 259); } void CegoAdm::loadParser5() { + _actionMap[194][TSTICKET] = ActionEntry(SHIFT, 251); + _jumpMap[194][Attr] = 250; + _actionMap[195][SEMICOLON] = ActionEntry(REDUCE, 63); + _actionMap[196][IDENTIFIER] = ActionEntry(SHIFT, 260); + _actionMap[197][IDENTIFIER] = ActionEntry(SHIFT, 261); _actionMap[198][SEMICOLON] = ActionEntry(REDUCE, 62); - _actionMap[199][MESSAGE] = ActionEntry(SHIFT, 247); - _actionMap[199][KEEP] = ActionEntry(REDUCE, 95); - _actionMap[199][SEMICOLON] = ActionEntry(REDUCE, 95); - _jumpMap[199][MsgOption] = 261; - _jumpMap[199][KeepTicketOpt] = 260; - _actionMap[200][FROM] = ActionEntry(SHIFT, 263); - _actionMap[201][IDENTIFIER] = ActionEntry(SHIFT, 264); - _actionMap[202][TO] = ActionEntry(SHIFT, 265); - _actionMap[203][TO] = ActionEntry(SHIFT, 266); - _actionMap[204][IDENTIFIER] = ActionEntry(SHIFT, 267); - _actionMap[205][FROM] = ActionEntry(SHIFT, 268); + _actionMap[199][MESSAGE] = ActionEntry(SHIFT, 241); + _actionMap[199][KEEP] = ActionEntry(REDUCE, 96); + _actionMap[199][SEMICOLON] = ActionEntry(REDUCE, 96); + _jumpMap[199][MsgOption] = 263; + _jumpMap[199][KeepTicketOpt] = 262; + _actionMap[200][FROM] = ActionEntry(SHIFT, 265); + _actionMap[201][IDENTIFIER] = ActionEntry(SHIFT, 266); + _actionMap[202][TO] = ActionEntry(SHIFT, 267); + _actionMap[203][TO] = ActionEntry(SHIFT, 268); + _actionMap[204][IDENTIFIER] = ActionEntry(SHIFT, 269); + _actionMap[205][FROM] = ActionEntry(SHIFT, 270); _actionMap[206][SEMICOLON] = ActionEntry(REDUCE, 9); _actionMap[207][SEMICOLON] = ActionEntry(REDUCE, 14); _actionMap[208][SEMICOLON] = ActionEntry(REDUCE, 15); @@ -2320,45 +2325,50 @@ _actionMap[210][SEMICOLON] = ActionEntry(REDUCE, 10); _actionMap[211][SEMICOLON] = ActionEntry(REDUCE, 11); _actionMap[212][SEMICOLON] = ActionEntry(REDUCE, 24); - _actionMap[213][BY] = ActionEntry(SHIFT, 269); - _actionMap[214][TO] = ActionEntry(SHIFT, 270); - _actionMap[215][TO] = ActionEntry(SHIFT, 271); - _actionMap[216][IDENTIFIER] = ActionEntry(SHIFT, 272); - _actionMap[217][ROLE] = ActionEntry(SHIFT, 273); - _actionMap[218][IDENTIFIER] = ActionEntry(SHIFT, 274); - _actionMap[219][SEMICOLON] = ActionEntry(REDUCE, 70); - _actionMap[220][STRINGVAL] = ActionEntry(SHIFT, 275); + _actionMap[213][BY] = ActionEntry(SHIFT, 271); + _actionMap[214][TO] = ActionEntry(SHIFT, 272); + _actionMap[215][TO] = ActionEntry(SHIFT, 273); + _actionMap[216][IDENTIFIER] = ActionEntry(SHIFT, 274); + _actionMap[217][ROLE] = ActionEntry(SHIFT, 275); + _actionMap[218][IDENTIFIER] = ActionEntry(SHIFT, 276); + _actionMap[219][SEMICOLON] = ActionEntry(REDUCE, 69); + _actionMap[220][STRINGVAL] = ActionEntry(SHIFT, 277); _actionMap[221][SEMICOLON] = ActionEntry(REDUCE, 16); _actionMap[222][SEMICOLON] = ActionEntry(REDUCE, 26); - _actionMap[223][IDENTIFIER] = ActionEntry(SHIFT, 276); - _actionMap[224][IDENTIFIER] = ActionEntry(SHIFT, 277); - _actionMap[225][IDENTIFIER] = ActionEntry(SHIFT, 278); - _actionMap[226][SEMICOLON] = ActionEntry(REDUCE, 71); - _actionMap[227][INTVAL] = ActionEntry(SHIFT, 279); - _actionMap[228][IDENTIFIER] = ActionEntry(SHIFT, 280); - _actionMap[229][IDENTIFIER] = ActionEntry(SHIFT, 281); - _actionMap[230][TABLESET] = ActionEntry(SHIFT, 286); - _actionMap[230][FILTER] = ActionEntry(SHIFT, 284); - _actionMap[230][RIGHT] = ActionEntry(SHIFT, 285); - _jumpMap[230][PermEntry] = 283; - _jumpMap[230][PermList] = 282; - _actionMap[231][IDENTIFIER] = ActionEntry(SHIFT, 287); - _actionMap[232][IDENTIFIER] = ActionEntry(SHIFT, 288); - _actionMap[233][IDENTIFIER] = ActionEntry(SHIFT, 289); - _actionMap[234][IDENTIFIER] = ActionEntry(SHIFT, 290); - _actionMap[235][IDENTIFIER] = ActionEntry(SHIFT, 291); - _actionMap[236][SEMICOLON] = ActionEntry(REDUCE, 29); - _actionMap[236][CLEANUP] = ActionEntry(SHIFT, 293); - _actionMap[236][FORCELOAD] = ActionEntry(SHIFT, 294); - _jumpMap[236][StartOpt] = 292; + _actionMap[223][IDENTIFIER] = ActionEntry(SHIFT, 278); + _actionMap[224][IDENTIFIER] = ActionEntry(SHIFT, 279); + _actionMap[225][IDENTIFIER] = ActionEntry(SHIFT, 280); + _actionMap[226][SEMICOLON] = ActionEntry(REDUCE, 70); + _actionMap[227][INTVAL] = ActionEntry(SHIFT, 281); + _actionMap[228][IDENTIFIER] = ActionEntry(SHIFT, 282); + _actionMap[229][IDENTIFIER] = ActionEntry(SHIFT, 283); + _actionMap[230][TABLESET] = ActionEntry(SHIFT, 288); + _actionMap[230][FILTER] = ActionEntry(SHIFT, 286); + _actionMap[230][RIGHT] = ActionEntry(SHIFT, 287); + _jumpMap[230][PermEntry] = 285; + _jumpMap[230][PermList] = 284; + _actionMap[231][IDENTIFIER] = ActionEntry(SHIFT, 289); + _actionMap[232][IDENTIFIER] = ActionEntry(SHIFT, 290); + _actionMap[233][IDENTIFIER] = ActionEntry(SHIFT, 291); + _actionMap[234][IDENTIFIER] = ActionEntry(SHIFT, 292); } void CegoAdm::loadParser6() { + _actionMap[235][IDENTIFIER] = ActionEntry(SHIFT, 293); + _actionMap[236][SEMICOLON] = ActionEntry(REDUCE, 29); + _actionMap[236][CLEANUP] = ActionEntry(SHIFT, 295); + _actionMap[236][FORCELOAD] = ActionEntry(SHIFT, 296); + _jumpMap[236][StartOpt] = 294; _actionMap[237][SEMICOLON] = ActionEntry(REDUCE, 34); _actionMap[238][SEMICOLON] = ActionEntry(REDUCE, 33); - _actionMap[239][STRINGVAL] = ActionEntry(SHIFT, 295); - _actionMap[240][SEMICOLON] = ActionEntry(REDUCE, 61); - _actionMap[241][SEMICOLON] = ActionEntry(REDUCE, 60); + _actionMap[239][MESSAGE] = ActionEntry(SHIFT, 241); + _actionMap[239][SEMICOLON] = ActionEntry(REDUCE, 96); + _jumpMap[239][MsgOption] = 240; + _actionMap[240][SEMICOLON] = ActionEntry(REDUCE, 68); + _actionMap[241][STRINGVAL] = ActionEntry(SHIFT, 297); + _actionMap[242][STRINGVAL] = ActionEntry(SHIFT, 298); + _actionMap[243][SEMICOLON] = ActionEntry(REDUCE, 61); + _actionMap[244][SEMICOLON] = ActionEntry(REDUCE, 60); _actionMap[121][INTVAL] = ActionEntry(SHIFT, 188); _actionMap[122][PATH] = ActionEntry(SHIFT, 189); _actionMap[123][IDENTIFIED] = ActionEntry(SHIFT, 190); @@ -2366,21 +2376,21 @@ _actionMap[125][TO] = ActionEntry(SHIFT, 192); _actionMap[126][IDENTIFIER] = ActionEntry(SHIFT, 193); _actionMap[127][SEMICOLON] = ActionEntry(REDUCE, 40); - _actionMap[128][SEMICOLON] = ActionEntry(REDUCE, 120); + _actionMap[128][SEMICOLON] = ActionEntry(REDUCE, 121); _actionMap[129][SEMICOLON] = ActionEntry(REDUCE, 31); _actionMap[130][SEMICOLON] = ActionEntry(REDUCE, 42); _actionMap[131][SEMICOLON] = ActionEntry(REDUCE, 51); _actionMap[132][SEMICOLON] = ActionEntry(REDUCE, 28); - _actionMap[133][PRIMARY] = ActionEntry(REDUCE, 105); - _actionMap[133][SECONDARY] = ActionEntry(REDUCE, 105); - _actionMap[133][SYSSIZE] = ActionEntry(REDUCE, 105); - _actionMap[133][TMPSIZE] = ActionEntry(REDUCE, 105); - _actionMap[133][LOGSIZE] = ActionEntry(REDUCE, 105); - _actionMap[133][LOGNUM] = ActionEntry(REDUCE, 105); - _actionMap[133][SORTAREASIZE] = ActionEntry(REDUCE, 105); - _actionMap[133][TSROOT] = ActionEntry(REDUCE, 105); - _actionMap[133][TSTICKET] = ActionEntry(REDUCE, 105); - _actionMap[133][SEMICOLON] = ActionEntry(REDUCE, 105); + _actionMap[133][PRIMARY] = ActionEntry(REDUCE, 106); + _actionMap[133][SECONDARY] = ActionEntry(REDUCE, 106); + _actionMap[133][SYSSIZE] = ActionEntry(REDUCE, 106); + _actionMap[133][TMPSIZE] = ActionEntry(REDUCE, 106); + _actionMap[133][LOGSIZE] = ActionEntry(REDUCE, 106); + _actionMap[133][LOGNUM] = ActionEntry(REDUCE, 106); + _actionMap[133][SORTAREASIZE] = ActionEntry(REDUCE, 106); + _actionMap[133][TSROOT] = ActionEntry(REDUCE, 106); + _actionMap[133][TSTICKET] = ActionEntry(REDUCE, 106); + _actionMap[133][SEMICOLON] = ActionEntry(REDUCE, 106); _jumpMap[133][AttrList] = 194; _actionMap[134][IDENTIFIER] = ActionEntry(SHIFT, 195); _actionMap[135][SEMICOLON] = ActionEntry(REDUCE, 52); @@ -2394,6 +2404,9 @@ _actionMap[142][STRUCTURE] = ActionEntry(SHIFT, 201); _actionMap[143][IDENTIFIER] = ActionEntry(SHIFT, 203); _actionMap[144][IDENTIFIER] = ActionEntry(SHIFT, 205); +} +void CegoAdm::loadParser7() +{ _actionMap[144][STRUCTURE] = ActionEntry(SHIFT, 204); _actionMap[145][IDENTIFIER] = ActionEntry(SHIFT, 206); _actionMap[146][IDENTIFIER] = ActionEntry(SHIFT, 207); @@ -2404,9 +2417,6 @@ _actionMap[151][IDENTIFIER] = ActionEntry(SHIFT, 212); _actionMap[152][SEMICOLON] = ActionEntry(REDUCE, 6); _actionMap[153][IDENTIFIED] = ActionEntry(SHIFT, 213); -} -void CegoAdm::loadParser7() -{ _actionMap[154][IDENTIFIER] = ActionEntry(SHIFT, 214); _actionMap[155][IDENTIFIER] = ActionEntry(SHIFT, 215); _actionMap[156][FROM] = ActionEntry(SHIFT, 216); @@ -2415,7 +2425,7 @@ _actionMap[159][SEMICOLON] = ActionEntry(REDUCE, 38); _actionMap[160][SEMICOLON] = ActionEntry(REDUCE, 45); _actionMap[161][TO] = ActionEntry(SHIFT, 220); - _actionMap[161][SEMICOLON] = ActionEntry(REDUCE, 116); + _actionMap[161][SEMICOLON] = ActionEntry(REDUCE, 117); _jumpMap[161][PitOption] = 219; _actionMap[162][IDENTIFIER] = ActionEntry(SHIFT, 221); _actionMap[163][STRINGVAL] = ActionEntry(SHIFT, 222); @@ -2423,7 +2433,7 @@ _actionMap[165][FOR] = ActionEntry(SHIFT, 224); _actionMap[166][FOR] = ActionEntry(SHIFT, 225); _actionMap[167][TIMEOUT] = ActionEntry(SHIFT, 227); - _actionMap[167][SEMICOLON] = ActionEntry(REDUCE, 91); + _actionMap[167][SEMICOLON] = ActionEntry(REDUCE, 92); _jumpMap[167][TimeoutOpt] = 226; _actionMap[168][FOR] = ActionEntry(SHIFT, 228); _actionMap[169][FOR] = ActionEntry(SHIFT, 229); @@ -2435,19 +2445,26 @@ _actionMap[175][IDENTIFIER] = ActionEntry(SHIFT, 235); _actionMap[176][SEMICOLON] = ActionEntry(REDUCE, 50); _actionMap[177][SEMICOLON] = ActionEntry(REDUCE, 2); - _actionMap[178][CLEANUP] = ActionEntry(REDUCE, 97); - _actionMap[178][FORCELOAD] = ActionEntry(REDUCE, 97); - _actionMap[178][SEMICOLON] = ActionEntry(REDUCE, 97); + _actionMap[178][CLEANUP] = ActionEntry(REDUCE, 98); + _actionMap[178][FORCELOAD] = ActionEntry(REDUCE, 98); + _actionMap[178][SEMICOLON] = ActionEntry(REDUCE, 98); _jumpMap[178][StartOptList] = 236; _actionMap[179][SEMICOLON] = ActionEntry(REDUCE, 30); _actionMap[180][IDENTIFIER] = ActionEntry(SHIFT, 237); _actionMap[181][IDENTIFIER] = ActionEntry(SHIFT, 238); _actionMap[182][SEMICOLON] = ActionEntry(REDUCE, 32); - _actionMap[183][SEMICOLON] = ActionEntry(REDUCE, 68); - _actionMap[183][WITH] = ActionEntry(SHIFT, 239); + _actionMap[183][WITH] = ActionEntry(SHIFT, 242); + _actionMap[183][MESSAGE] = ActionEntry(REDUCE, 90); + _actionMap[183][KEEP] = ActionEntry(REDUCE, 90); + _actionMap[183][SEMICOLON] = ActionEntry(REDUCE, 90); +} +void CegoAdm::loadParser8() +{ + _jumpMap[183][MsgOption] = 240; + _jumpMap[183][SyncCmdOption] = 239; _actionMap[184][SEMICOLON] = ActionEntry(REDUCE, 20); - _actionMap[185][IDENTIFIER] = ActionEntry(SHIFT, 240); - _actionMap[186][IDENTIFIER] = ActionEntry(SHIFT, 241); + _actionMap[185][IDENTIFIER] = ActionEntry(SHIFT, 243); + _actionMap[186][IDENTIFIER] = ActionEntry(SHIFT, 244); _actionMap[187][SEMICOLON] = ActionEntry(REDUCE, 41); _actionMap[39][ENDTOKEN] = ActionEntry(ACCEPT, 0); _actionMap[40][THREAD] = ActionEntry(SHIFT, 121); @@ -2457,9 +2474,6 @@ _actionMap[44][IDENTIFIER] = ActionEntry(SHIFT, 125); _actionMap[45][FOR] = ActionEntry(SHIFT, 126); _actionMap[46][IDENTIFIER] = ActionEntry(SHIFT, 127); -} -void CegoAdm::loadParser8() -{ _actionMap[47][STRINGVAL] = ActionEntry(SHIFT, 128); _actionMap[48][IDENTIFIER] = ActionEntry(SHIFT, 129); _actionMap[49][IDENTIFIER] = ActionEntry(SHIFT, 130); @@ -2475,12 +2489,12 @@ _actionMap[59][FOR] = ActionEntry(SHIFT, 140); _actionMap[60][TABLESET] = ActionEntry(SHIFT, 142); _actionMap[60][TABLE] = ActionEntry(SHIFT, 141); - _actionMap[61][TABLESET] = ActionEntry(REDUCE, 101); - _actionMap[61][TABLE] = ActionEntry(REDUCE, 101); - _actionMap[62][TABLESET] = ActionEntry(REDUCE, 102); - _actionMap[62][TABLE] = ActionEntry(REDUCE, 102); - _actionMap[63][TABLESET] = ActionEntry(REDUCE, 100); - _actionMap[63][TABLE] = ActionEntry(REDUCE, 100); + _actionMap[61][TABLESET] = ActionEntry(REDUCE, 102); + _actionMap[61][TABLE] = ActionEntry(REDUCE, 102); + _actionMap[62][TABLESET] = ActionEntry(REDUCE, 103); + _actionMap[62][TABLE] = ActionEntry(REDUCE, 103); + _actionMap[63][TABLESET] = ActionEntry(REDUCE, 101); + _actionMap[63][TABLE] = ActionEntry(REDUCE, 101); _actionMap[64][TABLESET] = ActionEntry(SHIFT, 144); _actionMap[64][TABLE] = ActionEntry(SHIFT, 143); _actionMap[65][FOR] = ActionEntry(SHIFT, 145); @@ -2496,6 +2510,9 @@ _actionMap[75][SEMICOLON] = ActionEntry(REDUCE, 13); _actionMap[76][SEMICOLON] = ActionEntry(REDUCE, 7); _actionMap[77][FOR] = ActionEntry(SHIFT, 151); +} +void CegoAdm::loadParser9() +{ _actionMap[78][SEMICOLON] = ActionEntry(REDUCE, 44); _actionMap[79][LOCK] = ActionEntry(SHIFT, 152); _actionMap[80][IDENTIFIER] = ActionEntry(SHIFT, 153); @@ -2510,9 +2527,6 @@ _actionMap[89][IDENTIFIER] = ActionEntry(SHIFT, 160); _actionMap[90][IDENTIFIER] = ActionEntry(SHIFT, 161); _actionMap[91][FOR] = ActionEntry(SHIFT, 162); -} -void CegoAdm::loadParser9() -{ _actionMap[92][FROM] = ActionEntry(SHIFT, 163); _actionMap[93][STRINGVAL] = ActionEntry(SHIFT, 164); _actionMap[94][INTVAL] = ActionEntry(SHIFT, 165); @@ -2526,7 +2540,7 @@ _actionMap[102][INTVAL] = ActionEntry(SHIFT, 173); _actionMap[103][STRINGVAL] = ActionEntry(SHIFT, 174); _actionMap[104][IDENTIFIER] = ActionEntry(SHIFT, 175); - _actionMap[105][SEMICOLON] = ActionEntry(REDUCE, 72); + _actionMap[105][SEMICOLON] = ActionEntry(REDUCE, 71); _actionMap[106][SEMICOLON] = ActionEntry(REDUCE, 1); _actionMap[107][IDENTIFIER] = ActionEntry(SHIFT, 176); _actionMap[108][IDENTIFIER] = ActionEntry(SHIFT, 177); @@ -2549,6 +2563,9 @@ _actionMap[3][USER] = ActionEntry(SHIFT, 42); _actionMap[3][ARCHLOG] = ActionEntry(SHIFT, 41); _actionMap[4][ROLE] = ActionEntry(SHIFT, 44); +} +void CegoAdm::loadParser10() +{ _actionMap[5][BACKUP] = ActionEntry(SHIFT, 45); _actionMap[6][TABLESET] = ActionEntry(SHIFT, 46); _actionMap[7][TABLESET] = ActionEntry(SHIFT, 48); @@ -2563,23 +2580,20 @@ _actionMap[13][TABLE] = ActionEntry(SHIFT, 57); _actionMap[13][UINDEX] = ActionEntry(SHIFT, 56); _actionMap[14][ARCHLOG] = ActionEntry(SHIFT, 58); -} -void CegoAdm::loadParser10() -{ _actionMap[15][BACKUP] = ActionEntry(SHIFT, 59); _actionMap[16][XML] = ActionEntry(SHIFT, 63); _actionMap[16][BINARY] = ActionEntry(SHIFT, 61); _actionMap[16][PLAIN] = ActionEntry(SHIFT, 62); - _actionMap[16][TABLE] = ActionEntry(REDUCE, 103); - _actionMap[16][TABLESET] = ActionEntry(REDUCE, 103); + _actionMap[16][TABLE] = ActionEntry(REDUCE, 104); + _actionMap[16][TABLESET] = ActionEntry(REDUCE, 104); _jumpMap[16][XPMode] = 60; - _actionMap[17][SEMICOLON] = ActionEntry(REDUCE, 117); - _actionMap[18][SEMICOLON] = ActionEntry(REDUCE, 118); + _actionMap[17][SEMICOLON] = ActionEntry(REDUCE, 118); + _actionMap[18][SEMICOLON] = ActionEntry(REDUCE, 119); _actionMap[19][XML] = ActionEntry(SHIFT, 63); _actionMap[19][BINARY] = ActionEntry(SHIFT, 61); _actionMap[19][PLAIN] = ActionEntry(SHIFT, 62); - _actionMap[19][TABLE] = ActionEntry(REDUCE, 103); - _actionMap[19][TABLESET] = ActionEntry(REDUCE, 103); + _actionMap[19][TABLE] = ActionEntry(REDUCE, 104); + _actionMap[19][TABLESET] = ActionEntry(REDUCE, 104); _jumpMap[19][XPMode] = 64; _actionMap[20][POOL] = ActionEntry(SHIFT, 73); _actionMap[20][IDENTIFIER] = ActionEntry(SHIFT, 79); @@ -2602,6 +2616,9 @@ _actionMap[23][OFF] = ActionEntry(SHIFT, 81); _actionMap[24][SECONDARY] = ActionEntry(SHIFT, 84); _actionMap[24][MEDIATOR] = ActionEntry(SHIFT, 83); +} +void CegoAdm::loadParser11() +{ _actionMap[25][TABLESET] = ActionEntry(SHIFT, 88); _actionMap[25][USER] = ActionEntry(SHIFT, 89); _actionMap[25][ROLE] = ActionEntry(SHIFT, 87); @@ -2616,9 +2633,6 @@ _actionMap[29][CHECKPOINT] = ActionEntry(SHIFT, 94); _actionMap[29][SYSSIZE] = ActionEntry(SHIFT, 101); _actionMap[29][TMPSIZE] = ActionEntry(SHIFT, 102); -} -void CegoAdm::loadParser11() -{ _actionMap[29][TSROOT] = ActionEntry(SHIFT, 103); _actionMap[29][TSTICKET] = ActionEntry(SHIFT, 93); _actionMap[29][LOGNUM] = ActionEntry(SHIFT, 97); @@ -2655,6 +2669,9 @@ _actionMap[0][START_TOK] = ActionEntry(SHIFT, 32); _actionMap[0][STOP_TOK] = ActionEntry(SHIFT, 33); _actionMap[0][COPY] = ActionEntry(SHIFT, 7); +} +void CegoAdm::loadParser12() +{ _actionMap[0][SWITCH] = ActionEntry(SHIFT, 34); _actionMap[0][RELOCATE] = ActionEntry(SHIFT, 24); _actionMap[0][DROP] = ActionEntry(SHIFT, 12); @@ -2669,9 +2686,6 @@ _actionMap[0][TRACE] = ActionEntry(SHIFT, 37); _actionMap[0][ENABLE] = ActionEntry(SHIFT, 14); _actionMap[0][DISABLE] = ActionEntry(SHIFT, 11); -} -void CegoAdm::loadParser12() -{ _actionMap[0][BEGIN_TOKEN] = ActionEntry(SHIFT, 5); _actionMap[0][END_TOKEN] = ActionEntry(SHIFT, 15); _actionMap[0][SYNC] = ActionEntry(SHIFT, 35); @@ -2686,14 +2700,15 @@ } void CegoAdm::loadParser13() { + _prodInfo.Insert(ProdEntry(123, Statement, 5)); _prodInfo.Insert(ProdEntry(122, Statement, 5)); - _prodInfo.Insert(ProdEntry(121, Statement, 5)); - _prodInfo.Insert(ProdEntry(120, Statement, 3)); - _prodInfo.Insert(ProdEntry(119, Statement, 5)); + _prodInfo.Insert(ProdEntry(121, Statement, 3)); + _prodInfo.Insert(ProdEntry(120, Statement, 5)); + _prodInfo.Insert(ProdEntry(119, Statement, 1)); _prodInfo.Insert(ProdEntry(118, Statement, 1)); - _prodInfo.Insert(ProdEntry(117, Statement, 1)); - _prodInfo.Insert(ProdEntry(116, PitOption, 0)); - _prodInfo.Insert(ProdEntry(115, PitOption, 2)); + _prodInfo.Insert(ProdEntry(117, PitOption, 0)); + _prodInfo.Insert(ProdEntry(116, PitOption, 2)); + _prodInfo.Insert(ProdEntry(115, Attr, 3)); _prodInfo.Insert(ProdEntry(114, Attr, 3)); _prodInfo.Insert(ProdEntry(113, Attr, 3)); _prodInfo.Insert(ProdEntry(112, Attr, 3)); @@ -2702,32 +2717,32 @@ _prodInfo.Insert(ProdEntry(109, Attr, 3)); _prodInfo.Insert(ProdEntry(108, Attr, 3)); _prodInfo.Insert(ProdEntry(107, Attr, 3)); - _prodInfo.Insert(ProdEntry(106, Attr, 3)); - _prodInfo.Insert(ProdEntry(105, AttrList, 0)); - _prodInfo.Insert(ProdEntry(104, AttrList, 2)); - _prodInfo.Insert(ProdEntry(103, XPMode, 0)); + _prodInfo.Insert(ProdEntry(106, AttrList, 0)); + _prodInfo.Insert(ProdEntry(105, AttrList, 2)); + _prodInfo.Insert(ProdEntry(104, XPMode, 0)); + _prodInfo.Insert(ProdEntry(103, XPMode, 1)); _prodInfo.Insert(ProdEntry(102, XPMode, 1)); _prodInfo.Insert(ProdEntry(101, XPMode, 1)); - _prodInfo.Insert(ProdEntry(100, XPMode, 1)); + _prodInfo.Insert(ProdEntry(100, StartOpt, 1)); _prodInfo.Insert(ProdEntry(99, StartOpt, 1)); - _prodInfo.Insert(ProdEntry(98, StartOpt, 1)); - _prodInfo.Insert(ProdEntry(97, StartOptList, 0)); - _prodInfo.Insert(ProdEntry(96, StartOptList, 2)); - _prodInfo.Insert(ProdEntry(95, MsgOption, 0)); - _prodInfo.Insert(ProdEntry(94, MsgOption, 2)); - _prodInfo.Insert(ProdEntry(93, LogOpt, 0)); - _prodInfo.Insert(ProdEntry(92, LogOpt, 1)); - _prodInfo.Insert(ProdEntry(91, TimeoutOpt, 0)); - _prodInfo.Insert(ProdEntry(90, TimeoutOpt, 2)); - _prodInfo.Insert(ProdEntry(89, KeepTicketOpt, 0)); - _prodInfo.Insert(ProdEntry(88, KeepTicketOpt, 2)); - _prodInfo.Insert(ProdEntry(87, Statement, 8)); - _prodInfo.Insert(ProdEntry(86, Statement, 7)); - _prodInfo.Insert(ProdEntry(85, Statement, 9)); - _prodInfo.Insert(ProdEntry(84, Statement, 7)); - _prodInfo.Insert(ProdEntry(83, Statement, 6)); - _prodInfo.Insert(ProdEntry(82, Statement, 8)); - _prodInfo.Insert(ProdEntry(81, Statement, 5)); + _prodInfo.Insert(ProdEntry(98, StartOptList, 0)); + _prodInfo.Insert(ProdEntry(97, StartOptList, 2)); + _prodInfo.Insert(ProdEntry(96, MsgOption, 0)); + _prodInfo.Insert(ProdEntry(95, MsgOption, 2)); + _prodInfo.Insert(ProdEntry(94, LogOpt, 0)); + _prodInfo.Insert(ProdEntry(93, LogOpt, 1)); + _prodInfo.Insert(ProdEntry(92, TimeoutOpt, 0)); + _prodInfo.Insert(ProdEntry(91, TimeoutOpt, 2)); + _prodInfo.Insert(ProdEntry(90, SyncCmdOption, 0)); + _prodInfo.Insert(ProdEntry(89, SyncCmdOption, 3)); + _prodInfo.Insert(ProdEntry(88, KeepTicketOpt, 0)); + _prodInfo.Insert(ProdEntry(87, KeepTicketOpt, 2)); + _prodInfo.Insert(ProdEntry(86, Statement, 8)); + _prodInfo.Insert(ProdEntry(85, Statement, 7)); + _prodInfo.Insert(ProdEntry(84, Statement, 9)); + _prodInfo.Insert(ProdEntry(83, Statement, 7)); + _prodInfo.Insert(ProdEntry(82, Statement, 6)); + _prodInfo.Insert(ProdEntry(81, Statement, 8)); _prodInfo.Insert(ProdEntry(80, Statement, 5)); _prodInfo.Insert(ProdEntry(79, Statement, 5)); _prodInfo.Insert(ProdEntry(78, Statement, 5)); @@ -2736,11 +2751,11 @@ _prodInfo.Insert(ProdEntry(75, Statement, 5)); _prodInfo.Insert(ProdEntry(74, Statement, 5)); _prodInfo.Insert(ProdEntry(73, Statement, 5)); - _prodInfo.Insert(ProdEntry(72, Statement, 2)); - _prodInfo.Insert(ProdEntry(71, Statement, 4)); + _prodInfo.Insert(ProdEntry(72, Statement, 5)); + _prodInfo.Insert(ProdEntry(71, Statement, 2)); _prodInfo.Insert(ProdEntry(70, Statement, 4)); - _prodInfo.Insert(ProdEntry(69, Statement, 6)); - _prodInfo.Insert(ProdEntry(68, Statement, 3)); + _prodInfo.Insert(ProdEntry(69, Statement, 4)); + _prodInfo.Insert(ProdEntry(68, Statement, 5)); _prodInfo.Insert(ProdEntry(67, Statement, 6)); _prodInfo.Insert(ProdEntry(66, Statement, 5)); _prodInfo.Insert(ProdEntry(65, Statement, 5)); @@ -2814,12 +2829,12 @@ CegoAdm::CegoAdm() { loadScanner(); - for ( int i=0; i < 354; i++) + for ( int i=0; i < 356; i++) { int j; for ( j = 0; j < 107; j++) _actionMap[i][j] = ActionEntry(); - for ( j = 0; j < 15; j++) + for ( j = 0; j < 16; j++) _jumpMap[i][j] = -1; } loadParser0(); @@ -2897,140 +2912,140 @@ } switch (num) { - case 122: + case 123: dumpUIndex(); break; - case 121: + case 122: dumpTable(); break; - case 120: + case 121: copyFileAction(); break; - case 119: + case 120: setTableSetNodeAction(); break; - case 118: + case 119: getDbInfoAction(); break; - case 117: + case 118: getDbSpecAction(); break; - case 115: + case 116: storePit(); break; - case 114: + case 115: storeTSTicketAttr(); break; - case 113: + case 114: storeTSRootAttr(); break; - case 112: + case 113: storeSortAreaAttr(); break; - case 111: + case 112: storeLogNumAttr(); break; - case 110: + case 111: storeLogSizeAttr(); break; - case 109: + case 110: storeTmpSizeAttr(); break; - case 108: + case 109: storeSysSizeAttr(); break; - case 107: + case 108: storeSecondaryAttr(); break; - case 106: + case 107: storePrimaryAttr(); break; - case 102: + case 103: plainModeAction(); break; - case 101: + case 102: binModeAction(); break; - case 100: + case 101: xmlModeAction(); break; - case 99: + case 100: forceloadAction(); break; - case 98: + case 99: cleanupAction(); break; - case 94: + case 95: msgAction(); break; - case 92: + case 93: nologAction(); break; - case 90: + case 91: timeoutAction(); break; - case 88: - keepTicketAction(); + case 89: + syncCmdAction(); break; case 87: - importTableSetStructureAction(); + keepTicketAction(); break; case 86: - importTableSetAction(); + importTableSetStructureAction(); break; case 85: - importTableAction(); + importTableSetAction(); break; case 84: - exportTableSetStructureAction(); + importTableAction(); break; case 83: - exportTableSetAction(); + exportTableSetStructureAction(); break; case 82: - exportTableAction(); + exportTableSetAction(); break; case 81: - setTSSortAreaSizeAction(); + exportTableAction(); break; case 80: - setTSLogSizeAction(); + setTSSortAreaSizeAction(); break; case 79: - setTSLogNumAction(); + setTSLogSizeAction(); break; case 78: - setTSTicketAction(); + setTSLogNumAction(); break; case 77: - setTSRootPathAction(); + setTSTicketAction(); break; case 76: - setTSTmpSizeAction(); + setTSRootPathAction(); break; case 75: - setTSSysSizeAction(); + setTSTmpSizeAction(); break; case 74: - setCheckpointAction(); + setTSSysSizeAction(); break; case 73: - setTSInitFileAction(); + setCheckpointAction(); break; case 72: - showLogMngAction(); + setTSInitFileAction(); break; case 71: - setLogMngAction(); + showLogMngAction(); break; case 70: - recoverTableSetAction(); + setLogMngAction(); break; case 69: - syncTableSetAction2(); + recoverTableSetAction(); break; case 68: - syncTableSetAction1(); + syncTableSetAction(); break; case 67: endBackupAction();
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdm.def ^
@@ -212,8 +212,7 @@ Statement : REMOVE ARCHLOG IDENTIFIER FROM IDENTIFIER ; removeArchLogAction Statement : BEGIN_TOKEN BACKUP FOR IDENTIFIER MsgOption ; beginBackupAction Statement : END_TOKEN BACKUP FOR IDENTIFIER MsgOption KeepTicketOpt ; endBackupAction -Statement : SYNC TABLESET IDENTIFIER ; syncTableSetAction1 -Statement : SYNC TABLESET IDENTIFIER WITH STRINGVAL TimeoutOpt ; syncTableSetAction2 +Statement : SYNC TABLESET IDENTIFIER SyncCmdOption MsgOption ; syncTableSetAction Statement : RECOVER TABLESET IDENTIFIER PitOption ; recoverTableSetAction Statement : SET LOGMNG STRINGVAL TimeoutOpt ; setLogMngAction Statement : SHOW LOGMNG ; showLogMngAction @@ -237,6 +236,8 @@ # KeepTicketOpt : KEEP TSTICKET ; keepTicketAction KeepTicketOpt : +SyncCmdOption : WITH STRINGVAL TimeoutOpt ; syncCmdAction +SyncCmdOption : TimeoutOpt : TIMEOUT INTVAL ; timeoutAction TimeoutOpt : LogOpt : NOLOGGING ; nologAction
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdm.h ^
@@ -88,8 +88,7 @@ virtual void removeArchLogAction() = 0; virtual void beginBackupAction() = 0; virtual void endBackupAction() = 0; - virtual void syncTableSetAction1() = 0; - virtual void syncTableSetAction2() = 0; + virtual void syncTableSetAction() = 0; virtual void recoverTableSetAction() = 0; virtual void setLogMngAction() = 0; virtual void showLogMngAction() = 0; @@ -109,6 +108,7 @@ virtual void importTableSetAction() = 0; virtual void importTableSetStructureAction() = 0; virtual void keepTicketAction() = 0; + virtual void syncCmdAction() = 0; virtual void timeoutAction() = 0; virtual void nologAction() = 0; virtual void msgAction() = 0; @@ -255,6 +255,7 @@ PermList, PermEntry, KeepTicketOpt, + SyncCmdOption, TimeoutOpt, LogOpt, MsgOption, @@ -377,8 +378,8 @@ int _num; }; - ActionEntry _actionMap[354][107]; - int _jumpMap[354][15]; + ActionEntry _actionMap[356][107]; + int _jumpMap[356][16]; class ProdEntry {
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdmAction.cc ^
@@ -105,7 +105,12 @@ { _i = 0; _pC = pC; -} + + // init some vars + _buMsg = Chain("NONE"); + _syncCmd = Chain(""); + _timeout = DEFTIMEOUT; + } char CegoAdmAction::nextChar() { @@ -865,8 +870,7 @@ } - -void CegoAdmAction::syncTableSetAction1() +void CegoAdmAction::syncTableSetAction() { Chain tableSet; Chain* pS = getTokenList().First(); @@ -874,30 +878,9 @@ { tableSet = pS; } - CegoAdminHandler::ResultType res; - res = _pAH->reqSyncTableSet(tableSet, Chain(""), 0); - handleMedResult(res); - - Chain msg; - _pAH->getMsg(msg); - if ( _rawMode == false ) - cout << msg << endl; -} - -void CegoAdmAction::syncTableSetAction2() -{ - Chain tableSet; - Chain pS = getTokenList().First(); - pS = getTokenList().Next(); - pS = getTokenList().Next(); - if ( pS ) - { - tableSet = pS; - } - Chain escCmd(_stringBuf); CegoAdminHandler::ResultType res; - res = _pAH->reqSyncTableSet(tableSet, escCmd, _timeout); + res = _pAH->reqSyncTableSet(tableSet, _buMsg, _syncCmd, _timeout); handleMedResult(res); @@ -906,8 +889,6 @@ if ( _rawMode == false ) cout << msg << endl; - - _timeout = DEFTIMEOUT; } void CegoAdmAction::beginBackupAction() @@ -954,6 +935,12 @@ _keepTicket = true; } + +void CegoAdmAction::syncCmdAction() +{ + _syncCmd = Chain(_stringBuf); +} + void CegoAdmAction::timeoutAction() { Chain pS = getTokenList().First();
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdmAction.h ^
@@ -85,6 +85,7 @@ void buStatInfoAction(); void buStatResetAction(); void keepTicketAction(); + void syncCmdAction(); void timeoutAction(); void nologAction(); void msgAction(); @@ -136,8 +137,7 @@ void beginBackupAction(); void endBackupAction(); - void syncTableSetAction1(); - void syncTableSetAction2(); + void syncTableSetAction(); void getDbSpecAction(); @@ -235,6 +235,7 @@ bool _rawMode; ResultMode _resultMode; + Chain _syncCmd; bool _keepTicket; int _timeout; bool _doLogging;
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdmin.cc ^
@@ -541,7 +541,7 @@ cout << " [t25] set lognum <intval> for <tableset>" << endl; cout << " [t26] set logsize <intval> for <tableset>" << endl; cout << " [t27] set sortareasize <intval> for <tableset>" << endl; - cout << " [t28] sync tableset <tableset> [ with '<command>' [ <timeout> ] ] " << endl; + cout << " [t28] sync tableset <tableset> [ with '<command>' [ <timeout> ] ] [ message 'system message' ]" << endl; cout << " [t39] list datafile for <tableset>" << endl; cout << " [t30] list logfile for <tableset>" << endl; cout << " [t31] list transaction for <tableset>" << endl; @@ -1177,12 +1177,13 @@ else if ( topic == Chain("t28")) { cout << endl; - cout << "sync tableset <tableset> [ with '<command>' ] [ <timeout> ] ]" << endl; + cout << "sync tableset <tableset> [ with '<command>' ] [ <timeout> ] ] [ message 'system message' ]" << endl; cout << "-------------------------------------------------------------" << endl; cout << endl; cout << " Writes a checkpoint for the given tableset." << endl; cout << " The optional given command is executed, during the tableset is synchronized and locked." << endl; cout << " So this can be used to create a consistent snapshot for a tableset ( e.g. with ZFS snapshot commands )" << endl; + cout << " A comment can be added to the sync command, which is stored in the backup stat table" << endl; cout << endl; } else if ( topic == Chain("t29"))
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdminHandler.cc ^
@@ -901,10 +901,12 @@ return sendReq(XML_INIT_LOGS_REQUEST, pRoot); } -CegoAdminHandler::ResultType CegoAdminHandler::reqSyncTableSet(const Chain& tableSet, const Chain& escCmd, int timeout) +CegoAdminHandler::ResultType CegoAdminHandler::reqSyncTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCmd, int timeout) { Element* pRoot = new Element(XML_FRAME_ELEMENT); pRoot->setAttribute(XML_TABLESET_ATTR, tableSet); + pRoot->setAttribute(XML_BUMSG_ATTR, msg); + if ( escCmd != Chain("") ) { pRoot->setAttribute(XML_ESCCMD_ATTR, escCmd);
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdminHandler.h ^
@@ -210,7 +210,7 @@ ResultType reqInitLogs(const Chain& tableSet); - ResultType reqSyncTableSet(const Chain& tableSet, const Chain& escCmd, int timeout); + ResultType reqSyncTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCmd, int timeout); ResultType reqGetDbSpec(Chain& dbSpec); ResultType reqCopyTableSet(const Chain& tableSet, const Chain& secondary, const Chain& mediator);
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoAdminThread.cc ^
@@ -2938,14 +2938,16 @@ void CegoAdminThread::srvSyncTableSet(CegoAdminHandler pAH) { Chain tableSet; + Chain bumsg; Chain escCmd; int timeout; pAH->getTableSet(tableSet); pAH->getEscapeCmd(escCmd); pAH->getTimeoutValue(timeout); - - _pTabMng->syncDistTableSet(tableSet, escCmd, timeout); + pAH->getBUMsg(bumsg); + + _pTabMng->syncDistTableSet(tableSet, bumsg, escCmd, timeout); Chain msg; if ( escCmd == Chain("") ) @@ -6519,6 +6521,7 @@ Chain pFileName = dfList.First(); int pFid = fidList.First(); + int pDFSize = dfSizeList.First(); while ( pFileName && pFid ) { @@ -6536,6 +6539,10 @@ totalPages = _pDBMng->getNumPages(pFid); usedPages = _pDBMng->getNumUsedPages(pFid, _pTabMng->getLockHandle()); } + else + { + totalPages = pDFSize; + } pF->setAttribute(XML_NUMTOTAL_ATTR, Chain(totalPages)); pF->setAttribute(XML_NUMUSED_ATTR, Chain(usedPages)); @@ -6544,6 +6551,7 @@ pFileName = dfList.Next(); pFid = fidList.Next(); + pDFSize = dfSizeList.Next(); } @@ -6554,6 +6562,7 @@ _pDBMng->getDataFileInfo(tableSet, Chain(XML_SYSFILE_VALUE), dfList, fidList, dfSizeList); pFileName = dfList.First(); pFid = fidList.First(); + pDFSize = dfSizeList.First(); while ( pFileName && pFid ) { @@ -6570,6 +6579,11 @@ totalPages = _pDBMng->getNumPages(pFid); usedPages = _pDBMng->getNumUsedPages(pFid, _pTabMng->getLockHandle()); } + else + { + totalPages = pDFSize; + } + pF->setAttribute(XML_NUMTOTAL_ATTR, Chain(totalPages)); pF->setAttribute(XML_NUMUSED_ATTR, Chain(usedPages)); @@ -6578,6 +6592,7 @@ pFileName = dfList.Next(); pFid = fidList.Next(); + pDFSize = dfSizeList.Next(); } @@ -6588,6 +6603,7 @@ _pDBMng->getDataFileInfo(tableSet, Chain(XML_TEMPFILE_VALUE), dfList, fidList, dfSizeList); pFileName = dfList.First(); pFid = fidList.First(); + pDFSize = dfSizeList.First(); while ( pFileName && pFid ) { @@ -6604,6 +6620,10 @@ totalPages = _pDBMng->getNumPages(pFid); usedPages = _pDBMng->getNumUsedPages(pFid, _pTabMng->getLockHandle()); } + else + { + totalPages = *pDFSize; + } pF->setAttribute(XML_NUMTOTAL_ATTR, Chain(totalPages)); pF->setAttribute(XML_NUMUSED_ATTR, Chain(usedPages)); @@ -6611,7 +6631,9 @@ pTSInfo->addContent(pF); pFileName = dfList.Next(); - pFid = fidList.Next(); + pFid = fidList.Next(); + pDFSize = dfSizeList.Next(); + } ListT<Chain> lfList; @@ -6648,9 +6670,7 @@ pSize = sizeList.Next(); pStatus = statusList.Next(); } - - - + ListT<Chain> archIdList; ListT<Chain> archPathList;
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoBufferPool.cc ^
@@ -6,7 +6,7 @@ // // Design and Implementation by Bjoern Lemke // -// (C)opyright 2000-2010 Bjoern Lemke +// (C)opyright 2000-2013 Bjoern Lemke // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -586,6 +586,7 @@ Chain msg; e.pop(msg); log(_modId, Logger::LOGERR, msg); + throw Exception(EXLOC, msg); } } @@ -690,7 +691,7 @@ catch ( Exception e ) { pLockHandle->unlockBufferPool(); - throw Exception(EXLOC, "Cannot write checkpoint", e); + throw e; } pLockHandle->unlockBufferPool();
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoDefs.h ^
@@ -8,7 +8,7 @@ // // Design and Implementation by Bjoern Lemke // -// (C)opyright 2000-2012 Bjoern Lemke +// (C)opyright 2000-2013 Bjoern Lemke // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -40,8 +40,8 @@ #endif #define CEGO_PRODUCT "Cego" -#define CEGO_VERSION "2.15.3" -#define CEGO_COPYRIGHT "Copyright (C) 2000-2012 by Bjoern Lemke. All rights reserved" +#define CEGO_VERSION "2.15.4" +#define CEGO_COPYRIGHT "Copyright (C) 2000-2013 by Bjoern Lemke. All rights reserved" /******************************/ / File Management Parameters */
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoDistManager.cc ^
@@ -1822,7 +1822,7 @@ return _pLockHandle; } -void CegoDistManager::syncDistTableSet(const Chain& tableSet, const Chain& escCmd, int timeout) +void CegoDistManager::syncDistTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCmd, int timeout) { int tabSetId = _pDBMng->getTabSetId(tableSet); @@ -1831,7 +1831,7 @@ if ( hostName.toUpper() == h.getName().toUpper() ) { - syncLocalTableSet(tableSet, escCmd, timeout); + syncTableSet(tableSet, msg, escCmd, timeout); } else { @@ -1849,11 +1849,6 @@ } } -void CegoDistManager::syncLocalTableSet(const Chain& tableSet, const Chain& escCmd, int timeout) -{ - writeCheckPoint(tableSet, true, true, escCmd, timeout); -} - void CegoDistManager::enableAuth() { _authEnabled = true;
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoDistManager.h ^
@@ -123,8 +123,7 @@ void setThreadId(long tid); long getThreadId() const; - void syncDistTableSet(const Chain& tableSet, const Chain& escCmd, int timeout); - void syncLocalTableSet(const Chain& tableSet, const Chain& escCmd, int timeout); + void syncDistTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCmd, int timeout); void enableAuth(); void disableAuth();
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoTableManager.cc ^
@@ -520,35 +520,8 @@ pFid = fidList.Next(); } - // insert entry in bustat table + addBUStat(tabSetId, Chain("BEGIN BACKUP"), msg); - CegoTableObject boe; - getObject(tabSetId, Chain(SYSTAB_BUSTAT_ID), CegoObject::SYSTEM, boe); - ListT<CegoField> fvl = boe.getSchema(); - CegoField pF = fvl.First(); - while ( pF ) - { - if (pF->getAttrName() == Chain(SYSTAB_TS_ATTR) ) - { - Datetime n; - int pI = new (int); - pI = n.asInt(); - CegoFieldValue fv(DATETIME_TYPE, pI, sizeof(int), true); - pF->setValue(fv); - } - else if ( pF->getAttrName() == Chain(SYSTAB_BUINFO_ATTR) ) - { - pF->setValue(CegoFieldValue(VARCHAR_TYPE, Chain("BEGIN BACKUP"))); - } - else if ( pF->getAttrName() == Chain(SYSTAB_BUMSG_ATTR) ) - { - pF->setValue(CegoFieldValue(VARCHAR_TYPE, msg)); - } - pF = fvl.Next(); - } - - CegoDataPointer bp; - insertDataTable(boe, fvl, bp, true); } void CegoTableManager::endBackup(const Chain& tableSet, const Chain& msg, bool keepTicket) @@ -566,7 +539,6 @@ throw Exception(EXLOC, msg); } - int tabSetId =_pDBMng->getTabSetId(tableSet); _pDBMng->setBackup(tabSetId, false); int tmpFileId = _pDBMng->getTmpFid(tableSet); @@ -615,37 +587,7 @@ } _pDBMng->setTableSetRunState(tableSet, XML_ONLINE_VALUE); - - // insert entry in bustat table - - CegoTableObject boe; - getObject(tabSetId, Chain(SYSTAB_BUSTAT_ID), CegoObject::SYSTEM, boe); - ListT<CegoField> fvl = boe.getSchema(); - CegoField pF = fvl.First(); - while ( pF ) - { - if (pF->getAttrName() == Chain(SYSTAB_TS_ATTR) ) - { - Datetime n; - int pI = new (int); - pI = n.asInt(); - CegoFieldValue fv(DATETIME_TYPE, pI, sizeof(int), true); - pF->setValue(fv); - } - else if ( pF->getAttrName() == Chain(SYSTAB_BUINFO_ATTR) ) - { - pF->setValue(CegoFieldValue(VARCHAR_TYPE, Chain("END BACKUP"))); - } - else if ( pF->getAttrName() == Chain(SYSTAB_BUMSG_ATTR) ) - { - pF->setValue(CegoFieldValue(VARCHAR_TYPE, msg)); - } - pF = fvl.Next(); - } - - CegoDataPointer bp; - insertDataTable(boe, fvl, bp, true); - + addBUStat(tabSetId, Chain("END BACKUP"), msg); } @@ -655,6 +597,13 @@ truncateObject(tabSetId, Chain(SYSTAB_BUSTAT_ID), CegoObject::SYSTEM); } +void CegoTableManager::syncTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCmd, int timeout) +{ + writeCheckPoint(tableSet, true, true, escCmd, timeout); + int tabSetId =_pDBMng->getTabSetId(tableSet); + addBUStat(tabSetId, Chain("EXTERNAL SYNC"), msg); +} + void CegoTableManager::logTo(const Chain& tableSet, const Chain& secondary) { @@ -5005,3 +4954,37 @@ return blobList; } + + +void CegoTableManager::addBUStat(int tabSetId, const Chain& butype, const Chain& msg) +{ + // insert entry in bustat table + + CegoTableObject boe; + getObject(tabSetId, Chain(SYSTAB_BUSTAT_ID), CegoObject::SYSTEM, boe); + ListT<CegoField> fvl = boe.getSchema(); + CegoField pF = fvl.First(); + while ( pF ) + { + if (pF->getAttrName() == Chain(SYSTAB_TS_ATTR) ) + { + Datetime n; + int pI = new (int); + *pI = n.asInt(); + CegoFieldValue fv(DATETIME_TYPE, pI, sizeof(int), true); + pF->setValue(fv); + } + else if ( pF->getAttrName() == Chain(SYSTAB_BUINFO_ATTR) ) + { + pF->setValue(CegoFieldValue(VARCHAR_TYPE, butype)); + } + else if ( pF->getAttrName() == Chain(SYSTAB_BUMSG_ATTR) ) + { + pF->setValue(CegoFieldValue(VARCHAR_TYPE, msg)); + } + pF = fvl.Next(); + } + + CegoDataPointer bp; + insertDataTable(boe, fvl, bp, true); +}
[-] [+]	Changed	cego-2.15.4.tar.bz2/src/CegoTableManager.h ^
@@ -81,6 +81,8 @@ void endBackup(const Chain& tableSet, const Chain&msg, bool keepTicket = true); void resetBUStat(const Chain& tableSet); + void syncTableSet(const Chain& tableSet, const Chain& msg, const Chain& escCommand, int timeout); + void logTo(const Chain& tableSet, const Chain& secondary); void addDataFile(const Chain& tableSet, const Chain& type, int fileId, const Chain& dataFile, int fileSize); @@ -273,6 +275,7 @@ ListT<CegoBlob> getBlobs(int tabSetId, const ListT<CegoField>& fvl); + void addBUStat(int tabSetId, const Chain& butype, const Chain& msg); void poolP(); void poolV();
[-] [+]	Changed	cego-2.15.4.tar.bz2/tools/cgmkdb ^
@@ -45,12 +45,11 @@ case "$i" in -r\|-R) CEGOROOT=$2; shift; shift;; -t\|-T) CEGOTABLESET=$2; shift; shift;; - -u\|-U) CEGOTSUSER=$2; shift; shift;; + -u\|-U) CEGOUSER=$2; shift; shift;; --) DBNAME=$2; shift; break;; esac done - test -z "$DBNAME" && { echo "No dbname specified."; printUsage; exit 1; } ## Remove tailing "/" chars from $CEGOROOT @@ -80,8 +79,6 @@ exit 1 fi -printVersion -echo "" echo "Creating database in directory $DBROOT ..." echo "Database name: $DBNAME" CEGO=`which cego`; ## path to the cego executable @@ -115,7 +112,7 @@ SORTAREASIZE=10000000 APPFILE=${TSROOT}/${TS}_data01.dbf APPSIZE=3000 -DBUSER=${CEGOTSUSER:-$DBNAME} +DBUSER=${CEGOUSER:-$DBNAME} DBPWD=${DBUSER} ########################## ### end of customizing ###