commit e74c395b2ee804ee78271c47afa474c17e8dc802
author Ekta Khanna <ekhanna@vmware.com> Mon Apr 26 12:05:54 2021 -0700
committer Ekta Khanna <ekhanna@pivotal.io> Thu Apr 29 15:03:02 2021 -0700
tree ac06b37e5d9c223dec14da166a3608cff3277f67
parent bc9ef26fe04fcb40161ed70aed628a7f4ef7f11f

DL: Remove AOcontrol from load_top_k_accuracy fn

On running back to back queries for load_top_k_accuracy_function in the
same psql session on GPDB6, if any query fails in between, the very
next query hangs. This commit fixes that issue by moving the with
AOControl clause to where we create the table, rather than updating it
at the function entry level.

src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.py_in

diff --git a/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.py_in b/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.py_in
index f2f06d6..f556556 100644
--- a/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.py_in
+++ b/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.py_in
@@ -22,6 +22,7 @@
 from utilities.utilities import _assert
 from utilities.utilities import get_col_name_type_sql_string
 from utilities.utilities import current_user
+from utilities.utilities import is_platform_pg
 from utilities.utilities import is_superuser
 from utilities.utilities import get_schema
 from utilities.validate_args import columns_missing_from_table
@@ -78,9 +79,12 @@
         if not table_exists(object_table):
             col_defs = get_col_name_type_sql_string(CustomFunctionSchema.col_names,
                                                     CustomFunctionSchema.col_types)
+            with_query = "" if is_platform_pg() else """
+            with(appendonly=false)"""
 
             sql = """CREATE TABLE {object_table}
                                   ({col_defs}, PRIMARY KEY({fn_name}))
+                                  {with_query}
                 """.format(fn_name=CustomFunctionSchema.FN_NAME,**locals())
 
             plpy.execute(sql, 0)

src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.sql_in

diff --git a/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.sql_in b/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.sql_in
index 2bf3c56..e984b0b 100644
--- a/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.sql_in
+++ b/src/ports/postgres/modules/deep_learning/madlib_keras_custom_function.sql_in
@@ -362,8 +362,7 @@
     description             TEXT
 ) RETURNS VOID AS $$
     PythonFunctionBodyOnly(`deep_learning', `madlib_keras_custom_function')
-    with AOControl(False):
-        madlib_keras_custom_function.load_custom_function(**globals())
+    madlib_keras_custom_function.load_custom_function(**globals())
 $$ LANGUAGE plpythonu VOLATILE
 m4_ifdef(`__HAS_FUNCTION_PROPERTIES__', `MODIFIES SQL DATA', `');
 
@@ -435,8 +434,7 @@
     k                       INTEGER
 ) RETURNS VOID AS $$
     PythonFunctionBodyOnly(`deep_learning', `madlib_keras_custom_function')
-    with AOControl(False):
-        madlib_keras_custom_function.load_top_k_accuracy_function(**globals())
+    madlib_keras_custom_function.load_top_k_accuracy_function(**globals())
 $$ LANGUAGE plpythonu VOLATILE
 m4_ifdef(`__HAS_FUNCTION_PROPERTIES__', `MODIFIES SQL DATA', `');