Merge branch 'btree-handling' of github.com:CodeMaxx/postgres into btree-handling

Author: CodeMaxx

reinitdb.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+cd install
+
+rm -r data_old
+mv data data_old
+
+bin/initdb -D data
+
+sed -i s/\#port/port/ data/postgresql.conf;
+
+bin/pg_ctl -D data -l logfile start;
+
+sleep 2;
+
+bin/createdb -p 5432 test;
+
+bin/psql -h localhost -p 5432 -d test -f start.sql;
+
+bin/pg_ctl -D data stop;

src/backend/access/smerge/smbtree.c

@@ -28,7 +28,7 @@ create_btree_index_stmt(Relation heap, int attsnum, AttrNumber *attrs, char *ind
 	IndexElem* indexElem;
 
 	ListCell* head;
-	ListCell* tail;
+	ListCell* prevCell;
 	ListCell* currCell;
 
 	relation = (RangeVar*) palloc(sizeof(RangeVar));
@@ -52,30 +52,33 @@ create_btree_index_stmt(Relation heap, int attsnum, AttrNumber *attrs, char *ind
 	indexParams->type = T_List;
 	indexParams->length = attsnum;
 
-	// currCell = NULL;
-	// for (int i = 0; i != attsnum; i++) {
+	prevCell = NULL;
+	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[attrs[0] - 1]->attname.data;
+		indexElem->name = heap->rd_att->attrs[attrs[i] - 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;
 
-		// if (currCell != NULL)
-
+		prevCell = currCell;
 		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)
-	// }
+		if (prevCell != NULL)
+			prevCell->next = currCell;
+
+		if (i == 0)
+			indexParams->head = currCell;
+	}
+
+	indexParams->tail = currCell;
+	currCell->next = NULL;
 
 	btreeIndStmt->indexParams = indexParams;
 	btreeIndStmt->options = NULL;

src/backend/access/smerge/smerge.c

@@ -162,7 +162,7 @@ smergebuildempty(Relation index)
 
 Relation
 _get_curr_btree (SmMetadata* metadata) {
-	return index_open(metadata->list[metadata->numList - 1], RowExclusiveLock);
+	return index_open(metadata->curr, RowExclusiveLock);
 }
 
 /*
@@ -176,18 +176,17 @@ smergeinsert(Relation rel, Datum *values, bool *isnull,
 		 ItemPointer ht_ctid, Relation heapRel,
 		 IndexUniqueCheck checkUnique)
 {
+	Relation btreeRel;
 	SmMetadata* sm_metadata = _sm_getmetadata(rel);
 	printf("K: %d, N: %d\n", sm_metadata->K, sm_metadata->N);
-	for (int i = 0; i != sm_metadata->numList; i++) {
-		printf("Btree OIDs %d: %d \n", i, sm_metadata->list[i]);
-	}
+	printf("Curr BTree OID: %d\n", sm_metadata->curr);
 
 	RelationCloseSmgr(rel);
 
 	// insert into sub btrees only if there any btrees
-	if (sm_metadata->numList > 0) {
+	btreeRel = _get_curr_btree(sm_metadata);
 
-		Relation btreeRel = _get_curr_btree(sm_metadata);
+	if (true /* Check whether curr btree is full */) {
 		bool b = btinsert(btreeRel, values, isnull, 
 				ht_ctid, heapRel, checkUnique);
 
@@ -219,6 +218,9 @@ smergegettuple(IndexScanDesc scan, ScanDirection dir)
 	printf("btgettuple returns %d\n", res);
 
 	scan->xs_ctup = bt_scan->xs_ctup;
+	
+	scan->xs_itup = bt_scan->xs_itup;
+	scan->xs_itupdesc = bt_scan->xs_itupdesc;
 
 	/* If we're out of index entries, we're done */
 	// if (!res)
@@ -258,8 +260,9 @@ smergebeginscan(Relation rel, int nkeys, int norderbys)
 	so->bt_rel = _get_curr_btree(so->metadata);
 	so->bt_isd = btbeginscan(so->bt_rel, nkeys, norderbys);
 
-	scan->opaque = so;
+	scan->xs_itupdesc = RelationGetDescr(rel);
 
+	scan->opaque = so;
 
 	return scan;
 }

src/backend/access/smerge/smmeta.c

@@ -9,15 +9,22 @@ _sm_init_metadata(Page metapage, Oid bt_index, IndexInfo *indexInfo) {
 	PageInit(metapage, BLCKSZ, 0);
 
 	sm_metadata = (SmMetadata*) PageGetContents(metapage);
-	sm_metadata->K = 132;
-	sm_metadata->N = 35;
-	
+	sm_metadata->K = 3;
+	sm_metadata->N = 3;
+
 	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;
+	for (int i = 0; i < MAX_N; i++)
+		sm_metadata->levels[i] = 0;
+
+	for (int i = 0; i < MAX_N; i++) 
+		for (int j = 0; j < MAX_K; j++)
+			sm_metadata->tree[i][j] = InvalidOid;
+
+	sm_metadata->curr = bt_index;
+	sm_metadata->root = InvalidOid;
 	memcpy(sm_metadata, PageGetContents(metapage), sizeof(SmMetadata));
 
 	((PageHeader) metapage)->pd_lower =

src/include/access/smerge.h

@@ -80,8 +80,11 @@ typedef struct SmMetadata {
 	int attnum;
 	AttrNumber attrs[INDEX_MAX_KEYS];
 
-	int numList;
-	Oid list[64];
+	int levels[MAX_N];
+	Oid tree[MAX_N][MAX_K];
+	
+	Oid curr;
+	Oid root;
 } SmMetadata;
 
 typedef struct SmScanOpaqueData	
@@ -106,4 +109,6 @@ 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);
 
+// smerge functions
+extern Relation _get_curr_btree (SmMetadata* metadata);
 #endif   /* SMERGE_H */