[madlib] branch master updated: DL: Fix failure on GPDB6 for preprocessor

[khannaekta]

This is an automated email from the ASF dual-hosted git repository.

khannaekta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git


The following commit(s) were added to refs/heads/master by this push:
     new 7625ae0  DL: Fix failure on GPDB6 for preprocessor
7625ae0 is described below

commit 7625ae01f9acd4d3bdf77b27c986ae75d10707f3
Author: Ekta Khanna <ekha...@pivotal.io>
AuthorDate: Fri Jan 10 13:40:57 2020 -0800

    DL: Fix failure on GPDB6 for preprocessor
    
    Prior to this commit, on GPDB6, running the preprocessor on a large
    dataset would fail with the following error:
    ERROR:  DTX RollbackAndReleaseCurrentSubTransaction dispatch failed
    
    This commit fixes this issue on GPDB6 as well.
    
    Co-authored-by: Nikhil Kak <n...@pivotal.io>
---
 .../postgres/modules/deep_learning/input_data_preprocessor.py_in   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in 
b/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
index 351e6a5..3a5f118 100644
--- a/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
+++ b/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
@@ -528,9 +528,10 @@ class InputDataPreprocessorDL(object):
 
         # Disable optimizer (ORCA) for platforms that use it
         # since we want to use a groupagg instead of hashagg
-        with OptimizerControl(False) and HashaggControl(False):
-            # Run actual batching query
-            plpy.execute(batching_query.format(**locals()))
+        with OptimizerControl(False):
+            with HashaggControl(False):
+                # Run actual batching query
+                plpy.execute(batching_query.format(**locals()))
 
         plpy.execute("DROP TABLE {0}".format(normalized_tbl))