Merge pull request #37 from fetchq/refactor-v3-logs

Refactor v3

Author: marcopeg

Dockerfile-10.11

@@ -1,2 +1,3 @@
 FROM postgres:10.11
 ADD ./extension /usr/share/postgresql/10/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-10.4

@@ -1,2 +1,3 @@
 FROM postgres:10.4
 ADD ./extension /usr/share/postgresql/10/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-11.6

@@ -1,2 +1,3 @@
 FROM postgres:11.6
 ADD ./extension /usr/share/postgresql/11/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-12.0

@@ -1,2 +1,3 @@
 FROM postgres:12.0
 ADD ./extension /usr/share/postgresql/12/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-12.1

@@ -1,2 +1,3 @@
 FROM postgres:12.1
 ADD ./extension /usr/share/postgresql/12/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-12.4

@@ -0,0 +1,3 @@
+FROM postgres:12.4
+ADD ./extension /usr/share/postgresql/12/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-13.0

@@ -0,0 +1,3 @@
+FROM postgres:13.0
+ADD ./extension /usr/share/postgresql/13/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Dockerfile-9.6

@@ -1,2 +1,3 @@
 FROM postgres:9.6
 ADD ./extension /usr/share/postgresql/9.6/extension/
+ADD ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

Makefile

@@ -1,18 +1,23 @@
 
 registry ?= fetchq
 name ?= fetchq
-version ?= 2.2.0
+version ?= 3.0.0
 
 ## Testing with Postgres Versions
 ## It's a good idea to always test with all the versions
 ## it's manual and it sucks, we'll see about that in the future
 
-# 9.6 10.11 11.6 12.1
-pg_version ?= 9.6
-# 9.6 10 11.6 12
-pg_extension_folder ?= 9.6
+# 9.6 10.11 11.6 12.1 12.4 13.0
+pg_version ?= 13.0
+# 9.6 10 11.6 12 13
+pg_extension_folder ?= 13
 
 reset:
+	# Cleanup current db
+	docker stop fetchq || true
+	docker rm -f fetchq || true
+
+	# Cleanup data folders
 	rm -rf $(CURDIR)/data
 	rm -rf $(CURDIR)/extension
 	mkdir $(CURDIR)/data
@@ -67,10 +72,10 @@ build:
 		$(CURDIR)/src/queue-drop.sql \
 		$(CURDIR)/src/queue-set-max-attempts.sql \
 		$(CURDIR)/src/queue-set-current-version.sql \
-		$(CURDIR)/src/queue-set-errors-retention.sql \
+		$(CURDIR)/src/queue-set-logs-retention.sql \
 		$(CURDIR)/src/queue-set-metrics-retention.sql \
 		$(CURDIR)/src/queue-drop-version.sql \
-		$(CURDIR)/src/queue-drop-errors.sql \
+		$(CURDIR)/src/queue-drop-logs.sql \
 		$(CURDIR)/src/queue-drop-metrics.sql \
 		$(CURDIR)/src/queue-drop-indexes.sql \
 		$(CURDIR)/src/queue-top.sql \
@@ -138,6 +143,8 @@ build-image: reset build
 	docker build --no-cache -t ${name}:11.6-${version} -f Dockerfile-11.6 .
 	docker build --no-cache -t ${name}:12.0-${version} -f Dockerfile-12.0 .
 	docker build --no-cache -t ${name}:12.1-${version} -f Dockerfile-12.1 .
+	docker build --no-cache -t ${name}:12.4-${version} -f Dockerfile-12.4 .
+	docker build --no-cache -t ${name}:13.0-${version} -f Dockerfile-13.0 .
 
 publish: build-image
 	# 9.6
@@ -170,29 +177,42 @@ publish: build-image
 	docker tag ${name}:12.1-${version} ${registry}/${name}:12.1-latest
 	docker push ${registry}/${name}:12.1-${version}
 	docker push ${registry}/${name}:12.1-latest
+	# 12.4
+	docker tag ${name}:12.4-${version} ${registry}/${name}:12.4-${version}
+	docker tag ${name}:12.4-${version} ${registry}/${name}:12.4-latest
+	docker push ${registry}/${name}:12.4-${version}
+	docker push ${registry}/${name}:12.4-latest
+	# 13.0
+	docker tag ${name}:13.0-${version} ${registry}/${name}:13.0-${version}
+	docker tag ${name}:13.0-${version} ${registry}/${name}:13.0-latest
+	docker push ${registry}/${name}:13.0-${version}
+	docker push ${registry}/${name}:13.0-latest
 	# latest
-	docker tag ${name}:12.0-${version} ${registry}/${name}:latest
+	docker tag ${name}:13.0-${version} ${registry}/${name}:latest
 	docker push ${registry}/${name}:latest
 
 start-pg:
 	docker run --rm -d \
 		--name fetchq \
 		-p 5432:5432 \
+		-e POSTGRES_PASSWORD=postgres \
 		-v $(CURDIR)/data/pg:/var/lib/postgresql/data \
 		-v $(CURDIR)/extension/fetchq.control:/usr/share/postgresql/$(pg_extension_folder)/extension/fetchq.control \
 		-v $(CURDIR)/extension/fetchq--${version}.sql:/usr/share/postgresql/$(pg_extension_folder)/extension/fetchq--${version}.sql \
 		-v $(CURDIR)/data/fetchq--${version}.test.sql:/tests/fetchq--${version}.test.sql \
 		postgres:$(pg_version)
 
-start-pg-prod:
+production: reset build-image
 	docker run --rm -d \
+		-e POSTGRES_PASSWORD=postgres \
 		--name fetchq \
 		-p 5432:5432 \
 		fetchq:$(pg_version)-$(version)
 	docker logs -f fetchq
 
 start-delay:
-	sleep 20
+	until docker exec fetchq pg_isready ; do sleep 1 ; done
+	sleep 2
 
 start: reset build build-test start-pg
 	docker logs -f fetchq

README.md

@@ -1,6 +1,7 @@
-# FetchQ Postgres Extension
+# Fetchq Postgres Extension
+
+Postgres extension that enables FetchQ capabilities.
 
-Postgres extension that enables FetchQ capabilities
 
 ## How to Work this out
 
@@ -13,6 +14,29 @@ Postgres extension that enables FetchQ capabilities
 
 ---
 
+## Quick Start
+
+You can easily run the production version of Fetchq using Docker on a Linux machine:
+
+```bash
+make production
+```
+
+At this point you can connect to:
+
+```
+postgres://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/postgres
+```
+
+This will give you an empty PostgreSQL instance with Fetchq installed as an extension and initialized as well.
+
+From here, you can just start creating queues and handling documents:
+
+```sql
+select * from fetchq.queue_create('foo');
+select * from fetchq.doc_append('foo', '{"a":1}', 0, 0);
+```
+
 ## Management Tables
 
 fetchq_sys_queues