First request for Mongo FDW

.gitattributes

@@ -0,0 +1,9 @@
+*		whitespace=space-before-tab,trailing-space
+*.[ch]	whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
+
+# Avoid confusing ASCII underlines with leftover merge conflict markers
+README		conflict-marker-size=32
+README.*	conflict-marker-size=32
+
+# Test output files that contain extra whitespace
+*.out					-whitespace

.gitignore

@@ -20,8 +20,12 @@
 
 # Executables
 *.exe
-*.out
 *.app
 *.i*86
 *.x86_64
 *.hex
+
+# pgregress results directory
+results/
+
+.idea/

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "mongo-c-driver"]
+	path = mongo-c-driver
+	url = ../../mongodb/mongo-c-driver.git
+[submodule "json-c"]
+	path = json-c
+	url = https://github.com/json-c/json-c.git

CONTRIBUTING.md

@@ -1,18 +1,17 @@
 Contributing to `mongo_fdw`
 ===========================
 
-Following these guidelines helps to facilitate relevant discussion in pull
-requests and issues so the developers managing and developing this open source
-project can address patches and bugs as efficiently as possible.
+Following these guidelines helps to facilitate relevant discussion in
+pull requests and issues so the developers managing and developing this
+open source project can address patches and bugs as efficiently as
+possible.
 
 
 Using Issues
 ------------
 
-`mongo_fdw`'s maintainers prefer that bug reports, feature requests, and pull
-requests are submitted as [GitHub Issues][1]. If you think you require personal
-assistance, please **do not** open an issue: email `engage` `@` `citusdata.com`
-instead.
+`mongo_fdw`'s maintainers prefer that bug reports, feature requests, and
+pull requests are submitted as [GitHub Issues][1].
 
 
 Bug Reports
@@ -21,20 +20,22 @@ Bug Reports
 Before opening a bug report:
 
   1. Search for a duplicate issue using GitHub's issue search
-  2. Check whethe the bug remains in the lasest `master` or `develop` commit
-  3. Create a reduced test case: remove code and data not relevant to the bug
+  2. Check whether the bug remains in the latest `master` or `develop`
+     commit
+  3. Create a reduced test case: remove code and data not relevant to
+     the bug
 
-A contributor should be able to begin work on your bug without asking too many
-followup questions. If you include the following information, your bug will be
-serviced more quickly:
+A contributor should be able to begin work on your bug without asking
+too many followup questions. If you include the following information,
+your bug will be serviced more quickly:
 
   * Short, descriptive title
   * Your OS
   * Versions of dependencies
   * Any custom modifications
 
-Once the background information is out of the way, you are free to present the
-bug itself. You should explain:
+Once the background information is out of the way, you are free to
+present the bug itself. You should explain:
 
   * Steps you took to exercise the bug
   * The expected outcome
@@ -44,42 +45,44 @@ bug itself. You should explain:
 Feature Requests
 ----------------
 
-We are open to adding features but ultimately control the scope and aims of the
-project. If a proposed feature is likely to incur high testing, maintenance, or
-performance costs it is also unlikely to be accepted. If a _strong_ case exists
-for a given feature, we may be persuaded on merit. Be specific.
+We are open to adding features but ultimately control the scope and aims
+of the project. If a proposed feature is likely to incur high testing,
+maintenance, or performance costs it is also unlikely to be accepted.
+If a _strong_ case exists for a given feature, we may be persuaded on
+merit. Be specific.
 
 
 Pull Requests
 -------------
 
-Well-constructed pull requests are very welcome. By _well-constructed_, we mean
-they do not introduce unrelated changes or break backwards compatibility. Just
-fork this repo and open a request against `develop`.
+Well-constructed pull requests are very welcome. By _well-constructed_,
+we mean they do not introduce unrelated changes or break backwards
+compatibility. Just fork this repo and open a request against `develop`.
 
-Some examples of things likely to increase the likelihood a pull request is
-rejected:
+Some examples of things likely to increase the likelihood a pull request
+is rejected:
 
   * Large structural changes, including:
-    * Refactoring for its own sake
+    * Re-factoring for its own sake
 	* Adding languages to the project
-  * Unnecesary whitespace changes
+  * Unnecessary whitespace changes
   * Deviation from obvious conventions
   * Introduction of incompatible intellectual property
 
-Please do not change version numbers in your pull request: they will be updated
-by the project owners prior to the next release.
+Please do not change version numbers in your pull request: they will be
+updated by the project owners prior to the next release.
 
 
 License
 -------
 
-By submitting a patch, you agree to allow the project owners to license your
-work under the terms of the [`LICENSE`][2]. Additionally, you grant the project
-owners a license under copyright covering your contribution to the extent
-permitted by law. Finally, you confirm that you own said copyright, have the
-legal authority to grant said license, and in doing so are not violating any
-grant of rights you have made to third parties, including your employer.
+By submitting a patch, you agree to allow the project owners to license
+your work under the terms of the [`LICENSE`][2]. Additionally, you grant
+the project owners a license under copyright covering your contribution
+to the extent permitted by law. Finally, you confirm that you own said
+copyright, have the legal authority to grant said license, and in doing
+so are not violating any grant of rights you have made to third parties,
+including your employer.
 
-[1]: https://github.com/citusdata/mongo_fdw/issues
+[1]: https://github.com/EnterpriseDB/mongo_fdw/issues
 [2]: LICENSE

INSTALL.md

@@ -0,0 +1,155 @@
+Notes about installation Mongo Foreign Data Wrapper
+===================================================
+
+To compile the [MongoDB][1] foreign data wrapper for [PostgreSQL](https://www.postgresql.org/), `mongo-c` and `json-c`
+libraries are needed. To build and install `mongo-c` and `json-c` libraries, there
+are two ways. You can either use script `autogen.sh` or you can manually
+perform all required steps listed.
+
+### Notes about new MongoDB C Driver support
+The current implementation is based on the driver version 1.17.3 of MongoDB.
+
+## Installation using script
+Number of manual steps needs to be performed to compile and install required
+mongo-c and json-c libraries. If you want to avoid the manual steps, there is a
+shell script available which will download and install the appropriate drivers
+and libraries for you.
+
+Here is how it works:
+
+To install mongo-c and json-c libraries at custom locations, you need to
+export environment variables `MONGOC_INSTALL_DIR` and `JSONC_INSTALL_DIR`
+respectively. If these variables are not set then these libraries will be
+installed in the default location. Please note that you need to have the
+required permissions on the directory where you want to install the libraries.
+
+   * autogen.sh
+
+The script autogen.sh will do all the necessary steps to build with mongo-c
+driver accordingly.
+
+## Steps for manual installation
+### mongo-c
+1. Download and extract source code of mongoc driver for version `1.17.3`
+
+	```sh
+	wget https://github.com/mongodb/mongo-c-driver/releases/download/1.17.3/mongo-c-driver-1.17.3.tar.gz
+	tar xzf mongo-c-driver-1.17.3.tar.gz
+	rm -rf mongo-c-driver
+	mv mongo-c-driver-1.17.3 mongo-c-driver
+	cd mongo-c-driver
+	```
+
+2. Configure mongoc driver
+
+	```sh
+	cmake -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF .
+	```
+
+	To install at custom location:
+
+	```sh
+	cmake -DCMAKE_INSTALL_PREFIX=YOUR_INSTALLATION_DIRECTORY -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF .
+	```
+
+3. Compile and install
+
+	```sh
+	cmake --build .
+	cmake --build . --target install
+	```
+
+For more details on installation of mongo-c driver, you can refer [here][3].
+
+### json-c
+
+1. Download and extract source code
+
+	```sh
+	wget https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz
+	tar -xzf json-c-0.15-20200726.tar.gz
+	rm -rf json-c
+	mv json-c-json-c-0.15-20200726/ json-c
+	cd json-c
+	```
+
+2. Configure
+
+	```sh
+	cmake .
+	```
+	To install at custom location:
+
+	```sh
+	cmake -DCMAKE_INSTALL_PREFIX=YOUR_INSTALLATION_DIRECTORY .
+	```
+
+3. Compile and install
+
+	```sh
+	make
+	make install
+	```
+
+For more details on installation of json-c library, you can refer [here][4].
+
+## Mongo_fdw configuration, compilation and installation
+The `PKG_CONFIG_PATH` environment variable must be set to mongo-c-driver source
+directory for successful compilation as shown below,
+
+```sh
+export PKG_CONFIG_PATH=$YOUR_MONGO_FDW_SOURCE_DIR/mongo-c-driver/src/libmongoc/src:$YOUR_MONGO_FDW_SOURCE_DIR/mongo-c-driver/src/libbson/src
+```
+
+The `LD_LIBRARY_PATH` environment variable must include the path to the mongo-c
+installation directory containing the libmongoc-1.0.so and libbson-1.0.so
+files. For example, assuming the installation directory is /home/mongo-c and
+the libraries were created under it in lib64 sub-directory, then we can define
+the `LD_LIBRARY_PATH` as:
+
+```sh
+export LD_LIBRARY_PATH=/home/mongo-c/lib64:$LD_LIBRARY_PATH
+```
+
+Note: This `LD_LIBRARY_PATH` environment variable setting must be in effect
+when the `pg_ctl` utility is executed to start or restart PostgreSQL or
+EDB Postgres Advanced Server.
+
+
+1. To build on POSIX-compliant systems you need to ensure the
+   `pg_config` executable is in your path when you run `make`. This
+   executable is typically in your PostgreSQL installation's `bin`
+   directory. For example:
+
+    ```sh
+    export PATH=/usr/local/pgsql/bin/:$PATH
+    ```
+
+2. Compile the code using make.
+
+    ```sh
+    make USE_PGXS=1
+    ```
+
+3. Finally install the foreign data wrapper.
+
+    ```sh
+    make USE_PGXS=1 install
+    ```
+
+4. Running regression test.
+
+    ```sh
+    make USE_PGXS=1 installcheck
+    ```
+   However, make sure to set the `MONGO_HOST`, `MONGO_PORT`, `MONGO_USER_NAME`,
+   and `MONGO_PWD` environment variables correctly. The default settings can be
+   found in the `mongodb_init.sh` script.
+
+
+If you run into any issues, please [let us know][2].
+
+[1]: http://www.mongodb.com
+[2]: https://github.com/enterprisedb/mongo_fdw/issues/new
+[3]: http://mongoc.org/libmongoc/1.17.3/installing.html#configuring-the-build
+[4]: https://github.com/json-c/json-c/tree/json-c-0.15-20200726#build-instructions--

Makefile

@@ -1,6 +1,7 @@
 # mongo_fdw/Makefile
 #
-# Copyright (c) 2012-2014 Citus Data, Inc.
+# Portions Copyright (c) 2004-2024, EnterpriseDB Corporation.
+# Portions Copyright © 2012–2014 Citus Data, Inc.
 #
 
 MODULE_big = mongo_fdw
@@ -10,21 +11,25 @@ MODULE_big = mongo_fdw
 # on another platform, change env_posix.os in MONGO_OBJS with the appropriate
 # environment object file.
 #
+LIBJSON = json-c
+LIBJSON_OBJS =  $(LIBJSON)/json_util.o $(LIBJSON)/json_object.o $(LIBJSON)/json_tokener.o \
+                                $(LIBJSON)/json_object_iterator.o $(LIBJSON)/printbuf.o $(LIBJSON)/linkhash.o \
+                                $(LIBJSON)/arraylist.o $(LIBJSON)/random_seed.o $(LIBJSON)/debug.o $(LIBJSON)/strerror_override.o
 
-MONGO_DRIVER = mongo-c-driver-v0.6
-MONGO_PATH = $(MONGO_DRIVER)/src
-MONGO_OBJS = $(MONGO_PATH)/bson.os $(MONGO_PATH)/encoding.os $(MONGO_PATH)/md5.os \
-             $(MONGO_PATH)/mongo.os $(MONGO_PATH)/numbers.os $(MONGO_PATH)/env_posix.os
+MONGO_INCLUDE = $(shell pkg-config --cflags libmongoc-1.0)
+PG_CPPFLAGS = --std=c99 $(MONGO_INCLUDE) -I$(LIBJSON)
+SHLIB_LINK = $(shell pkg-config --libs libmongoc-1.0)
+
+OBJS = connection.o option.o mongo_wrapper.o mongo_fdw.o mongo_query.o deparse.o $(LIBJSON_OBJS)
 
-PG_CPPFLAGS = --std=c99 -I$(MONGO_PATH)
-OBJS = mongo_fdw.o mongo_query.o $(MONGO_OBJS)
 
 EXTENSION = mongo_fdw
-DATA = mongo_fdw--1.0.sql
+DATA = mongo_fdw--1.0.sql  mongo_fdw--1.1.sql mongo_fdw--1.0--1.1.sql
 
-$(MONGO_DRIVER)/%.os:
-	$(MAKE) -C $(MONGO_DRIVER) $*.os
+REGRESS = server_options connection_validation dml select pushdown join_pushdown aggregate_pushdown limit_offset_pushdown
+REGRESS_OPTS = --load-extension=$(EXTENSION)
 
+ifdef USE_PGXS
 #
 # Users need to specify their Postgres installation path through pg_config. For
 # example: /usr/local/pgsql/bin/pg_config or /usr/lib/postgresql/9.1/bin/pg_config
@@ -33,3 +38,18 @@ $(MONGO_DRIVER)/%.os:
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+
+ifndef MAJORVERSION
+    MAJORVERSION := $(basename $(VERSION))
+endif
+
+ifeq (,$(findstring $(MAJORVERSION), 12 13 14 15 16 17))
+    $(error PostgreSQL 12, 13, 14, 15, 16, or 17 is required to compile this extension)
+endif
+
+else
+subdir = contrib/mongo_fdw
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif