WL#13277 REPLACE T18 WITH T1 IN AUTOTEST TESTCASES

Modifies testScan to use table T1 instead of T18 and removes T18 from
the set of tables in NDBT_Tables.cpp.

testScan requires a table with just a single column primary key to check
for corrupted tuples. So, it doesn't need a special table with two
column primary key, T18. And, T18 isn't being used by any of the
testcases other than testScan. A test was done by going back to the
commit which introduced the testcase to make sure that it can use an
existing table T1 instead of creating it's own table. So, testScan is
modified to use T1 and the definition of T18 is removed from
NDBT_Tables.cpp.

Change-Id: I78474415d0ec00466b0f25cecfe2cbbd3e3a55c0

Author: VarunNagaraju

storage/ndb/test/ndbapi/testScan.cpp

@@ -1961,8 +1961,6 @@ namespace TupErr
   struct Row
   {
     int pk1;
-    int pk2;
-    int a1;
   };
 
   static int
@@ -1983,7 +1981,7 @@ namespace TupErr
 
     for (int i = 0; i<totalRowCount; i++)
     {
-      const Row row = {i, 0, i};
+      const Row row = {i};
 
       const NdbOperation* const operation=
         trans->insertTuple(record, reinterpret_cast<const char*>(&row));
@@ -2093,19 +2091,19 @@ namespace TupErr
     NdbInterpretedCode code(tab);
 
     /**
-     * Build an interpreter code sequence that causes rows with pk1==50 to 
-     * abort the scan, and that skips all other rows.
+     * Build an interpreter code sequence that causes rows with kol1==50 to
+     * abort the scan, and that skips all other rows(kol1 is a primary key).
      */ 
-    const NdbDictionary::Column* const col = tab->getColumn("PK1");
+    const NdbDictionary::Column* const col = tab->getColumn("KOL1");
     require(col != NULL);
     require(code.read_attr(1, col) == 0);
     require(code.load_const_u32(2, 50) == 0);
     require(code.branch_eq(1, 2, 0) == 0);
 
-    // Exit here if pk1!=50. Skip this row.
+    // Exit here if kol1!=50. Skip this row.
     require(code.interpret_exit_nok(626) == 0);
 
-    // Go here if pk1==50. Abort scan.
+    // Go here if kol1==50. Abort scan.
     require(code.def_label(0) == 0);
     require(code.interpret_exit_nok(6000) == 0);
     require(code.finalise() == 0);
@@ -2858,13 +2856,13 @@ TESTCASE("Bug13394788", "")
   FINALIZER(runClearTable);
 }
 TESTCASE("TupCheckSumError", ""){
-  // TABLE("T18");
+  // TABLE("T1");
   INITIALIZER(TupErr::populateTable);
   STEP(TupErr::doCheckSumQuery);
   FINALIZER(runClearTable);
 }
 TESTCASE("InterpretNok6000", ""){
-  // TABLE("T18");
+  // TABLE("T1");
   INITIALIZER(TupErr::populateTable);
   STEP(TupErr::doInterpretNok6000Query);
   FINALIZER(runClearTable);

storage/ndb/test/run-test/daily-basic--01-tests.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # GENERATED FILE
 #
 cmd: testScan
-args: -n TupCheckSumError T18
+args: -n TupCheckSumError T1
 max-time: 180
 
 cmd: test_event

storage/ndb/test/run-test/daily-basic--04-tests.txt

@@ -16,7 +16,7 @@
 # GENERATED FILE
 #
 cmd: testScan
-args: -n InterpretNok6000 T18
+args: -n InterpretNok6000 T1
 max-time: 180
 
 cmd: testNdbApi

storage/ndb/test/run-test/daily-basic-tests.txt

@@ -2016,11 +2016,11 @@ args: -n SlowDihFileWrites T1
 
 max-time : 300
 cmd: testScan
-args: -n TupCheckSumError T18
+args: -n TupCheckSumError T1
 
 max-time : 300
 cmd: testScan
-args: -n InterpretNok6000 T18
+args: -n InterpretNok6000 T1
 
 # Bug18408671 added on 17.04.2014
 #max-time : 300

storage/ndb/test/src/NDBT_Tables.cpp

@@ -605,19 +605,6 @@ static
 const
 NDBT_Table T16("T16", sizeof(T16Attribs)/sizeof(NDBT_Attribute), T16Attribs);
 
-/* Table with tuple as primary key used in testScan */
-static
-const
-NDBT_Attribute T18Attribs[] = {
-  NDBT_Attribute("PK1", NdbDictionary::Column::Unsigned, 1, true),
-  NDBT_Attribute("PK2", NdbDictionary::Column::Unsigned, 1, true),
-  NDBT_Attribute("A1", NdbDictionary::Column::Unsigned, 1),
-};
-
-static
-const
-NDBT_Table T18("T18", sizeof(T18Attribs)/sizeof(NDBT_Attribute), T18Attribs);
-
 /*
   C2 DHCP TABLES, MAYBE THESE SHOULD BE MOVED TO THE UTIL_TABLES?
 */
@@ -782,7 +769,6 @@ NDBT_Table *test_tables[]=
   &T14,
   &T15,
   &T16,
-  &T18,
   &I1,
   &I2,
   &I3,