create btree params changed for attributes list, metadata: add attrslist

Author: tastelessjolt

src/backend/access/smerge/smbtree.c

@@ -21,14 +21,15 @@ create_false_node(void) {
 
 
 IndexStmt*
-create_btree_index_stmt(Relation heap, IndexInfo *indexInfo, char *indname) {
+create_btree_index_stmt(Relation heap, int attsnum, AttrNumber *attrs, char *indname) {
 	IndexStmt* btreeIndStmt; 
 	RangeVar* relation; 
 	List* indexParams;
 	IndexElem* indexElem;
 
 	ListCell* head;
 	ListCell* tail;
+	ListCell* currCell;
 
 	relation = (RangeVar*) palloc(sizeof(RangeVar));
 	relation->type =T_RangeVar;
@@ -49,28 +50,32 @@ create_btree_index_stmt(Relation heap, IndexInfo *indexInfo, char *indname) {
 
 	indexParams = (List*) palloc(sizeof(List));
 	indexParams->type = T_List;
-	indexParams->length = 1;
+	indexParams->length = attsnum;
 
+	// currCell = NULL;
+	// for (int i = 0; i != attsnum; i++) {
 // {type = T_IndexElem, name = 0x555555e80688 "uid", expr = 0x0, indexcolname = 0x0, collation = 0x0, opclass = 0x0, ordering = SORTBY_DEFAULT, nulls_ordering = SORTBY_NULLS_DEFAULT}
-	indexElem = (IndexElem*) palloc(sizeof(IndexElem));
-	indexElem->type = T_IndexElem; 
-	indexElem->name = heap->rd_att->attrs[indexInfo->ii_KeyAttrNumbers[0] - 1]->attname.data;
-	indexElem->expr = NULL; 
-	indexElem->indexcolname = NULL; 
-	indexElem->collation = NULL; 
-	indexElem->opclass = NULL; 
-	indexElem->ordering = SORTBY_DEFAULT; 
-	indexElem->nulls_ordering = SORTBY_NULLS_DEFAULT;
+		indexElem = (IndexElem*) palloc(sizeof(IndexElem));
+		indexElem->type = T_IndexElem; 
+		indexElem->name = heap->rd_att->attrs[attrs[0] - 1]->attname.data;
+		indexElem->expr = NULL; 
+		indexElem->indexcolname = NULL; 
+		indexElem->collation = NULL; 
+		indexElem->opclass = NULL; 
+		indexElem->ordering = SORTBY_DEFAULT; 
+		indexElem->nulls_ordering = SORTBY_NULLS_DEFAULT;
 
-	head = (ListCell*) palloc(sizeof(ListCell));
-	indexParams->head = head;
-	head->data.ptr_value = (void *) indexElem;
-	head->next = NULL;
+		// if (currCell != NULL)
 
-	tail = (ListCell*) palloc(sizeof(ListCell));
-	indexParams->tail = tail;
-	tail->data.ptr_value = (void *) indexElem;
-	tail->next = NULL;
+		currCell = (ListCell*) palloc(sizeof(ListCell));
+		currCell->data.ptr_value = (void *) indexElem;
+		currCell->next = NULL;
+
+		// if (i == 0)
+		indexParams->head = currCell;
+		indexParams->tail = currCell;
+		// if (i == attsnum - 1)
+	// }
 
 	btreeIndStmt->indexParams = indexParams;
 	btreeIndStmt->options = NULL;

src/backend/access/smerge/smerge.c

@@ -54,7 +54,7 @@ smergehandler(PG_FUNCTION_ARGS)
 	amroutine->amcanorderbyop = false;
 	amroutine->amcanbackward = false;
 	amroutine->amcanunique = true;
-	amroutine->amcanmulticol = false;
+	amroutine->amcanmulticol = true;
 	amroutine->amoptionalkey = true;
 	amroutine->amsearcharray = false;
 	amroutine->amsearchnulls = false;
@@ -99,7 +99,7 @@ smergebuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	Oid bt_index;
 	Page		metapage;
 
-	btreeIndStmt = create_btree_index_stmt(heap, indexInfo, NULL);
+	btreeIndStmt = create_btree_index_stmt(heap, indexInfo->ii_NumIndexAttrs, indexInfo->ii_KeyAttrNumbers, NULL);
 	addr = DefineIndex(RelationGetRelid(heap), 
 						btreeIndStmt,
 						InvalidOid,
@@ -121,7 +121,7 @@ smergebuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	/* Construct metapage. */
 	metapage = (Page) palloc(BLCKSZ);
 
-	_sm_init_metadata(metapage, bt_index);
+	_sm_init_metadata(metapage, bt_index, indexInfo);
 	_sm_writepage(index, metapage, SMERGE_METAPAGE);
 
 

src/backend/access/smerge/smmeta.c

@@ -3,16 +3,22 @@
 
 
 void
-_sm_init_metadata(Page metapage, Oid bt_index) {
+_sm_init_metadata(Page metapage, Oid bt_index, IndexInfo *indexInfo) {
 	SmMetadata* sm_metadata;
 
 	PageInit(metapage, BLCKSZ, 0);
 
 	sm_metadata = (SmMetadata*) PageGetContents(metapage);
 	sm_metadata->K = 132;
 	sm_metadata->N = 35;
+	
+	sm_metadata->attnum = indexInfo->ii_NumIndexAttrs;
+	for (int i = 0; i < sm_metadata->attnum; i++)
+		sm_metadata->attrs[i] = indexInfo->ii_KeyAttrNumbers[i];
+
 	sm_metadata->numList = 1;
 	sm_metadata->list[0] = bt_index;
+	memcpy(sm_metadata, PageGetContents(metapage), sizeof(SmMetadata));
 
 	((PageHeader) metapage)->pd_lower =
 		((char *) sm_metadata + sizeof(SmMetadata)) - (char *) metapage;

src/include/access/smerge.h

@@ -14,10 +14,14 @@
 #ifndef SMERGE_H
 #define SMERGE_H
 
+#include "pg_config_manual.h"
+
 #include "access/amapi.h"
 #include "access/itup.h"
 #include "access/sdir.h"
 #include "access/xlogreader.h"
+#include "access/attnum.h"
+
 #include "catalog/pg_index.h"
 #include "lib/stringinfo.h"
 #include "storage/bufmgr.h"
@@ -38,7 +42,8 @@
  * Define constants here
  */
 #define SMERGE_METAPAGE 0
-
+#define MAX_K 16
+#define MAX_N 8
 
 /*
  * prototypes for functions in smerge.c (external entry points for smerge)
@@ -71,6 +76,10 @@ extern void smergecostestimate(PlannerInfo *root, IndexPath *path, double loop_c
 typedef struct SmMetadata {
 	int K;
 	int N;
+	
+	int attnum;
+	AttrNumber attrs[INDEX_MAX_KEYS];
+
 	int numList;
 	Oid list[64];
 } SmMetadata;
@@ -88,12 +97,12 @@ typedef SmScanOpaqueData* SmScanOpaque;
 
 // btree create functions
 extern Node* create_false_node(void);
-extern IndexStmt* create_btree_index_stmt(Relation heap, IndexInfo *indexInfo, char *indname);
+extern IndexStmt* create_btree_index_stmt(Relation heap, int attsnum, AttrNumber *attrs, char *indname);
 
 /* 
  * start smerge specific
  */
-extern void _sm_init_metadata(Page metapage, Oid bt_index);
+extern void _sm_init_metadata(Page metapage, Oid bt_index, IndexInfo *indexInfo);
 extern void _sm_writepage(Relation index, Page page, BlockNumber blkno);
 extern SmMetadata* _sm_getmetadata(Relation rel);