Changeset 47 for hw

Timestamp:

09/26/07 02:32:47 (5 years ago)

Author:

cs186

Message:

Make MyStuff? consistent with the source tree!

Location:

hw/hw2/MyStuff

Files:

• geo_ops.c (modified) (4 diffs)
• gistget.c (modified) (3 diffs)

hw/hw2/MyStuff/geo_ops.c

@@ -808 +808 @@
 }
 
+double box_distance_internal(BOX *box1, BOX *box2)
+{
+  Point         a,
+                                b;
+
+        box_cn(&a, box1);
+        box_cn(&b, box2);
+  return(HYPOT(a.x - b.x, a.y - b.y));
+        
+}
 
 /*              box_distance    -               returns the distance between the
@@ -817 +827 @@
         BOX                *box1 = PG_GETARG_BOX_P(0);
         BOX                *box2 = PG_GETARG_BOX_P(1);
-        Point           a,
-                                b;
-
-        box_cn(&a, box1);
-        box_cn(&b, box2);
-
-        PG_RETURN_FLOAT8(HYPOT(a.x - b.x, a.y - b.y));
+  double   result = box_distance_internal(box1, box2);
+
+        PG_RETURN_FLOAT8(result);
 }
 
@@ -5248 +5254 @@
 }
 
-/* 
- * return the minimum possible distance between an object contained in box1 
- * and an object contained in box2.  assume that box1 and box2 are minimum 
- * bounding rectangles, so they have some object touching each side.
- */
 double box_mindist_internal(BOX *box1, BOX *box2)
 {
-  /* fill me in! */
-  return get_float8_infinity();
+  /* CS186 HW2: fill me in! */
 }
 
@@ -5266 +5266 @@
         PG_RETURN_FLOAT8(box_mindist_internal(box1, box2));
 }
+
+Datum box_true(PG_FUNCTION_ARGS)
+{
+        PG_RETURN_BOOL(TRUE);
+}

hw/hw2/MyStuff/gistget.c

@@ -199 +199 @@
   Assert(so->curbuf == InvalidBuffer);
   Assert(so->stack == NULL);
-  Assert(so->pq == NULL);
 
   so->curbuf = ReadBuffer(scan->indexRelation, GIST_ROOT_BLKNO);
@@ -210 +209 @@
 }
 
-/* 
- * Support routine for gistnext.  Deals with concurrency control issues to 
- * check if a node on the (cached) search stack was split by a concurrent
- * inserter.  If so, the result of the split can be found by adding right-hand 
- * neighbors of the split node to the search stack.  See 
- * Kornacker/Mohan/Hellerstein, SIGMOD 1997, for the protocol description.
+/*
+ * Support routine for gistnext.  Deals with concurrency control issues to
+ * check if the top node on the search stack was split by a concurrent
+ * inserter since the time it was put on the stack.  If so, the "rest"
+ * of the split can be found by adding the right-hand
+ * neighbor of the split node to the search stack.  See
+ * Kornacker/Mohan/Hellerstein, SIGMOD 1997, for details.
  */
 static void
@@ -239 +239 @@
       /* detect page split, follow right link to add pages */
 
+      /* 
+       * CS186 HW2: Fix me!
+       * Modify this next code to put the rightlinked block on
+       * the priority queue.
+       * Note: since this page was split since it was inserted into
+       * the priority queue, it has fewer items on it, and a different
+       * bounding box, so its priority may have changed.
+       */
       stk = (GISTSearchStack *) palloc0(sizeof(GISTSearchStack));
       stk->next = so->stack->next;