Move rbtree.c from src/backend/utils/misc to src/backend/lib.

hlinnaka · hlinnaka · commit 955557ddccb4 · 2014-12-22T17:52:08.000+02:00
We have other general-purpose data structures in src/backend/lib, so it
seems like a better home for the red-black tree as well.
diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
@@ -12,6 +12,6 @@ subdir = src/backend/lib
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = ilist.o binaryheap.o pairingheap.o stringinfo.o
+OBJS = ilist.o binaryheap.o pairingheap.o rbtree.o stringinfo.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/lib/README b/src/backend/lib/README
@@ -5,6 +5,8 @@ binaryheap.c - a binary heap
 
 pairingheap.c - a pairing heap
 
+rbtree.c - a red-black tree
+
 ilist.c - single and double-linked lists.
 
 stringinfo.c - an extensible string type
@@ -19,6 +21,3 @@ while the binary heap works with plain Datums or pointers.
 
 The linked-lists in ilist.c can be embedded directly into other structs, as
 opposed to the List interface in nodes/pg_list.h.
-
-In addition to these, there is an implementation of a Red-Black tree in
-src/backend/utils/adt/rbtree.c.
diff --git a/src/backend/lib/rbtree.c b/src/backend/lib/rbtree.c
@@ -20,13 +20,13 @@
  * Copyright (c) 2009-2014, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  src/backend/utils/misc/rbtree.c
+ *	  src/backend/lib/rbtree.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "utils/rbtree.h"
+#include "lib/rbtree.h"
 
 
 /*
diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = guc.o help_config.o pg_rusage.o ps_status.o rbtree.o \
+OBJS = guc.o help_config.o pg_rusage.o ps_status.o \
        superuser.o timeout.o tzparser.o
 
 # This location might depend on the installation directories. Therefore
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
@@ -15,7 +15,7 @@
 #include "access/itup.h"
 #include "fmgr.h"
 #include "storage/bufmgr.h"
-#include "utils/rbtree.h"
+#include "lib/rbtree.h"
 
 
 /*
diff --git a/src/include/lib/rbtree.h b/src/include/lib/rbtree.h
@@ -6,7 +6,7 @@
  * Copyright (c) 2009-2014, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *		src/include/utils/rbtree.h
+ *		src/include/lib/rbtree.h
  *
  *-------------------------------------------------------------------------
  */

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,13 @@`
`20`	`20`	`* Copyright (c) 2009-2014, PostgreSQL Global Development Group`
`21`	`21`	`*`
`22`	`22`	`* IDENTIFICATION`
`23`		`- * src/backend/utils/misc/rbtree.c`
	`23`	`+ * src/backend/lib/rbtree.c`
`24`	`24`	`*`
`25`	`25`	`*-------------------------------------------------------------------------`
`26`	`26`	`*/`
`27`	`27`	`#include "postgres.h"`
`28`	`28`
`29`		`-#include "utils/rbtree.h"`
	`29`	`+#include "lib/rbtree.h"`
`30`	`30`
`31`	`31`
`32`	`32`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2009-2014, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * src/include/utils/rbtree.h`
	`9`	`+ * src/include/lib/rbtree.h`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`