提交 c77a6c50 编写于 作者: J Jacob Champion 提交者: Jacob Champion

executor: resolve dead code FIXMEs for initBitmapState

initBitmapState doesn't do anything anymore; its logic has effectively
been moved to other areas of the code.
上级 c91c2523
...@@ -66,15 +66,6 @@ getBitmapTableScanMethod(TableType tableType) ...@@ -66,15 +66,6 @@ getBitmapTableScanMethod(TableType tableType)
return &scanMethods[tableType]; return &scanMethods[tableType];
} }
/*
* Initializes the state relevant to bitmaps.
*/
static inline void
initBitmapState(BitmapTableScanState *scanstate)
{
/* GPDB_84_MERGE_FIXME: nothing to do? */
}
/* /*
* Frees the state relevant to bitmaps. * Frees the state relevant to bitmaps.
*/ */
...@@ -250,8 +241,6 @@ BitmapTableScanBeginPartition(ScanState *node, AttrNumber *attMap) ...@@ -250,8 +241,6 @@ BitmapTableScanBeginPartition(ScanState *node, AttrNumber *attMap)
BitmapTableScanState *scanState = (BitmapTableScanState *)node; BitmapTableScanState *scanState = (BitmapTableScanState *)node;
BitmapTableScan *plan = (BitmapTableScan*)(node->ps.plan); BitmapTableScan *plan = (BitmapTableScan*)(node->ps.plan);
initBitmapState(scanState);
/* Remap the bitmapqualorig as we might have dropped column problem */ /* Remap the bitmapqualorig as we might have dropped column problem */
DynamicScan_RemapExpression(node, attMap, (Node *) plan->bitmapqualorig); DynamicScan_RemapExpression(node, attMap, (Node *) plan->bitmapqualorig);
...@@ -311,7 +300,6 @@ BitmapTableScanReScanPartition(ScanState *node) ...@@ -311,7 +300,6 @@ BitmapTableScanReScanPartition(ScanState *node)
freeBitmapState(scanState); freeBitmapState(scanState);
Assert(scanState->tbm == NULL); Assert(scanState->tbm == NULL);
initBitmapState(scanState);
scanState->needNewBitmapPage = true; scanState->needNewBitmapPage = true;
scanState->recheckTuples = true; scanState->recheckTuples = true;
......
...@@ -178,15 +178,6 @@ freeFetchDesc(BitmapAppendOnlyScanState *scanstate) ...@@ -178,15 +178,6 @@ freeFetchDesc(BitmapAppendOnlyScanState *scanstate)
} }
} }
/*
* Initialize the state relevant to bitmaps.
*/
static inline void
initBitmapState(BitmapAppendOnlyScanState *scanstate)
{
/* GPDB_84_MERGE_FIXME: nothing to do? */
}
/* /*
* Free the state relevant to bitmaps * Free the state relevant to bitmaps
*/ */
...@@ -230,7 +221,6 @@ BitmapAppendOnlyScanNext(BitmapAppendOnlyScanState *node) ...@@ -230,7 +221,6 @@ BitmapAppendOnlyScanNext(BitmapAppendOnlyScanState *node)
econtext = node->ss.ps.ps_ExprContext; econtext = node->ss.ps.ps_ExprContext;
slot = node->ss.ss_ScanTupleSlot; slot = node->ss.ss_ScanTupleSlot;
initBitmapState(node);
initFetchDesc(node); initFetchDesc(node);
aoFetchDesc = node->baos_currentAOFetchDesc; aoFetchDesc = node->baos_currentAOFetchDesc;
......
...@@ -89,15 +89,6 @@ freeScanDesc(BitmapHeapScanState *scanstate) ...@@ -89,15 +89,6 @@ freeScanDesc(BitmapHeapScanState *scanstate)
} }
} }
/*
* Initialize the state relevant to bitmaps.
*/
static inline void
initBitmapState(BitmapHeapScanState *scanstate)
{
/* GPDB_84_MERGE_FIXME: nothing to do? */
}
/* /*
* Free the state relevant to bitmaps * Free the state relevant to bitmaps
*/ */
...@@ -146,7 +137,6 @@ BitmapHeapNext(BitmapHeapScanState *node) ...@@ -146,7 +137,6 @@ BitmapHeapNext(BitmapHeapScanState *node)
slot = node->ss.ss_ScanTupleSlot; slot = node->ss.ss_ScanTupleSlot;
initScanDesc(node); initScanDesc(node);
initBitmapState(node);
scan = node->ss_currentScanDesc; scan = node->ss_currentScanDesc;
scanrelid = ((BitmapHeapScan *) node->ss.ps.plan)->scan.scanrelid; scanrelid = ((BitmapHeapScan *) node->ss.ps.plan)->scan.scanrelid;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册