fix(tianmu): Insert ignore can insert duplicate values.(stoneatom#1699)

konghaiya · May 8, 2023 · 08b3ab5 · 08b3ab5
1 parent c95d263
commit 08b3ab5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/mysql-test/suite/tianmu/r/issue1637.result b/mysql-test/suite/tianmu/r/issue1637.result
@@ -5,4 +5,8 @@ create table ttt(id int primary key,name varchar(10));
 insert into ttt values(1,'aaa');
 insert into ttt values(2,'bbb');
 insert ignore into ttt values(2,'ccc');
+select * from ttt;
+id	name
+1	aaa
+2	bbb
 DROP DATABASE issue1637_test;
diff --git a/mysql-test/suite/tianmu/t/issue1637.test b/mysql-test/suite/tianmu/t/issue1637.test
@@ -14,6 +14,7 @@ insert into ttt values(2,'bbb');
 --disable_warnings
 insert ignore into ttt values(2,'ccc');
 --enable_warnings
-
+sleep 1;
+select * from ttt;
 
 DROP DATABASE issue1637_test;
diff --git a/storage/tianmu/core/engine.cpp b/storage/tianmu/core/engine.cpp
@@ -1707,7 +1707,8 @@ int Engine::InsertToDelta(const std::string &table_path, std::shared_ptr<TableSh
   uint64_t row_id = tm_table->NextRowId();
   // Insert primary key first
   int ret = tm_table->InsertIndexForDelta(table, row_id);
-
+  if (ret != 0)
+    return ret;
   // check & encode
   uint32_t buf_sz = 0;
   std::unique_ptr<char[]> buf;