From e951a38876c7f92b46530efe6a39d8f5ad3bd22a Mon Sep 17 00:00:00 2001
From: Prudhvi Porandla <prudhvi.porandla@icloud.com>
Date: Wed, 18 Sep 2019 16:56:12 +0530
Subject: [PATCH 1/2] disable mimalloc for xenial. enable gandiva jni tests

---
 .travis.yml                    | 2 +-
 ci/travis_before_script_cpp.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09a53a6c9be85..1261f3877a575 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,7 +90,7 @@ matrix:
     - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh || travis_terminate 1
-    # - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
+    - $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_java.sh || travis_terminate 1
     - $TRAVIS_BUILD_DIR/ci/travis_upload_cpp_coverage.sh || travis_terminate 1
   - name: "Python 3.6 unit tests w/ Valgrind, conda-forge toolchain, coverage"
     compiler: gcc
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index 9c6caffd48d81..b5ef851d1d387 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -62,7 +62,10 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
   CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_WITH_BZ2=ON"
 fi
 
-CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_MIMALLOC=ON"
+
+if [ "$DISTRO_CODENAME" != "xenial" ]; then
+  CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_MIMALLOC=ON"
+fi
 
 if [ $only_library_mode == "yes" ]; then
   CMAKE_COMMON_FLAGS="\

From 412e96a74a762cfcc43c15185c701555faf5bf0f Mon Sep 17 00:00:00 2001
From: Prudhvi Porandla <prudhvi.porandla@icloud.com>
Date: Thu, 19 Sep 2019 13:06:08 +0530
Subject: [PATCH 2/2] new travis flag to disable MIMALLOC

---
 .travis.yml                    | 7 +++++++
 ci/travis_before_script_cpp.sh | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1261f3877a575..4fc143a493dbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,8 @@ matrix:
     # TODO: This fails in re2 code
     # - ARROW_TRAVIS_VALGRIND=1
     - ARROW_TRAVIS_VERBOSE=1
+    # ARROW-6509: disable MIMALLOC on xenial
+    # - ARROW_TRAVIS_MIMALLOC=1
     before_script:
     - if [ $ARROW_CI_CPP_AFFECTED != "1" ] && [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
     - $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
@@ -142,6 +144,7 @@ matrix:
     - ARROW_TRAVIS_OPTIONAL_INSTALL=1
     - ARROW_TRAVIS_VERBOSE=1
     - ARROW_BUILD_WARNING_LEVEL=CHECKIN
+    - ARROW_TRAVIS_MIMALLOC=1
     before_script:
     - if [ $ARROW_CI_CPP_AFFECTED != "1" ] && [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
     # If either C++ or Python changed, we must install the C++ libraries
@@ -188,6 +191,7 @@ matrix:
     # TODO(ARROW-4764): Using system java and plasma built with conda doesn't work
     #- ARROW_TRAVIS_PLASMA=1
     #- ARROW_TRAVIS_PLASMA_JAVA_CLIENT=1
+    - ARROW_TRAVIS_MIMALLOC=1
     before_script:
     - if [ $ARROW_CI_INTEGRATION_AFFECTED != "1" ]; then exit; fi
     - $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
@@ -221,6 +225,7 @@ matrix:
     - ARROW_TRAVIS_GANDIVA=1
     - ARROW_TRAVIS_PARQUET=1
     - ARROW_TRAVIS_PLASMA=1
+    - ARROW_TRAVIS_MIMALLOC=1
     before_script:
     - if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi
     - $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
@@ -243,6 +248,7 @@ matrix:
     - ARROW_TRAVIS_PLASMA=1
     - ARROW_TRAVIS_PYTHON=1
     - ARROW_TRAVIS_VERBOSE=1
+    - ARROW_TRAVIS_MIMALLOC=1
     cache:
     addons:
     before_script:
@@ -300,6 +306,7 @@ matrix:
     env:
     - ARROW_TRAVIS_PARQUET=1
     - ARROW_TRAVIS_USE_SYSTEM=1
+    - ARROW_TRAVIS_MIMALLOC=1
     before_install:
     # Have to copy-paste this here because of how R's build steps work
     - eval `python $TRAVIS_BUILD_DIR/ci/detect-changes.py`
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index b5ef851d1d387..c5458987d2586 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -62,8 +62,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
   CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_WITH_BZ2=ON"
 fi
 
-
-if [ "$DISTRO_CODENAME" != "xenial" ]; then
+if [ "$ARROW_TRAVIS_MIMALLOC" == "1" ]; then
   CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_MIMALLOC=ON"
 fi