diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-12-22 17:52:08 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-12-22 17:52:08 +0200 |
| commit | 955557ddccb4065831af80b0966cbd02937dfb72 (patch) | |
| tree | e853e7bc8217fd9bacbe61852fc12f4621788b18 | |
| parent | 7f0dccaed64a8ed6f5db8ad43e7612202fbeeeaf (diff) | |
| download | postgresql-955557ddccb4065831af80b0966cbd02937dfb72.tar.gz postgresql-955557ddccb4065831af80b0966cbd02937dfb72.zip | |
Move rbtree.c from src/backend/utils/misc to src/backend/lib.
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.
| -rw-r--r-- | src/backend/lib/Makefile | 2 | ||||
| -rw-r--r-- | src/backend/lib/README | 5 | ||||
| -rw-r--r-- | src/backend/lib/rbtree.c (renamed from src/backend/utils/misc/rbtree.c) | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/Makefile | 2 | ||||
| -rw-r--r-- | src/include/access/gin_private.h | 2 | ||||
| -rw-r--r-- | src/include/lib/rbtree.h (renamed from src/include/utils/rbtree.h) | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index b24ece68ad9..949ee5e41d0 100644 --- 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 index 5f4038f08cd..2f16351849d 100644 --- 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/utils/misc/rbtree.c b/src/backend/lib/rbtree.c index e3efd4c08bd..a450aa959ee 100644 --- a/src/backend/utils/misc/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 index c7b745e5131..449d5b47ea2 100644 --- 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 index 3d46f20bb83..77f5ffd4bf0 100644 --- 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/utils/rbtree.h b/src/include/lib/rbtree.h index 0c94151ce52..e4a0f638108 100644 --- a/src/include/utils/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 * *------------------------------------------------------------------------- */ |