diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/access/spgist.h | 8 | ||||
-rw-r--r-- | src/include/access/spgist_private.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/include/access/spgist.h b/src/include/access/spgist.h index cd6de2c98da..8d0205e691f 100644 --- a/src/include/access/spgist.h +++ b/src/include/access/spgist.h @@ -128,8 +128,8 @@ typedef struct spgPickSplitOut */ typedef struct spgInnerConsistentIn { - StrategyNumber strategy; /* operator strategy number */ - Datum query; /* operator's RHS value */ + ScanKey scankeys; /* array of operators and comparison values */ + int nkeys; /* length of array */ Datum reconstructedValue; /* value reconstructed at parent */ int level; /* current level (counting from zero) */ @@ -156,8 +156,8 @@ typedef struct spgInnerConsistentOut */ typedef struct spgLeafConsistentIn { - StrategyNumber strategy; /* operator strategy number */ - Datum query; /* operator's RHS value */ + ScanKey scankeys; /* array of operators and comparison values */ + int nkeys; /* length of array */ Datum reconstructedValue; /* value reconstructed at parent */ int level; /* current level (counting from zero) */ diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h index fa23acf6cde..76ea5a1578f 100644 --- a/src/include/access/spgist_private.h +++ b/src/include/access/spgist_private.h @@ -126,7 +126,11 @@ typedef struct SpGistScanOpaqueData SpGistState state; /* see above */ MemoryContext tempCxt; /* short-lived memory context */ - /* Index quals for scan (copied from IndexScanDesc for convenience) */ + /* Control flags showing whether to search nulls and/or non-nulls */ + bool searchNulls; /* scan matches (all) null entries */ + bool searchNonNulls; /* scan matches (some) non-null entries */ + + /* Index quals to be passed to opclass (null-related quals removed) */ int numberOfKeys; /* number of index qualifier conditions */ ScanKey keyData; /* array of index qualifier descriptors */ |