feat(tianmu):develop some auto_increment function for tianmu(stoneato…

…m#1201, stoneatom#1072, stoneatom#1059)

mysql-test/suite/tianmu/r/init_auto_increment_value.result

@@ -0,0 +1,144 @@
+DROP DATABASE IF EXISTS auto_increment_value_db;
+CREATE DATABASE auto_increment_value_db;
+USE auto_increment_value_db;
+CREATE TABLE t_auto_increment_value (
+id int NOT NULL AUTO_INCREMENT,
+data VARCHAR(64) DEFAULT NULL,
+PRIMARY KEY (id)
+) engine=tianmu AUTO_INCREMENT=100;
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=100 DEFAULT CHARSET=latin1
+insert into t_auto_increment_value (data) values("first"),("middle"),("last");
+select * from t_auto_increment_value;
+id	data
+100	first
+101	middle
+102	last
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=103 DEFAULT CHARSET=latin1
+update t_auto_increment_value set id=80 where id=100;
+select * from t_auto_increment_value;
+id	data
+80	first
+101	middle
+102	last
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=103 DEFAULT CHARSET=latin1
+insert into t_auto_increment_value (id, data) values(0,"update_lt_max_id");
+select * from t_auto_increment_value;
+id	data
+80	first
+101	middle
+102	last
+103	update_lt_max_id
+update t_auto_increment_value set id=200 where id=101;
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=201 DEFAULT CHARSET=latin1
+insert into t_auto_increment_value (id, data) values(0,"update_gt_max_id");
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+201	update_gt_max_id
+alter table t_auto_increment_value AUTO_INCREMENT=300;
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+201	update_gt_max_id
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=300 DEFAULT CHARSET=latin1
+insert into t_auto_increment_value (id, data) values(0,"alter_gt_max_id");
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+201	update_gt_max_id
+300	alter_gt_max_id
+alter table t_auto_increment_value AUTO_INCREMENT=50;
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+201	update_gt_max_id
+300	alter_gt_max_id
+show create table t_auto_increment_value;
+Table	Create Table
+t_auto_increment_value	CREATE TABLE `t_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
+insert into t_auto_increment_value (id, data) values(0,"alter_lt_max_id");
+select * from t_auto_increment_value;
+id	data
+80	first
+200	middle
+102	last
+103	update_lt_max_id
+201	update_gt_max_id
+300	alter_gt_max_id
+301	alter_lt_max_id
+CREATE TABLE load_auto_increment_value (
+id int(11) NOT NULL AUTO_INCREMENT, 
+company varchar(25), 
+PRIMARY KEY (id)
+) ENGINE=TIANMU AUTO_INCREMENT=100;
+LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/suite/tianmu/std_data/load_auto_increment_value.txt' INTO TABLE load_auto_increment_value;
+select * from load_auto_increment_value;
+id	company
+100	"syz100"
+101	"syz101"
+102	"syz102"
+103	"syz103"
+104	"syz104"
+105	"syz105"
+106	"syz106"
+107	"syz107"
+show create table load_auto_increment_value;
+Table	Create Table
+load_auto_increment_value	CREATE TABLE `load_auto_increment_value` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `company` varchar(25) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=TIANMU AUTO_INCREMENT=108 DEFAULT CHARSET=latin1
+DROP DATABASE auto_increment_value_db;

mysql-test/suite/tianmu/t/init_auto_increment_value.test

@@ -0,0 +1,63 @@
+--source include/have_tianmu.inc
+#
+# Test auto_increment_value with TIANMU
+#
+--disable_warnings
+DROP DATABASE IF EXISTS auto_increment_value_db;
+--enable_warnings
+
+CREATE DATABASE auto_increment_value_db;
+USE auto_increment_value_db;
+
+# test init value
+CREATE TABLE t_auto_increment_value (
+  id int NOT NULL AUTO_INCREMENT,
+  data VARCHAR(64) DEFAULT NULL,
+  PRIMARY KEY (id)
+) engine=tianmu AUTO_INCREMENT=100;
+show create table t_auto_increment_value;
+insert into t_auto_increment_value (data) values("first"),("middle"),("last");
+select * from t_auto_increment_value;
+show create table t_auto_increment_value;
+
+# test update 
+update t_auto_increment_value set id=80 where id=100;
+select * from t_auto_increment_value;
+show create table t_auto_increment_value;
+insert into t_auto_increment_value (id, data) values(0,"update_lt_max_id");
+select * from t_auto_increment_value;
+
+update t_auto_increment_value set id=200 where id=101;
+select * from t_auto_increment_value;
+show create table t_auto_increment_value;
+insert into t_auto_increment_value (id, data) values(0,"update_gt_max_id");
+select * from t_auto_increment_value;
+
+# test alter
+alter table t_auto_increment_value AUTO_INCREMENT=300;
+select * from t_auto_increment_value;
+show create table t_auto_increment_value;
+insert into t_auto_increment_value (id, data) values(0,"alter_gt_max_id");
+select * from t_auto_increment_value;
+
+# when SET AUTO_INCREMENT < max_id, AUTO_INCREMENT value wouldnot be changed.
+alter table t_auto_increment_value AUTO_INCREMENT=50;
+select * from t_auto_increment_value;
+show create table t_auto_increment_value;
+insert into t_auto_increment_value (id, data) values(0,"alter_lt_max_id");
+select * from t_auto_increment_value;
+
+
+#test load data with auto_increment value into auto_increment col
+CREATE TABLE load_auto_increment_value (
+  id int(11) NOT NULL AUTO_INCREMENT, 
+  company varchar(25), 
+  PRIMARY KEY (id)
+  ) ENGINE=TIANMU AUTO_INCREMENT=100;
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/suite/tianmu/std_data/load_auto_increment_value.txt' INTO TABLE load_auto_increment_value;  
+select * from load_auto_increment_value;
+show create table load_auto_increment_value;
+
+# Clean UP
+DROP DATABASE auto_increment_value_db;

sql/sql_optimizer.cc

@@ -166,7 +166,7 @@ JOIN::optimize(OptimizePhase phase)
     if (phase == OptimizePhase::Beginning || phase == OptimizePhase::Before_LOJ_Transform)
     {
       assert(tables == 0 && primary_tables == 0 && tables_list == (TABLE_LIST*)1);
-      
+
       // to prevent double initialization on EXPLAIN
       if (optimized)
         DBUG_RETURN(0);
@@ -234,6 +234,7 @@ JOIN::optimize(OptimizePhase phase)
         }
 
       /* dump_TABLE_LIST_graph(select_lex, select_lex->leaf_tables); */
+
       row_limit= ((select_distinct || order || group_list) ?
                 HA_POS_ERROR : unit->select_limit_cnt);
       // m_select_limit is used to decide if we are likely to scan the whole table.

sql/sql_select.h

@@ -1106,7 +1106,7 @@ class store_key_const_item :public store_key_item
 bool error_if_full_join(JOIN *join);
 bool handle_query(THD *thd, LEX *lex, Query_result *result,
                   ulonglong added_options, ulonglong removed_options, 
-	              int is_optimize_after_tianmu=0, int free_join_from_tianmu=0);
+	                int is_optimize_after_tianmu=0, int free_join_from_tianmu=0);
 
 void free_underlaid_joins(THD *thd, SELECT_LEX *select);
 

storage/tianmu/core/engine.cpp

@@ -577,7 +577,8 @@ uint32_t Engine::GetNextTableId() {
   return seq;
 }
 
-std::shared_ptr<TableOption> Engine::GetTableOption(const std::string &table, TABLE *form) {
+std::shared_ptr<TableOption> Engine::GetTableOption(const std::string &table, TABLE *form,
+                                                    HA_CREATE_INFO *create_info) {
   auto opt = std::make_shared<TableOption>();
 
   int power = has_pack(form->s->comment);
@@ -595,10 +596,13 @@ std::shared_ptr<TableOption> Engine::GetTableOption(const std::string &table, TA
 
   opt->path = table + common::TIANMU_EXT;
   opt->name = form->s->table_name.str;
+  opt->create_info = create_info;
   return opt;
 }
 
-void Engine::CreateTable(const std::string &table, TABLE *form) { TianmuTable::CreateNew(GetTableOption(table, form)); }
+void Engine::CreateTable(const std::string &table, TABLE *form, HA_CREATE_INFO *create_info) {
+  TianmuTable::CreateNew(GetTableOption(table, form, create_info));
+}
 
 AttributeTypeInfo Engine::GetAttrTypeInfo(const Field &field) {
   bool auto_inc = field.flags & AUTO_INCREMENT_FLAG;

storage/tianmu/core/engine.h

@@ -77,7 +77,7 @@ class Engine final {
   ~Engine();
 
   int Init(uint engine_slot);
-  void CreateTable(const std::string &table, TABLE *from);
+  void CreateTable(const std::string &table, TABLE *from, HA_CREATE_INFO *create_info);
   int DeleteTable(const char *table, THD *thd);
   void TruncateTable(const std::string &table_path, THD *thd);
   int RenameTable(Transaction *trans_, const std::string &from, const std::string &to, THD *thd);
@@ -176,7 +176,7 @@ class Engine final {
   static std::unique_ptr<system::IOParameters> CreateIOParameters(const std::string &path, void *arg);
   static std::unique_ptr<system::IOParameters> CreateIOParameters(THD *thd, TABLE *table, void *arg);
   void LogStat();
-  std::shared_ptr<TableOption> GetTableOption(const std::string &table, TABLE *form);
+  std::shared_ptr<TableOption> GetTableOption(const std::string &table, TABLE *form, HA_CREATE_INFO *create_info);
   std::shared_ptr<TableShare> getTableShare(const std::string &table_path);
   void ProcessDelayedInsert();
   void ProcessDelayedMerge();

storage/tianmu/core/filter.cpp

@@ -16,6 +16,7 @@
 */
 
 #include "filter.h"
+
 #include "common/assert.h"
 #include "core/tools.h"
 

storage/tianmu/core/table_share.cpp

@@ -47,10 +47,10 @@ TableShare::TableShare(const fs::path &table_path, const TABLE_SHARE *table_shar
   for (uint i = 0; i < no_cols; i++) {
     common::TX_ID xid;
     fv.ReadExact(&xid, sizeof(xid));
-    m_columns.emplace_back(std::make_unique<ColumnShare>(
-        this, xid, i, table_path / common::COLUMN_DIR / std::to_string(i), table_share->field[i]));
+    Field *field = table_share->field[i];
+    auto colpath = table_path / common::COLUMN_DIR / std::to_string(i);
+    m_columns.emplace_back(std::make_unique<ColumnShare>(this, xid, i, colpath, field));
   }
-
   thr_lock_init(&thr_lock);
 }
 

storage/tianmu/core/tianmu_attr.cpp

@@ -67,7 +67,8 @@ TianmuAttr::TianmuAttr(Transaction *tx, common::TX_ID xid, int a_num, int t_num,
   };
 }
 
-void TianmuAttr::Create(const fs::path &dir, const AttributeTypeInfo &ati, uint8_t pss, size_t no_rows) {
+void TianmuAttr::Create(const fs::path &dir, const AttributeTypeInfo &ati, uint8_t pss, size_t no_rows,
+                        uint64_t auto_inc_value) {
   uint32_t no_pack = common::rows2packs(no_rows, pss);
 
   // write meta data(immutable)
@@ -112,6 +113,11 @@ void TianmuAttr::Create(const fs::path &dir, const AttributeTypeInfo &ati, uint8
     dict->SaveData(dir / common::COL_DICT_DIR / std::to_string(1));
   }
 
+  // auto_increment
+  if (ati.AutoInc() && auto_inc_value != 0) {
+    hdr.auto_inc_next = --auto_inc_value;
+  }
+
   // create version directory
   fs::create_directory(dir / common::COL_VERSION_DIR);
 
@@ -1084,6 +1090,10 @@ void TianmuAttr::UpdateData(uint64_t row, Value &v) {
           hdr.max = std::max(get_dpn(i).max_i, hdr.max);
       }
     }
+
+    // reset auto increment value
+    if (GetIfAutoInc() && (static_cast<uint64_t>(v.GetInt()) > GetAutoInc()))
+      hdr.auto_inc_next = static_cast<uint64_t>(v.GetInt());
   } else {  // common::PackType::STR
   }
 }

storage/tianmu/core/tianmu_attr.h

@@ -87,7 +87,8 @@ class TianmuAttr final : public mm::TraceableObject, public PhysicalColumn, publ
   TianmuAttr &operator=(const TianmuAttr &) = delete;
   ~TianmuAttr() = default;
 
-  static void Create(const fs::path &path, const AttributeTypeInfo &ati, uint8_t pss, size_t no_rows);
+  static void Create(const fs::path &path, const AttributeTypeInfo &ati, uint8_t pss, size_t no_rows,
+                     uint64_t auto_inc_value = 0);
 
   mm::TO_TYPE TraceableType() const override { return mm::TO_TYPE::TO_TEMPORARY; }
   void UpdateData(uint64_t row, Value &v);
@@ -260,6 +261,7 @@ class TianmuAttr final : public mm::TraceableObject, public PhysicalColumn, publ
   }
 
   uint64_t GetAutoInc() const { return hdr.auto_inc_next; }
+  uint64_t GetAutoIncInfo() const { return hdr.auto_inc_next + 1; }  // for show create table 'auto_increment='
   void SetAutoInc(uint64_t v) {
     backup_auto_inc_next_ = hdr.auto_inc_next;
     hdr.auto_inc_next = v;

storage/tianmu/core/tianmu_table.cpp

@@ -54,7 +54,7 @@ void TianmuTable::CreateNew(const std::shared_ptr<TableOption> &opt) {
   uint32_t tid = ha_tianmu_engine_->GetNextTableId();
   auto &path(opt->path);
   uint32_t no_attrs = opt->atis.size();
-
+  uint64_t auto_inc_value = opt->create_info->auto_increment_value;
   fs::create_directory(path);
 
   TABLE_META meta{common::FILE_MAGIC, common::TABLE_DATA_VERSION, tid, opt->pss};
@@ -88,7 +88,7 @@ void TianmuTable::CreateNew(const std::shared_ptr<TableOption> &opt) {
     auto lnk = column_path / std::to_string(idx);
     fs::create_symlink(dir, lnk);
 
-    TianmuAttr::Create(lnk, opt->atis[idx], opt->pss, 0);
+    TianmuAttr::Create(lnk, opt->atis[idx], opt->pss, 0, auto_inc_value);
     // TIANMU_LOG(LogCtl_Level::INFO, "Column %zu at %s", idx, dir.c_str());
   }
   TIANMU_LOG(LogCtl_Level::INFO, "Create table %s, ID = %u", opt->path.c_str(), tid);

storage/tianmu/core/tianmu_table.h

@@ -49,6 +49,7 @@ struct TableOption {
   std::string name;
   int id;
   uint8_t pss;
+  HA_CREATE_INFO *create_info;
 };
 
 class DataPackLock : public FunctionExecutor {