saintstack commented on a change in pull request #2186:
URL: https://github.com/apache/hbase/pull/2186#discussion_r464127581
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
##########
@@ -73,8 +80,19 @@ private Constraints() {
/**
* Enable constraints on a table.
* <p/>
+<<<<<<< HEAD
* Currently, if you attempt to add a constraint to the table, then
Constraints will automatically
* be turned on.
+=======
+ * Currently, if you attempt to add a constraint to the table, then
+ * Constraints will automatically be turned on.
+ *
+ * @param desc
+ * table description to add the processor
+ * @throws IOException
+ * If the {@link ConstraintProcessor} CP couldn't be added to the
+ * table.
+>>>>>>> 210f1e7388... tmp
Review comment:
Ditto
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
##########
@@ -41,10 +41,17 @@
/**
* Utilities for adding/removing constraints from a table.
* <p/>
+<<<<<<< HEAD
* Since {@link TableDescriptor} is immutable now, you should use {@link
TableDescriptorBuilder}.
* And when disabling or removing constraints, you could use
* {@link TableDescriptorBuilder#newBuilder(TableDescriptor)} to clone the old
* {@link TableDescriptor} and then pass it the below methods.
+=======
+ * Constraints can be added on table load time, via the {@link
HTableDescriptor}.
+ * <p/>
+ * NOTE: this class is NOT thread safe. Concurrent setting/enabling/disabling
of
+ * constraints can cause constraints to be run at incorrect times or not at
all.
+>>>>>>> 210f1e7388... tmp
Review comment:
Fix?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
