Changeset 121

Timestamp:

03/05/08 17:18:09 (9 months ago)

Author:

anton

Message:

Rolled back to the previous tuple scheme

Files:

• trunk/core/src/astar.c (modified) (1 diff)
• trunk/core/src/dijkstra.c (modified) (2 diffs)
• trunk/core/src/shooting_star.c (modified) (2 diffs)

trunk/core/src/astar.c

@@ -532 +532 @@
-      char* nulls;
-      
-DBG("Before allocation\n");
-
+/* This will work for some compilers. If it crashes with segfault, try to change the following block with this one    
+
-      values = palloc(4 * sizeof(Datum));
-      nulls = palloc(4 * sizeof(char));
-
-
-
+
-      values[0] = call_cntr;
-      nulls[0] = ' ';
-      values[1] = Int32GetDatum(path[call_cntr].vertex_id);
-      nulls[1] = ' ';
-
+ 
-      nulls[2] = ' ';
-      values[3] = Float8GetDatum(path[call_cntr].cost);
-      nulls[3] = ' ';
-
+
+
+
+
+
+
+
+
+
+
+
+
-      DBG("Heap making\n");
-      

trunk/core/src/dijkstra.c

@@ -419 +419 @@
-      char* nulls;
-
+      /* This will work for some compilers. If it crashes with segfault, try to change the following block with this one    
+ 
-      values = palloc(4 * sizeof(Datum));
-      nulls = palloc(4 * sizeof(char));
-
-
+
-      values[0] = call_cntr;
-      nulls[0] = ' ';
@@ -431 +432 @@
-      values[3] = Float8GetDatum(path[call_cntr].cost);
-      nulls[3] = ' ';
-
+
+
+
+
+
+
+
+
+
+
+
+
-      tuple = heap_formtuple(tuple_desc, values, nulls);
-

trunk/core/src/shooting_star.c

@@ -518 +518 @@
-      char* nulls;
-      
+      /* This will work for some compilers. If it crashes with segfault, try to change the following block with this one    
+  
-      values = palloc(4 * sizeof(Datum));
-      nulls = palloc(4 * sizeof(char));
-
-
+
-      values[0] = call_cntr;
-      nulls[0] = ' ';
@@ -530 +531 @@
-      values[3] = Float8GetDatum(path[call_cntr].cost);
-      nulls[3] = ' ';
-
+
+
+
+
+
+
+
+
+
+
+
+
-      tuple = heap_formtuple(tuple_desc, values, nulls);
-