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

Author: tastelessjolt

src/backend/access/smerge/Makefile

@@ -12,6 +12,6 @@ subdir = src/backend/access/smerge
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = smerge.o smbtree.o smmeta.o
+OBJS = smerge.o smbtree.o smmeta.o smsort.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/smerge/smsort.c

@@ -1,11 +1,17 @@
 #include "postgres.h"
 #include "access/smerge.h"
 #include "access/nbtree.h"
+#include "access/genam.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
+#include "access/skey.h"
 #include "catalog/dependency.h"
 #include "catalog/pg_class.h"
 #include "nodes/parsenodes.h"
 #include "commands/defrem.h"
 #include "miscadmin.h"
+#include "pg_config_manual.h"
+#include "executor/tuptable.h"
 
 /*
  * Status record for spooling/sorting phase.  (Note we may have two of
@@ -724,11 +730,75 @@ _sm_merge_delete_btree(Oid btreeOid) {
     performDeletion(&object, DROP_RESTRICT, PERFORM_DELETION_INTERNAL);
 }
 
-void sm_flush(Relation rel, Relation heapRel, SmMetadata* metadata) {
+static void
+_sm_merge_rescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,
+         ScanKey orderbys, int norderbys) {
+    if (scankey && scan->numberOfKeys > 0)
+        memmove(scan->keyData,
+                scankey,
+                scan->numberOfKeys * sizeof(ScanKeyData));
+
+    /* Release any held pin on a heap page */
+    if (BufferIsValid(scan->xs_cbuf))
+    {
+        ReleaseBuffer(scan->xs_cbuf);
+        scan->xs_cbuf = InvalidBuffer;
+    }
+
+    scan->xs_continue_hot = false;
+
+    scan->kill_prior_tuple = false;      /* for safety */
+
+    btrescan(scan, scankey, nscankeys, orderbys, norderbys);
+}
+
+void
+sm_flush(Relation heapRel, SmMetadata* metadata) {
     for(int i = 0; i < MAX_N - 1; i++) {
         if(metadata->levels[i] == MAX_K) {
 
             BTSpool* btspools[MAX_K]; // TODO
+
+            for(int j = 0; j < MAX_K; j++) {
+                Relation indexRel = index_open(metadata->tree[i][j], ExclusiveLock);
+                _bt_spoolinit(heapRel, indexRel, metadata->unique, false); // Assuming heapRel is not being used
+
+                IndexScanDesc scan = btbeginscan(indexRel, metadata->attnum, 0);
+
+                ScanKeyData scankey;
+    //             sk_flags;       /* flags, see below */
+    // AttrNumber  sk_attno;       /* table or index column number */
+    // StrategyNumber sk_strategy;  operator strategy number  -- no
+    // Oid         sk_subtype;     /* strategy subtype */ -- no
+    // Oid         sk_collation;   /* collation to use, if needed */ -- no
+    // FmgrInfo    sk_func; -- not req
+                scankey.sk_flags = SK_SEARCHNOTNULL;
+                scankey.sk_attno = metadata->attrs[0];
+                scankey.sk_argument = (Datum) NULL;
+                _sm_merge_rescan(scan, &scankey, metadata->attnum, NULL, 0);
+
+                TupleTableSlot* slot;
+                slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRel));
+
+                while(btgettuple(scan, ForwardScanDirection)) {
+                    bool isnull[INDEX_MAX_KEYS];
+                    Datum values[INDEX_MAX_KEYS];
+
+                    for(int k = 0; k < metadata->attnum; k++ ) {
+                        int keycol = metadata->attrs[k];
+                        Datum iDatum;
+                        bool isNull;
+                        iDatum = slot_getattr(slot, keycol, &isNull);
+                        values[k] = iDatum;
+                        isnull[k] = isNull;
+                    }
+                    _bt_spool(btspools[i], &(scan->xs_ctup.t_self), values, isnull);
+                }
+
+            }
+
+            // IndexScanDesc scan = btbeginscan(, metadata->attnum, )
+
             Oid mergeBtreeOid = _sm_merge_create_btree(heapRel, metadata);
             BTWriteState wstate;
 

src/include/access/smerge.h

@@ -91,6 +91,8 @@ typedef struct SmMetadata {
 
 	Oid curr;
 	Oid root;
+
+	bool unique;
 } SmMetadata;
 
 typedef struct SmScanOpaqueData
@@ -124,5 +126,5 @@ extern void _sm_write_metadata(Relation index, SmMetadata* sm_metadata);
 extern Relation _get_curr_btree (SmMetadata* metadata);
 
 // smsort functions
-extern void sm_flush(Relation rel, Relation heapRel, SmMetadata* metadata);
+extern void sm_flush(Relation heapRel, SmMetadata* metadata);
 #endif   /* SMERGE_H */