wl#7614 opts-check1.diff

check --input-type and --output-type

(cherry picked from commit a2350e14f9e61431bdac0eef62d73ffc47da1fdd)

Author: Pekka Nousiainen

mysql-test/suite/ndb/r/ndb_import0.result

@@ -8,6 +8,12 @@ b int
 ) engine=ndb;
 # csv file does not exist
 # bad state dir
+# normal import
+select count(*) from t1;
+count(*)
+1000
+# invalid --input-type
+# invalid --output-type
 # simple utf8 test
 create table t2 (
 a int primary key,

mysql-test/suite/ndb/t/ndb_import0.test

@@ -29,8 +29,6 @@ create table t1 (
 exec $NDB_IMPORT --state-dir=$MYSQLTEST_VARDIR/tmp
      test '/foo/data/t1.csv' >> $NDB_TOOLS_OUTPUT 2>&1;
 
---echo # bad state dir
-
 perl;
 use strict;
 use Symbol;
@@ -40,15 +38,37 @@ my $file = "$vardir/tmp/t1.csv";
 my $fh = gensym();
 open($fh, ">$file")
   or die "$file: open for write failed: $!";
+for my $i (0..999) {
+  print $fh $i, "\t", $i*10, "\n";
+}
 close($fh)
   or die "$file: close after write failed: $!";
 exit(0)
 EOF
 
+--echo # bad state dir
 --error 1
 exec $NDB_IMPORT --state-dir=/foo/state
      test MYSQLTEST_VARDIR/tmp/t1.csv >> $NDB_TOOLS_OUTPUT 2>&1;
 
+--echo # normal import
+exec $NDB_IMPORT --state-dir=$MYSQLTEST_VARDIR/tmp
+     --input-type=csv --output-type=ndb
+     test $MYSQLTEST_VARDIR/tmp/t1.csv >> $NDB_TOOLS_OUTPUT 2>&1;
+select count(*) from t1;
+
+--echo # invalid --input-type
+--error 1
+exec $NDB_IMPORT --state-dir=$MYSQLTEST_VARDIR/tmp
+     --input-type=xxx --output-type=ndb
+     test $MYSQLTEST_VARDIR/tmp/t1.csv >> $NDB_TOOLS_OUTPUT 2>&1;
+
+--echo # invalid --output-type
+--error 1
+exec $NDB_IMPORT --state-dir=$MYSQLTEST_VARDIR/tmp
+     --input-type=csv --output-type=xxx
+     test $MYSQLTEST_VARDIR/tmp/t1.csv >> $NDB_TOOLS_OUTPUT 2>&1;
+
 --echo # simple utf8 test
 
 perl;

storage/ndb/tools/NdbImport.cpp

@@ -102,8 +102,19 @@ NdbImport::set_opt(const Opt& opt)
 {
   NdbImportUtil& util = m_impl.m_util;
   NdbImportCsv& csv = m_impl.m_csv;
+  // XXX clean this up (map strings to enums)
   if (opt.m_input_type != 0)
   {
+    const char* valid[] = { "csv", "random", 0 };
+    const char** p = valid;
+    while (*p != 0 && strcmp(*p, opt.m_input_type) != 0)
+      p++;
+    if (*p == 0)
+    {
+      util.set_error_usage(util.c_error, __LINE__,
+                           "invalid input-type %s", opt.m_input_type);
+      return -1;
+    }
     if (opt.m_input_workers < 1)
     {
       util.set_error_usage(util.c_error, __LINE__,
@@ -127,6 +138,16 @@ NdbImport::set_opt(const Opt& opt)
   }
   if (opt.m_output_type != 0)
   {
+    const char* valid[] = { "ndb", "null", 0 };
+    const char** p = valid;
+    while (*p != 0 && strcmp(*p, opt.m_output_type) != 0)
+      p++;
+    if (*p == 0)
+    {
+      util.set_error_usage(util.c_error, __LINE__,
+                           "invalid output-type %s", opt.m_output_type);
+      return -1;
+    }
     if (opt.m_output_workers < 1)
     {
       util.set_error_usage(util.c_error, __LINE__,