Skip to content

Commit 6638c9a

Browse files
committed
fix conflict for segment attr clause and index
1 parent d03030f commit 6638c9a

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

sql.y

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ PhysicalProps:
13021302
{
13031303
// empty
13041304
}
1305-
| DeferredSegmentCreation SegmentAttrsClause TableCompressionOrEmpty InmemoryTableClause IlmClause
1305+
| DeferredSegmentCreation SegmentAttrsClause InmemoryTableClause IlmClause
13061306
| DeferredSegmentCreation _organization OrgClause
13071307
| DeferredSegmentCreation ExternalPartitionClause
13081308
| _cluster Identifier '(' ColumnNameList ')'
@@ -1326,10 +1326,10 @@ SegmentAttrsClause:
13261326

13271327
SegmentAttrClause:
13281328
PhysicalAttrsClause
1329-
| _tablespace Identifier
1329+
| _tablespace Identifier // TODO: using IdentifierOrKeyword?
13301330
| _tablespace _set Identifier
13311331
| LoggingClause
1332-
| TableCompression // TODO: this is not include in oracle 21 syntax docs
1332+
| TableCompression // TODO: this is not include in oracle 21 syntax docs?
13331333

13341334
PhysicalAttrsClause:
13351335
PhysicalAttrClause
@@ -1385,7 +1385,7 @@ InmemoryTableClause:
13851385
}
13861386
| _inmemory InmemoryAttrs InmemoryColumnClausesOrEmpty
13871387
| _no _inmemory InmemoryColumnClausesOrEmpty
1388-
| InmemoryColumnClausesOrEmpty
1388+
| InmemoryColumnClauses
13891389

13901390
InmemoryAttrs:
13911391
InmemoryMemCompress InmemoryProp InmemoryDistribute InmemoryDuplicate InmemorySpatial
@@ -1467,28 +1467,30 @@ InmemoryColumnClause:
14671467
| _inmemory InmemoryMemCompress '(' ColumnNameList ')'
14681468
| _no _inmemory '(' ColumnNameList ')'
14691469

1470-
IlmClause:
1470+
IlmClause: // TODO: support IlmPolicyClause IlmPolicyName
14711471
{
14721472
// empty
14731473
}
1474-
| _ilm _add _policy IlmPolicyClause
1475-
| _ilm _delete _policy IlmPolicyClause
1476-
| _ilm _enable _policy IlmPolicyClause
1477-
| _ilm _disable _policy IlmPolicyClause
1474+
//| _ilm _add _policy IlmPolicyClause
1475+
//| _ilm _delete _policy IlmPolicyName
1476+
//| _ilm _enable _policy IlmPolicyName
1477+
//| _ilm _disable _policy IlmPolicyName
14781478
| _ilm _delete_all
14791479
| _ilm _enable_all
14801480
| _ilm _disable_all
14811481

1482-
IlmPolicyClause:
1483-
IlmCompressionPolicy
1484-
| IlmTieringPolicy
1485-
| IlmInmemoryPolicy
1486-
1487-
IlmCompressionPolicy:
1488-
1489-
IlmTieringPolicy:
1482+
//IlmPolicyClause:
1483+
// IlmCompressionPolicy
1484+
//| IlmTieringPolicy
1485+
//| IlmInmemoryPolicy
1486+
//
1487+
//IlmCompressionPolicy:
1488+
//
1489+
//IlmTieringPolicy:
1490+
//
1491+
//IlmInmemoryPolicy:
14901492

1491-
IlmInmemoryPolicy:
1493+
//IlmPolicyName:
14921494

14931495
OrgClause:
14941496
_heap SegmentAttrsClauseOrEmpty HeapOrgTableClause
@@ -1559,7 +1561,7 @@ IndexIlmClause:
15591561
IndexClause:
15601562
ClusterIndexClause
15611563
| TableIndexClause
1562-
| BitmapJoinIndexClause
1564+
//| BitmapJoinIndexClause // TODO
15631565

15641566
ClusterIndexClause:
15651567
_cluster ClusterName IndexAttrs
@@ -1626,7 +1628,7 @@ ColumnSortClause:
16261628

16271629
IndexProps: // TODO
16281630

1629-
BitmapJoinIndexClause: // TODO
1631+
//BitmapJoinIndexClause:
16301632

16311633
CreateIndexUsable:
16321634
{

0 commit comments

Comments
 (0)