From ab1c4139deaad29f00104580df09f2334bb4efaa Mon Sep 17 00:00:00 2001
From: Gleb Novikov <glebnovikov98@gmail.com>
Date: Wed, 14 Aug 2019 22:51:03 +0300
Subject: [PATCH] Added ReplicatedMergeTree support and test for constraints,
 also added VIOLATED_CONSTRAINT error

---
 dbms/programs/server/config.xml               |  5 ++-
 dbms/src/Common/ErrorCodes.cpp                |  1 +
 .../CheckConstraintsBlockOutputStream.cpp     |  2 +-
 .../CheckConstraintsBlockOutputStream.h       |  2 +-
 .../ReplicatedMergeTreeTableMetadata.cpp      |  6 +++
 .../Storages/StorageReplicatedMergeTree.cpp   |  4 ++
 ...onstraints_replication_zookeeper.reference |  0
 ...0988_constraints_replication_zookeeper.sql | 43 +++++++++++++++++++
 8 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.reference
 create mode 100644 dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql

diff --git a/dbms/programs/server/config.xml b/dbms/programs/server/config.xml
index c09913cbd8..188a98779e 100644
--- a/dbms/programs/server/config.xml
+++ b/dbms/programs/server/config.xml
@@ -217,7 +217,10 @@
 
          See https://clickhouse.yandex/docs/en/table_engines/replication/
       -->
-    <zookeeper incl="zookeeper-servers" optional="true" />
+
+    <zookeeper>
+        <implementation>testkeeper</implementation>
+    </zookeeper>
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
diff --git a/dbms/src/Common/ErrorCodes.cpp b/dbms/src/Common/ErrorCodes.cpp
index 4128ddb8ed..270ece4b0a 100644
--- a/dbms/src/Common/ErrorCodes.cpp
+++ b/dbms/src/Common/ErrorCodes.cpp
@@ -443,6 +443,7 @@ namespace ErrorCodes
     extern const int INSECURE_PATH = 466;
     extern const int CANNOT_PARSE_BOOL = 467;
     extern const int CANNOT_PTHREAD_ATTR = 468;
+    extern const int VIOLATED_CONSTRAINT = 469;
 
     extern const int KEEPER_EXCEPTION = 999;
     extern const int POCO_EXCEPTION = 1000;
diff --git a/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.cpp b/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
index 4b4865f004..2b92bf7310 100644
--- a/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
@@ -26,7 +26,7 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
 
             throw Exception{"Violated constraint " + constraints.constraints[i]->name +
                             " in table " + table + " at indices " + indices_str + ", constraint expression: " +
-                            serializeAST(*(constraints.constraints[i]->expr), true), ErrorCodes::LOGICAL_ERROR};
+                            serializeAST(*(constraints.constraints[i]->expr), true), DB::ErrorCodes::VIOLATED_CONSTRAINT};
         }
     }
     output->write(block);
diff --git a/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.h b/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.h
index 7ab6832fd2..1ce8d00206 100644
--- a/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.h
+++ b/dbms/src/DataStreams/CheckConstraintsBlockOutputStream.h
@@ -10,7 +10,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CONSTRAINTS_ARE_NOT_SATISFIED;
+    extern const int VIOLATED_CONSTRAINT;
 }
 
 class CheckConstraintsBlockOutputStream : public IBlockOutputStream
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index a6358f7e81..8fa00659b8 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -82,6 +82,9 @@ void ReplicatedMergeTreeTableMetadata::write(WriteBuffer & out) const
 
     if (index_granularity_bytes != 0)
         out << "granularity bytes: " << index_granularity_bytes << "\n";
+
+    if (!constraints.empty())
+        out << "constraints: " << constraints << "\n";
 }
 
 String ReplicatedMergeTreeTableMetadata::toString() const
@@ -125,6 +128,9 @@ void ReplicatedMergeTreeTableMetadata::read(ReadBuffer & in)
     }
     else
         index_granularity_bytes = 0;
+
+    if (checkString("constraints: ", in))
+        in >> constraints >> "\n";
 }
 
 ReplicatedMergeTreeTableMetadata ReplicatedMergeTreeTableMetadata::parse(const String & s)
diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
index 523d95d213..21e8f40b1d 100644
--- a/dbms/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
@@ -3144,6 +3144,10 @@ void StorageReplicatedMergeTree::alter(
         if (new_indices_str != getIndices().toString())
             new_metadata.skip_indices = new_indices_str;
 
+        String new_constraints_str = new_constraints.toString();
+        if (new_constraints_str != getConstraints().toString())
+            new_metadata.constraints = new_constraints_str;
+
         String new_metadata_str = new_metadata.toString();
         if (new_metadata_str != ReplicatedMergeTreeTableMetadata(*this).toString())
             changed_nodes.emplace_back(zookeeper_path, "metadata", new_metadata_str);
diff --git a/dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.reference b/dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.reference
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql b/dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
new file mode 100644
index 0000000000..bc0e8a3067
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS replicated_constraints1;
+DROP TABLE IF EXISTS replicated_constraints2;
+
+CREATE TABLE replicated_constraints1
+(
+    a UInt32,
+    b UInt32,
+    CONSTRAINT a_constraint CHECK a < 10
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_constraints', 'r1') ORDER BY (a);
+
+CREATE TABLE replicated_constraints2
+(
+    a UInt32,
+    b UInt32,
+    CONSTRAINT a_constraint CHECK a < 10
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_constraints', 'r2') ORDER BY (a);
+
+INSERT INTO replicated_constraints1 VALUES (1, 2);
+INSERT INTO replicated_constraints2 VALUES (3, 4);
+
+SYSTEM SYNC REPLICA replicated_constraints1;
+SYSTEM SYNC REPLICA replicated_constraints2;
+
+INSERT INTO replicated_constraints1 VALUES (10, 10); -- { serverError 469 }
+
+ALTER TABLE replicated_constraints1 DROP CONSTRAINT a_constraint;
+
+SYSTEM SYNC REPLICA replicated_constraints2;
+
+INSERT INTO replicated_constraints1 VALUES (10, 10);
+INSERT INTO replicated_constraints2 VALUES (10, 10);
+
+ALTER TABLE replicated_constraints1 ADD CONSTRAINT b_constraint CHECK b > 10;
+ALTER TABLE replicated_constraints2 ADD CONSTRAINT a_constraint CHECK a < 10;
+
+SYSTEM SYNC REPLICA replicated_constraints1;
+SYSTEM SYNC REPLICA replicated_constraints2;
+
+INSERT INTO replicated_constraints1 VALUES (10, 11); -- { serverError 469 }
+INSERT INTO replicated_constraints2 VALUES (9, 10); -- { serverError 469 }
+
+DROP TABLE replicated_constraints1;
+DROP TABLE replicated_constraints2;
\ No newline at end of file
-- 
GitLab