Merge branch 'master' into 1.0.0.M5

Author: hellojavaer

ddal-sequence/src/main/java/org/hellojavaer/ddal/sequence/DatabaseSequenceRangeGetter.java

@@ -27,7 +27,7 @@
 import java.util.ConcurrentModificationException;
 
 /**
- *  <p>Id Range</p>
+ *  <p>Sequence Range</p>
  *
  *  Design model:
  *
@@ -56,8 +56,8 @@
  *  |      [id] [id]  [id]   [id]  [id] [id]
  * _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
  *
- *  Between master and client,there can be multiple followers. Id Range is firstly allocated by master.
- *  The lower layer request id range to the higher layer and then allocate id range to its lower.
+ *  Between master and client,there can be multiple followers. Sequence range is firstly allocated by master.
+ *  The lower layer request sequence range to the higher layer and then allocate sequence range to its lower.
  *
  * @author <a href="mailto:[email protected]">Kaiming Zou</a>,created on 04/01/2017.
  */
@@ -278,7 +278,7 @@ public SequenceRange get(String schemaName, String tableName, int step) throws E
                 }
                 if (deleted == 1) {
                     if (logger.isInfoEnabled()) {
-                        logger.info("Id range for schemaName:{},tableName:{} is used up. More detail information is step:{},"
+                        logger.info("Sequence range for schemaName:{},tableName:{} is used up. More detail information is step:{},"
                                             + "endValue:{},version:{},id:{} and actually allocated range is '{} ~ {}'",
                                     schemaName, tableName, step,//
                                     endValue, version, id, rangeBegin, rangeEnd);

ddal-sequence/src/main/java/org/hellojavaer/ddal/sequence/SequenceCache.java

@@ -89,10 +89,10 @@ public void run() {
                     try {
                         SequenceRange range = getSequenceRange();
                         if (range == null) {
-                            throw new NoAvailableSequenceRangeFoundException("No available id range was found");
+                            throw new NoAvailableSequenceRangeFoundException("No available sequence range was found");
                         }
                         if (range.getBeginValue() > range.getEndValue()) {
-                            throw new IllegalSequenceRangeException("Illegal id range " + range);
+                            throw new IllegalSequenceRangeException("Illegal sequence range " + range);
                         }
                         int c = (int) ((range.getEndValue() - range.getBeginValue() + step) / step);
                         long beginValue = range.getBeginValue();