diff options
| author | Peter Baumann <p.baumann@jacobs-university.de> | 2010-08-09 17:09:35 +0200 |
|---|---|---|
| committer | www-data <www-data@ubuntu.localdomain> | 2010-10-31 12:59:13 +0100 |
| commit | 3535a1be00d82fb757faabe5bc34518b0df7032b (patch) | |
| tree | 8cf14622e59235291f13266e81138ce60efd9d9b | |
| parent | e604924aaff2386337f2df4825ba3873153ec12f (diff) | |
| download | rasdaman-upstream-3535a1be00d82fb757faabe5bc34518b0df7032b.tar.gz rasdaman-upstream-3535a1be00d82fb757faabe5bc34518b0df7032b.tar.xz rasdaman-upstream-3535a1be00d82fb757faabe5bc34518b0df7032b.zip | |
removed "decomp" keyword from storage layout directive, and improved formatting
| -rw-r--r-- | qlparser/lex.ll | 1 | ||||
| -rw-r--r-- | qlparser/oql.yy | 93 |
2 files changed, 68 insertions, 26 deletions
diff --git a/qlparser/lex.ll b/qlparser/lex.ll index b5fd9ec..ec6f5fc 100644 --- a/qlparser/lex.ll +++ b/qlparser/lex.ll @@ -280,7 +280,6 @@ int string_yyinput( char* buf, int max_size ) "aligned" { SETTOKEN( ALIGNED, commandToken, ALIGNED ) } "regular" { SETTOKEN( REGULAR, commandToken, REGULAR ) } "directional" { SETTOKEN( DIRECTIONAL, commandToken, DIRECTIONAL ) } -"decomp" { SETTOKEN( DECOMP, commandToken, DECOMP ) } "with" { SETTOKEN( WITH, commandToken, WITH ) } "subtiling" { SETTOKEN( SUBTILING, commandToken, SUBTILING ) } "area" { SETTOKEN( AREA, commandToken, AREA ) } diff --git a/qlparser/oql.yy b/qlparser/oql.yy index 7a5df11..c7b4548 100644 --- a/qlparser/oql.yy +++ b/qlparser/oql.yy @@ -203,7 +203,7 @@ struct QtUpdateSpecElement ARCCOS ARCTAN OVERLAY BIT UNKNOWN FASTSCALE PYRAMID MEMBERS ADD ALTER LIST INDEX RC_INDEX TC_INDEX A_INDEX D_INDEX RD_INDEX RPT_INDEX RRPT_INDEX IT_INDEX AUTO TILING ALIGNED REGULAR DIRECTIONAL - DECOMP WITH SUBTILING AREA OF INTEREST STATISTIC TILE SIZE BORDER THRESHOLD + WITH SUBTILING AREA OF INTEREST STATISTIC TILE SIZE BORDER THRESHOLD STRCT COMPLEX RE IM TIFF BMP HDF CSV JPEG PNG VFF TOR DEM INV_TIFF INV_BMP INV_HDF INV_JPEG INV_PNG INV_VFF INV_CSV INV_TOR INV_DEM @@ -2277,33 +2277,76 @@ indexTypes : RC_INDEX{$$.info = $1.info; $$.indexType = QtMDDConfig::r_RC_INDEX; tilingAttributes: TILING tileTypes {$$=$2;}; -tileTypes: REGULAR tileCfg{$$.tilingType=QtMDDConfig::r_REGULAR_TLG;$$.tileCfg=$2.tileCfg;$$.tileSize = StorageLayout::DefaultTileSize;} - | REGULAR tileCfg tilingSize{$$.tilingType=QtMDDConfig::r_REGULAR_TLG;$$.tileCfg=$2.tileCfg;$$.tileSize = $3.tileSize;} +tileTypes: REGULAR tileCfg + { $$.tilingType=QtMDDConfig::r_REGULAR_TLG; + $$.tileCfg=$2.tileCfg;$$.tileSize = StorageLayout::DefaultTileSize; + } + | REGULAR tileCfg tilingSize + { + $$.tilingType=QtMDDConfig::r_REGULAR_TLG; + $$.tileCfg=$2.tileCfg; + $$.tileSize = $3.tileSize;} + | ALIGNED tileCfg - {$$.tilingType=QtMDDConfig::r_ALIGNED_TLG; $$.tileCfg=$2.tileCfg;$$.tileSize = StorageLayout::DefaultTileSize;} + { $$.tilingType=QtMDDConfig::r_ALIGNED_TLG; + $$.tileCfg=$2.tileCfg; + $$.tileSize = StorageLayout::DefaultTileSize;} + | ALIGNED tileCfg tilingSize - {$$.tilingType=QtMDDConfig::r_ALIGNED_TLG; $$.tileCfg=$2.tileCfg;$$.tileSize = $3.tileSize;} - | DIRECTIONAL DECOMP dirdecompArray - {$$.tilingType=QtMDDConfig::r_DRLDECOMP_TLG;$$.tileSize = StorageLayout::DefaultTileSize; $$.dirDecomp=$3.dirDecomp;} - | DIRECTIONAL DECOMP dirdecompArray WITH SUBTILING - {$$.tilingType=QtMDDConfig::r_DRLDECOMPSUBTILE_TLG;$$.tileSize = StorageLayout::DefaultTileSize; $$.dirDecomp=$3.dirDecomp;} - | DIRECTIONAL DECOMP dirdecompArray tilingSize{$$.tilingType=QtMDDConfig::r_DRLDECOMP_TLG; $$.tileSize = $4.tileSize; $$.dirDecomp=$3.dirDecomp;} - | DIRECTIONAL DECOMP dirdecompArray WITH SUBTILING tilingSize - {$$.tilingType=QtMDDConfig::r_DRLDECOMPSUBTILE_TLG;$$.tileSize = $6.tileSize; $$.dirDecomp=$3.dirDecomp;} - | AREA OF INTEREST bboxList{$$.tilingType=QtMDDConfig::r_AREAOFINTEREST_TLG;$$.bboxList=$4;$$.tileSize = StorageLayout::DefaultTileSize;} - | AREA OF INTEREST bboxList tilingSize{$$.tilingType=QtMDDConfig::r_AREAOFINTEREST_TLG;$$.bboxList=$4;$$.tileSize = $5.tileSize;} - | STATISTIC bboxList statisticParameters{$$=$3;$$.bboxList=$2;} - | STATISTIC bboxList{$$.tilingType=QtMDDConfig::r_STATISTICS_TLG; $$.bboxList=$2;$$.tileSize = StorageLayout::DefaultTileSize;}; + { $$.tilingType=QtMDDConfig::r_ALIGNED_TLG; + $$.tileCfg=$2.tileCfg; + $$.tileSize = $3.tileSize; + } + | DIRECTIONAL dirdecompArray + { $$.tilingType=QtMDDConfig::r_DRLDECOMP_TLG; + $$.tileSize = StorageLayout::DefaultTileSize; + $$.dirDecomp=$2.dirDecomp; + } + | DIRECTIONAL dirdecompArray WITH SUBTILING + { $$.tilingType=QtMDDConfig::r_DRLDECOMPSUBTILE_TLG; + $$.tileSize = StorageLayout::DefaultTileSize; + $$.dirDecomp=$2.dirDecomp;} -bboxList: mintervalExp { - $$ = new QtNode::QtOperationList(1); - (*$$)[0] = $1; -} -| mintervalExp COMMA bboxList { - $3->push_back( $1 ); - $$ = $3; - -}; + | DIRECTIONAL dirdecompArray tilingSize + { $$.tilingType=QtMDDConfig::r_DRLDECOMP_TLG; + $$.tileSize = $3.tileSize; + $$.dirDecomp=$2.dirDecomp; + } + | DIRECTIONAL dirdecompArray WITH SUBTILING tilingSize + { $$.tilingType=QtMDDConfig::r_DRLDECOMPSUBTILE_TLG; + $$.tileSize = $5.tileSize; + $$.dirDecomp=$2.dirDecomp; + } + | AREA OF INTEREST bboxList + { $$.tilingType=QtMDDConfig::r_AREAOFINTEREST_TLG; + $$.bboxList=$4; + $$.tileSize = StorageLayout::DefaultTileSize; + } + | AREA OF INTEREST bboxList tilingSize + { $$.tilingType=QtMDDConfig::r_AREAOFINTEREST_TLG; + $$.bboxList=$4; + $$.tileSize = $5.tileSize; + } + | STATISTIC bboxList statisticParameters + { $$=$3; + $$.bboxList=$2; + } + | STATISTIC bboxList + { $$.tilingType=QtMDDConfig::r_STATISTICS_TLG; + $$.bboxList=$2; + $$.tileSize = StorageLayout::DefaultTileSize; + }; + +bboxList: mintervalExp + { + $$ = new QtNode::QtOperationList(1); + (*$$)[0] = $1; + } + | mintervalExp COMMA bboxList + { + $3->push_back( $1 ); + $$ = $3; + }; tileCfg: mintervalExp{$$.tileCfg=$1;}; |