review fixes

Author: mariadb-AlanMologorsky

cmapi/cmapi_server/controllers/s3dataload.py

@@ -259,9 +259,13 @@ def prepare_google_storage(
             cpimport_command_line += ['-C', escaped_by]
         if enclosed_by:
             cpimport_command_line += ['-E', enclosed_by]
-        if mode is not None and int(mode) in (2, 3):
-            cpimport_command_line += ['-m', str(int(mode))]
-
+        if mode is not None:
+            try:
+                mode_val = int(mode)
+                if mode_val in (2, 3):
+                    cpimport_command_line += ['-m', str(mode_val)]
+            except (ValueError, TypeError):
+                module_logger.error(f'Invalid mode value: {mode}')
         module_logger.debug(
             f'cpimport command line: {" ".join(cpimport_command_line)}'
         )

dbcon/mysql/columnstore_info.sql

@@ -127,7 +127,7 @@ CREATE OR REPLACE PROCEDURE load_from_s3 (in bucket varchar(256) CHARACTER SET u
                                           in terminated_by varchar(256) CHARACTER SET utf8,
                                           in enclosed_by varchar(1) CHARACTER SET utf8,
                                           in escaped_by varchar(1) CHARACTER SET utf8,
-                                          in mode int
+                                          in mode int DEFAULT 0
                                           )
 LANGUAGE SQL
 NOT DETERMINISTIC