Merge pull request #1120 from pervazea/unique

Fix for issue #1117, UNIQUE

Author: pervazea

Jenkinsfile

@@ -59,6 +59,12 @@ pipeline {
                         sh 'python ./script/validators/source_validator.py'
                         sh 'mkdir build'
                         sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
+                        sh 'cd build && make check -j4 || true'
+                        // sh 'cd build && cp -pr test /job/'
+                        sh 'cd build && make benchmark -j4'
+                        sh 'cd build && make install'
+                        sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                        sh 'cd build && python ../script/validators/jdbc_validator.py'
                     }
                 }
 

src/catalog/catalog.cpp

@@ -271,7 +271,6 @@ ResultType Catalog::CreateTable(const std::string &database_name,
         table_oid, column.GetName(), column_id, column.GetOffset(),
         column.GetType(), column.IsInlined(), column.GetConstraints(),
         pool_.get(), txn);
-    column_id++;
 
     // Create index on unique single column
     if (column.IsUnique()) {
@@ -282,6 +281,7 @@ ResultType Catalog::CreateTable(const std::string &database_name,
       LOG_DEBUG("Added a UNIQUE index on %s in %s.", col_name.c_str(),
                 table_name.c_str());
     }
+    column_id++;
   }
   CreatePrimaryIndex(database_object->GetDatabaseOid(), table_oid, txn);
   return ResultType::SUCCESS;

src/storage/data_table.cpp

@@ -773,7 +773,6 @@ bool DataTable::CheckForeignKeyConstraints(
 
       // The foreign key constraints only refer to the primary key
       if (index->GetIndexType() == IndexConstraintType::PRIMARY_KEY) {
-        LOG_INFO("BEGIN checking referred table");
 
         std::vector<oid_t> key_attrs = foreign_key->GetSinkColumnIds();
         std::unique_ptr<catalog::Schema> foreign_key_schema(

test/sql/insert_sql_test.cpp

@@ -523,5 +523,52 @@ TEST_F(InsertSQLTests, InsertIntoSelectColumn) {
   txn_manager.CommitTransaction(txn);
 }
 
+TEST_F(InsertSQLTests, UniqueColumn) {
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto txn = txn_manager.BeginTransaction();
+  catalog::Catalog::GetInstance()->CreateDatabase(DEFAULT_DB_NAME, txn);
+  txn_manager.CommitTransaction(txn);
+
+  std::string create_table("CREATE TABLE t (id INTEGER NOT NULL PRIMARY KEY,"
+                                        "st VARCHAR(15) NOT NULL UNIQUE);");
+  TestingSQLUtil::ExecuteSQLQuery(create_table);
+
+  ResultType result;
+  std::vector<std::string> ref_result;
+  std::string result_query = "select st from t;";
+
+  // Single row, should succeed
+  std::string ins_query_1("INSERT INTO t VALUES (1, 'abc');");
+  result = TestingSQLUtil::ExecuteSQLQuery(ins_query_1);
+  EXPECT_EQ(result, ResultType::SUCCESS);
+  ref_result.push_back("abc");
+  TestingSQLUtil::ExecuteSQLQueryAndCheckResult(result_query,
+                                                ref_result,
+                                                false);
+
+  // Second row, distinct from first, should succeed
+  std::string ins_query_2("INSERT INTO t VALUES (2, 'def');");
+  result = TestingSQLUtil::ExecuteSQLQuery(ins_query_2);
+  EXPECT_EQ(result, ResultType::SUCCESS);
+  ref_result.push_back("def");
+  TestingSQLUtil::ExecuteSQLQueryAndCheckResult(result_query,
+                                                ref_result,
+                                                false);
+
+  // Third row, non-unique value for string, should fail
+  std::string ins_query_3("INSERT INTO t VALUES (3, 'abc');");
+  result = TestingSQLUtil::ExecuteSQLQuery(ins_query_3);
+  EXPECT_EQ(result, ResultType::ABORTED);
+  // and the results returned should not include failed insert
+  TestingSQLUtil::ExecuteSQLQueryAndCheckResult(result_query,
+                                                ref_result,
+                                                false);
+
+  // free the database just created
+  txn = txn_manager.BeginTransaction();
+  catalog::Catalog::GetInstance()->DropDatabaseWithName(DEFAULT_DB_NAME, txn);
+  txn_manager.CommitTransaction(txn);
+}
+
 }  // namespace test
 }  // namespace peloton