Release 0.18.1

Analysis quota factor

Makefile

@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.18.0
+EXTVERSION = 0.18.1
 
 SED = sed
 
@@ -74,6 +74,7 @@ UPGRADABLE = \
   0.17.0 \
   0.17.1 \
   0.18.0 \
+  0.18.1 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)

NEWS.md

@@ -1,3 +1,8 @@
+0.18.1 (2016-10-19)
+-------------------
+
+* Increase analysis limit factor to 2 [#284](https://github.com/CartoDB/cartodb-postgresql/pull/284)
+
 0.18.0 (2016-10-17)
 -------------------
 

scripts-available/CDB_AnalysisCheck.sql

@@ -21,7 +21,7 @@ BEGIN
   factor := _CDB_GetConfAnalysisQuotaFactor();
   -- With a default value
   IF factor IS NULL THEN
-    factor := 0.2;
+    factor := 2;
   END IF;
   RETURN factor;
 END;
@@ -39,7 +39,7 @@ $$
 DECLARE
   schema_name TEXT;
   user_name TEXT;
-  qmax int8;
+  nominal_quota int8;
   cache_size float8;
 BEGIN
   -- We rely on the search_path to determine the user's schema and
@@ -53,8 +53,8 @@ BEGIN
   -- At the moment we're not using the provided table_name.
 
   SELECT current_schema() INTO schema_name;
-  EXECUTE FORMAT('SELECT %I._CDB_UserQuotaInBytes();', schema_name) INTO qmax;
-  IF qmax*_CDB_AnalysisQuotaFactor() < _CDB_AnalysisDataSize(schema_name) THEN
+  EXECUTE FORMAT('SELECT %I._CDB_UserQuotaInBytes();', schema_name) INTO nominal_quota;
+  IF nominal_quota*_CDB_AnalysisQuotaFactor() < _CDB_AnalysisDataSize(schema_name) THEN
     -- The limit is defined by a factor applied to the total space quota for the user
     RAISE EXCEPTION 'Analysis cache space limits exceeded';
   END IF;