From 6924cc4512e579f682254b6842002f823d767f0e Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 11:00:21 +0200
Subject: [PATCH 1/6] Added cache for OBS_GetMeta function results

---
 src/pg/sql/45_observatory_mvt.sql | 75 ++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/pg/sql/45_observatory_mvt.sql b/src/pg/sql/45_observatory_mvt.sql
index aa24851..8a6185e 100644
--- a/src/pg/sql/45_observatory_mvt.sql
+++ b/src/pg/sql/45_observatory_mvt.sql
@@ -218,16 +218,65 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetMCDOMVT(z INTEGER, x INTEGER, y INTEGER,
-geography_level TEXT,
-do_measurements TEXT[],
-mastercard_measurements TEXT[],
-shoreline_clipped BOOLEAN DEFAULT True,
-optimize_clipping BOOLEAN DEFAULT False,
-simplify_geometries BOOLEAN DEFAULT False,
-area_normalized BOOLEAN DEFAULT False,
-mastercard_category TEXT DEFAULT 'Total Retail',
-extent INTEGER DEFAULT 4096, buf INTEGER DEFAULT 256, clip_geom BOOLEAN DEFAULT True)
+DROP TABLE IF EXISTS cdb_observatory.OBS_CachedMeta;
+CREATE TABLE cdb_observatory.OBS_CachedMeta(
+  z INTEGER,
+  parameters TEXT,
+  num_timespans INTEGER,
+  num_scores INTEGER,
+  num_target_geoms INTEGER,
+  result JSON,
+  PRIMARY KEY (z, parameters, num_timespans, num_scores, num_target_geoms)
+);
+
+CREATE OR REPLACE FUNCTION cdb_observatory.OBS_RetrieveMeta(
+  zoom INTEGER,
+  geom geometry(Geometry, 4326),
+  getmeta_parameters JSON,
+  num_timespan_options INTEGER DEFAULT NULL,
+  num_score_options INTEGER DEFAULT NULL,
+  target_geoms INTEGER DEFAULT NULL)
+RETURNS JSON
+AS $$
+DECLARE
+  result JSON;
+BEGIN
+  SELECT c.result
+    INTO result
+    FROM cdb_observatory.OBS_CachedMeta c
+   WHERE c.z = zoom
+     AND c.parameters = getmeta_parameters::TEXT
+     AND c.num_timespans = num_timespan_options
+     AND c.num_scores = num_score_options
+     AND c.num_target_geoms = target_geoms;
+
+  IF result IS NULL THEN
+    result := cdb_observatory.obs_getmeta(geom, getmeta_parameters, num_timespan_options, num_score_options, target_geoms);
+
+    INSERT INTO cdb_observatory.OBS_CachedMeta(z, parameters, num_timespans, num_scores, num_target_geoms, result)
+    SELECT zoom, getmeta_parameters::TEXT, num_timespan_options, num_score_options, target_geoms, result
+    ON CONFLICT (z, parameters, num_timespans, num_scores, num_target_geoms) 
+    DO UPDATE SET result = EXCLUDED.result;
+  END IF;
+
+  return result;
+END
+$$ LANGUAGE plpgsql PARALLEL RESTRICTED;
+
+CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetMCDOMVT(
+  z INTEGER, x INTEGER, y INTEGER,
+  geography_level TEXT,
+  do_measurements TEXT[],
+  mastercard_measurements TEXT[],
+  use_meta_cache BOOLEAN DEFAULT True,
+  shoreline_clipped BOOLEAN DEFAULT True,
+  optimize_clipping BOOLEAN DEFAULT False,
+  simplify_geometries BOOLEAN DEFAULT False,
+  area_normalized BOOLEAN DEFAULT False,
+  mastercard_category TEXT DEFAULT 'Total Retail',
+  extent INTEGER DEFAULT 4096,
+  buf INTEGER DEFAULT 256,
+  clip_geom BOOLEAN DEFAULT True)
 RETURNS TABLE (
   mvtgeom GEOMETRY,
   mvtdata JSONB
@@ -317,7 +366,11 @@ BEGIN
   END LOOP;
   getmeta_parameters := substring(getmeta_parameters from 1 for length(getmeta_parameters) - 1) || ' ]';
 
-  meta := cdb_observatory.obs_getmeta(geom, getmeta_parameters::json, 1::integer, 1::integer, 1::integer);
+  IF use_meta_cache THEN
+    meta := cdb_observatory.OBS_RetrieveMeta(z, geom, getmeta_parameters::json, 1::integer, 1::integer, 1::integer);
+  ELSE
+    meta := cdb_observatory.obs_getmeta(geom, getmeta_parameters::json, 1::integer, 1::integer, 1::integer);
+  END IF;
 
   IF meta IS NOT NULL THEN
     SELECT  array_agg(distinct 'observatory.'||numer_tablename) numer_tablenames,

From 865c1a38c338acd733783a6b6c9e55331d4da854 Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 12:53:44 +0200
Subject: [PATCH 2/6] Added plpythonu

---
 .travis.yml                    | 1 +
 scripts/ci/install_postgres.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a7a3cbf..d477a07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ matrix:
 
 before_install:
   - sudo bash $TRAVIS_BUILD_DIR/scripts/ci/install_postgres.sh
+  - sudo make clean-all
 
 install:
   - sudo make install
diff --git a/scripts/ci/install_postgres.sh b/scripts/ci/install_postgres.sh
index 9ea6676..561e050 100644
--- a/scripts/ci/install_postgres.sh
+++ b/scripts/ci/install_postgres.sh
@@ -32,6 +32,8 @@ apt-get -y install postgresql-${PGSQL_VERSION} postgresql-${PGSQL_VERSION}-postg
 # Configure it to accept local connections from postgres
 echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" > /etc/postgresql/${PGSQL_VERSION}/main/pg_hba.conf
 
+psql -c  "CREATE LANGUAGE plpythonu;"
+
 # Restart PostgreSQL
 /etc/init.d/postgresql restart ${PGSQL_VERSION}
 

From f148057e459de2e0dae63669257caad4f83e0df7 Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 13:08:50 +0200
Subject: [PATCH 3/6] Added plpythonu

---
 scripts/ci/install_postgres.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/install_postgres.sh b/scripts/ci/install_postgres.sh
index 561e050..b80f25b 100644
--- a/scripts/ci/install_postgres.sh
+++ b/scripts/ci/install_postgres.sh
@@ -32,7 +32,7 @@ apt-get -y install postgresql-${PGSQL_VERSION} postgresql-${PGSQL_VERSION}-postg
 # Configure it to accept local connections from postgres
 echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" > /etc/postgresql/${PGSQL_VERSION}/main/pg_hba.conf
 
-psql -c  "CREATE LANGUAGE plpythonu;"
+psql -U postgres -c  "CREATE LANGUAGE plpythonu;"
 
 # Restart PostgreSQL
 /etc/init.d/postgresql restart ${PGSQL_VERSION}

From 0f9c53ddc2fe0502a63aee8eae17460138a02983 Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 13:43:23 +0200
Subject: [PATCH 4/6] Added plpythonu

---
 scripts/ci/install_postgres.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/install_postgres.sh b/scripts/ci/install_postgres.sh
index b80f25b..391971d 100644
--- a/scripts/ci/install_postgres.sh
+++ b/scripts/ci/install_postgres.sh
@@ -27,7 +27,7 @@ done
 apt-get -y autoremove
 
 # Install PostgreSQL
-apt-get -y install postgresql-${PGSQL_VERSION} postgresql-${PGSQL_VERSION}-postgis-${POSTGIS_VERSION} postgresql-server-dev-${PGSQL_VERSION}
+apt-get -y install postgresql-${PGSQL_VERSION} postgresql-${PGSQL_VERSION}-postgis-${POSTGIS_VERSION} postgresql-server-dev-${PGSQL_VERSION} postgresql-plpython-${PGSQL_VERSION}
 
 # Configure it to accept local connections from postgres
 echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" > /etc/postgresql/${PGSQL_VERSION}/main/pg_hba.conf

From e72b4ea7b651adb2702df2a49d861a213bd5a59f Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 14:03:42 +0200
Subject: [PATCH 5/6] Added plpythonu

---
 scripts/ci/install_postgres.sh           | 2 --
 src/pg/test/expected/01_install_test.out | 1 +
 src/pg/test/sql/01_install_test.sql      | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/install_postgres.sh b/scripts/ci/install_postgres.sh
index 391971d..1b3929f 100644
--- a/scripts/ci/install_postgres.sh
+++ b/scripts/ci/install_postgres.sh
@@ -32,8 +32,6 @@ apt-get -y install postgresql-${PGSQL_VERSION} postgresql-${PGSQL_VERSION}-postg
 # Configure it to accept local connections from postgres
 echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" > /etc/postgresql/${PGSQL_VERSION}/main/pg_hba.conf
 
-psql -U postgres -c  "CREATE LANGUAGE plpythonu;"
-
 # Restart PostgreSQL
 /etc/init.d/postgresql restart ${PGSQL_VERSION}
 
diff --git a/src/pg/test/expected/01_install_test.out b/src/pg/test/expected/01_install_test.out
index d6e253f..213e9c2 100644
--- a/src/pg/test/expected/01_install_test.out
+++ b/src/pg/test/expected/01_install_test.out
@@ -1,5 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
+CREATE LANGUAGE plpythonu;
 -- Install the extension
 CREATE EXTENSION observatory VERSION 'dev';
 \i test/fixtures/load_fixtures.sql
diff --git a/src/pg/test/sql/01_install_test.sql b/src/pg/test/sql/01_install_test.sql
index 5c2dbf3..fe536ca 100644
--- a/src/pg/test/sql/01_install_test.sql
+++ b/src/pg/test/sql/01_install_test.sql
@@ -1,5 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
+CREATE LANGUAGE plpythonu;
 
 -- Install the extension
 CREATE EXTENSION observatory VERSION 'dev';

From f5d6716acc119d5d13cfbf5deeea6c05688f5b20 Mon Sep 17 00:00:00 2001
From: antoniocarlon <antoniocarlon@gmail.com>
Date: Wed, 13 Jun 2018 14:24:04 +0200
Subject: [PATCH 6/6] Added plpythonu

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d477a07..c28e5ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ env:
 
 matrix:
   include:
-    - env: PGSQL_VERSION=9.5 POSTGIS_VERSION=2.2
     - env: PGSQL_VERSION=9.6 POSTGIS_VERSION=2.3
     - env: PGSQL_VERSION=10 POSTGIS_VERSION=2.4