Reconstruction for Hint Manager.

sharding-core/src/main/java/io/shardingsphere/core/api/HintManager.java

@@ -17,22 +17,10 @@
 
 package io.shardingsphere.core.api;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BoundType;
-import com.google.common.collect.Range;
-import io.shardingsphere.core.api.algorithm.sharding.ListShardingValue;
-import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
-import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
-import io.shardingsphere.core.constant.ShardingOperator;
 import io.shardingsphere.core.hint.HintManagerHolder;
 import lombok.AccessLevel;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * The manager that use hint to inject sharding key directly through {@code ThreadLocal}.
  *
@@ -43,13 +31,6 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class HintManager implements AutoCloseable {
 
-    private final Map<String, ShardingValue> databaseShardingValues = new HashMap<>();
-
-    private final Map<String, ShardingValue> tableShardingValues = new HashMap<>();
-
-    @Getter
-    private boolean masterRouteOnly;
-
     /**
      * Get a new instance for {@code HintManager}.
      *
@@ -70,103 +51,38 @@ public static HintManager getInstance() {
      * @param value sharding value
      */
     public void setDatabaseShardingValue(final Comparable<?> value) {
-        addDatabaseShardingValue(HintManagerHolder.DB_TABLE_NAME, value);
-        HintManagerHolder.setDatabaseShardingOnly(true);
+        HintManagerHolder.setDatabaseShardingValue(value);
     }
 
     /**
-     * Add sharding value for database.
-     *
-     * <p>The sharding operator is {@code =}</p>
-     *
-     * @param logicTable logic table name
-     * @param value sharding value
+     * Set CRUD operation force route to master database only.
      */
-    public void addDatabaseShardingValue(final String logicTable, final Comparable<?> value) {
-        addDatabaseShardingValue(logicTable, ShardingOperator.EQUAL, value);
+    public void setMasterRouteOnly() {
+        HintManagerHolder.setMasterRouteOnly(true);
     }
 
     /**
      * Add sharding value for database.
      *
-     * @param logicTable logic table name
-     * @param values sharding values
-     */
-    public void addDatabaseShardingValue(final String logicTable, final Comparable<?>... values) {
-        addDatabaseShardingValue(logicTable, ShardingOperator.IN, values);
-    }
-
-    private void addDatabaseShardingValue(final String logicTable, final ShardingOperator operator, final Comparable<?>... values) {
-        HintManagerHolder.setDatabaseShardingOnly(false);
-        databaseShardingValues.put(logicTable, getShardingValue(logicTable, HintManagerHolder.DB_COLUMN_NAME, operator, values));
-    }
-
-    /**
-     * Add sharding value for table.
-     *
      * <p>The sharding operator is {@code =}</p>
      *
      * @param logicTable logic table name
      * @param value sharding value
      */
-    public void addTableShardingValue(final String logicTable, final Comparable<?> value) {
-        addTableShardingValue(logicTable, ShardingOperator.EQUAL, value);
+    public void addDatabaseShardingValue(final String logicTable, final Comparable<?> value) {
+        HintManagerHolder.addDatabaseShardingValue(logicTable, value);
     }
 
     /**
      * Add sharding value for table.
      *
-     * @param logicTable logic table name
-     * @param values sharding values
-     */
-    public void addTableShardingValue(final String logicTable, final Comparable<?>... values) {
-        addTableShardingValue(logicTable, ShardingOperator.IN, values);
-    }
-
-    private void addTableShardingValue(final String logicTable, final ShardingOperator operator, final Comparable<?>... values) {
-        HintManagerHolder.setDatabaseShardingOnly(false);
-        tableShardingValues.put(logicTable, getShardingValue(logicTable, HintManagerHolder.DB_COLUMN_NAME, operator, values));
-    }
-
-    @SuppressWarnings("unchecked")
-    private ShardingValue getShardingValue(final String logicTable, final String shardingColumn, final ShardingOperator operator, final Comparable<?>[] values) {
-        Preconditions.checkArgument(null != values && values.length > 0);
-        switch (operator) {
-            case EQUAL:
-            case IN:
-                return new ListShardingValue(logicTable, shardingColumn, Arrays.asList(values));
-            case BETWEEN:
-                return new RangeShardingValue(logicTable, shardingColumn, Range.range(values[0], BoundType.CLOSED, values[1], BoundType.CLOSED));
-            default:
-                throw new UnsupportedOperationException(operator.getExpression());
-        }
-    }
-
-    /**
-     * Get sharding value for database.
-     *
-     * @param logicTable logic table name
-     * @return sharding value for database
-     */
-    public ShardingValue getDatabaseShardingValue(final String logicTable) {
-        return databaseShardingValues.get(logicTable);
-    }
-
-    /**
-     * Get sharding value for table.
+     * <p>The sharding operator is {@code =}</p>
      *
      * @param logicTable logic table name
-     * @return sharding value for table
-     */
-    public ShardingValue getTableShardingValue(final String logicTable) {
-        return tableShardingValues.get(logicTable);
-    }
-
-    /**
-     * Set CRUD operation force route to master database only.
+     * @param value sharding value
      */
-    public void setMasterRouteOnly() {
-        masterRouteOnly = true;
+    public void addTableShardingValue(final String logicTable, final Comparable<?> value) {
+        HintManagerHolder.addTableShardingValue(logicTable, value);
     }
 
     @Override

sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java

@@ -19,12 +19,17 @@
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import io.shardingsphere.core.api.HintManager;
+import io.shardingsphere.core.api.algorithm.sharding.ListShardingValue;
 import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.Collection;
+
 /**
  * Hint manager holder.
  * 
@@ -40,10 +45,17 @@ public final class HintManagerHolder {
 
     public static final String DB_COLUMN_NAME = "DB_COLUMN_NAME";
 
+    private static final ThreadLocal<HintManager> HINT_MANAGER_HOLDER = new ThreadLocal<>();
+
+    private static final Multimap<String, Comparable<?>> DATABASE_SHARDING_VALUES = HashMultimap.create();
+
+    private static final Multimap<String, Comparable<?>> TABLE_SHARDING_VALUES = HashMultimap.create();
+
     @Setter
     private static boolean databaseShardingOnly;
 
-    private static final ThreadLocal<HintManager> HINT_MANAGER_HOLDER = new ThreadLocal<>();
+    @Setter
+    private static boolean isMasterRouteOnly;
 
     /**
      * Set hint manager.
@@ -55,6 +67,46 @@ public static void setHintManager(final HintManager hintManager) {
         HINT_MANAGER_HOLDER.set(hintManager);
     }
 
+    /**
+     * Add sharding value for one certain sharding database.
+     *
+     * <p>The sharding operator is {@code =}</p>
+     * When you need to assign the values to one certain sharding database, use this method to add sharding value for this database.
+     *
+     * @param value sharding value
+     */
+    public static void setDatabaseShardingValue(final Comparable<?> value) {
+        DATABASE_SHARDING_VALUES.clear();
+        addDatabaseShardingValue(DB_TABLE_NAME, value);
+        databaseShardingOnly = true;
+    }
+
+    /**
+     * Add sharding value for database.
+     *
+     * <p>The sharding operator is {@code =}</p>
+     *
+     * @param logicTable logic table name
+     * @param value sharding value
+     */
+    public static void addDatabaseShardingValue(final String logicTable, final Comparable<?> value) {
+        DATABASE_SHARDING_VALUES.put(logicTable, value);
+        databaseShardingOnly = false;
+    }
+
+    /**
+     * Add sharding value for table.
+     *
+     * <p>The sharding operator is {@code =}</p>
+     *
+     * @param logicTable logic table name
+     * @param value sharding value
+     */
+    public static void addTableShardingValue(final String logicTable, final Comparable<?> value) {
+        TABLE_SHARDING_VALUES.put(logicTable, value);
+        databaseShardingOnly = false;
+    }
+
     /**
      * Judge whether only database is sharding.
      *
@@ -64,14 +116,26 @@ public static boolean isDatabaseShardingOnly() {
         return null != HINT_MANAGER_HOLDER.get() && databaseShardingOnly;
     }
 
+    /**
+     * Judge whether it is routed to master database or not.
+     *
+     * @return is force route to master database only or not
+     */
+    public static boolean isMasterRouteOnly() {
+        return null != HINT_MANAGER_HOLDER.get() && isMasterRouteOnly;
+    }
+
     /**
      * Get database sharding value.
      * 
      * @param logicTable logic table
      * @return database sharding value
      */
     public static Optional<ShardingValue> getDatabaseShardingValue(final String logicTable) {
-        return null != HINT_MANAGER_HOLDER.get() ? Optional.fromNullable(HINT_MANAGER_HOLDER.get().getDatabaseShardingValue(logicTable)) : Optional.<ShardingValue>absent();
+        if (null == HINT_MANAGER_HOLDER.get() || !DATABASE_SHARDING_VALUES.containsKey(logicTable)) {
+            return Optional.absent();
+        }
+        return Optional.of(getShardingValue(logicTable, DATABASE_SHARDING_VALUES.get(logicTable)));
     }
 
     /**
@@ -81,31 +145,35 @@ public static Optional<ShardingValue> getDatabaseShardingValue(final String logi
      * @return table sharding value
      */
     public static Optional<ShardingValue> getTableShardingValue(final String logicTable) {
-        return null != HINT_MANAGER_HOLDER.get() ? Optional.fromNullable(HINT_MANAGER_HOLDER.get().getTableShardingValue(logicTable)) : Optional.<ShardingValue>absent();
+        if (null == HINT_MANAGER_HOLDER.get() || !TABLE_SHARDING_VALUES.containsKey(logicTable)) {
+            return Optional.absent();
+        }
+        return Optional.of(getShardingValue(logicTable, TABLE_SHARDING_VALUES.get(logicTable)));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static ShardingValue getShardingValue(final String logicTable, final Collection<Comparable<?>> values) {
+        Preconditions.checkArgument(null != values && !values.isEmpty());
+        return new ListShardingValue(logicTable, DB_COLUMN_NAME, values);
     }
 
     /**
-     * Adjust is force route to master database only or not.
-     * 
-     * @return is force route to master database only or not
+     * Get hint manager in current thread.
+     *
+     * @return hint manager in current thread
      */
-    public static boolean isMasterRouteOnly() {
-        return null != HINT_MANAGER_HOLDER.get() && HINT_MANAGER_HOLDER.get().isMasterRouteOnly();
+    public static HintManager get() {
+        return HINT_MANAGER_HOLDER.get();
     }
 
     /**
      * Clear hint manager for current thread-local.
      */
     public static void clear() {
         HINT_MANAGER_HOLDER.remove();
-    }
-
-    /**
-     * Get hint manager in current thread.
-     * 
-     * @return hint manager in current thread
-     */
-    public static HintManager get() {
-        return HINT_MANAGER_HOLDER.get();
+        DATABASE_SHARDING_VALUES.clear();
+        TABLE_SHARDING_VALUES.clear();
+        databaseShardingOnly = false;
+        isMasterRouteOnly = false;
     }
 }

sharding-core/src/test/java/io/shardingsphere/core/api/HintManagerTest.java

@@ -32,18 +32,20 @@ public void assertAddDatabaseShardingValueForEquals() {
         try (HintManager hintManager = HintManager.getInstance()) {
             hintManager.addDatabaseShardingValue("logicTable", 1);
             assertTrue(HintManagerHolder.getDatabaseShardingValue("logicTable").isPresent());
-            assertThat(hintManager.getDatabaseShardingValue("logicTable").getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
-            assertThat(((ListShardingValue<? extends Comparable>) hintManager.getDatabaseShardingValue("logicTable")).getValues().iterator().next(), is((Comparable) 1));
+            assertThat(HintManagerHolder.getDatabaseShardingValue("logicTable").get().getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
+            assertThat(((ListShardingValue<? extends Comparable>) HintManagerHolder.getDatabaseShardingValue("logicTable").get()).getValues().iterator().next(), is((Comparable) 1));
         }
     }
 
     @Test
     public void assertAddDatabaseShardingValueForIn() {
         try (HintManager hintManager = HintManager.getInstance()) {
-            hintManager.addDatabaseShardingValue("logicTable", 1, 3, 5);
+            hintManager.addDatabaseShardingValue("logicTable", 1);
+            hintManager.addDatabaseShardingValue("logicTable", 3);
+            hintManager.addDatabaseShardingValue("logicTable", 5);
             assertTrue(HintManagerHolder.getDatabaseShardingValue("logicTable").isPresent());
-            assertThat(hintManager.getDatabaseShardingValue("logicTable").getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
-            assertThat(((ListShardingValue) hintManager.getDatabaseShardingValue("logicTable")).getValues().size(), is(3));
+            assertThat(HintManagerHolder.getDatabaseShardingValue("logicTable").get().getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
+            assertThat(((ListShardingValue) HintManagerHolder.getDatabaseShardingValue("logicTable").get()).getValues().size(), is(3));
         }
     }
 
@@ -53,18 +55,20 @@ public void assertAddTableShardingValueForEquals() {
         try (HintManager hintManager = HintManager.getInstance()) {
             hintManager.addTableShardingValue("logicTable", 1);
             assertTrue(HintManagerHolder.getTableShardingValue("logicTable").isPresent());
-            assertThat(hintManager.getTableShardingValue("logicTable").getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
-            assertThat(((ListShardingValue<? extends Comparable>) hintManager.getTableShardingValue("logicTable")).getValues().iterator().next(), is((Comparable) 1));
+            assertThat(HintManagerHolder.getTableShardingValue("logicTable").get().getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
+            assertThat(((ListShardingValue<? extends Comparable>) HintManagerHolder.getTableShardingValue("logicTable").get()).getValues().iterator().next(), is((Comparable) 1));
         }
     }
 
     @Test
     public void assertAddTableShardingValueForIn() {
         try (HintManager hintManager = HintManager.getInstance()) {
-            hintManager.addTableShardingValue("logicTable", 1, 3, 5);
+            hintManager.addTableShardingValue("logicTable", 1);
+            hintManager.addTableShardingValue("logicTable", 3);
+            hintManager.addTableShardingValue("logicTable", 5);
             assertTrue(HintManagerHolder.getTableShardingValue("logicTable").isPresent());
-            assertThat(hintManager.getTableShardingValue("logicTable").getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
-            assertThat(((ListShardingValue) hintManager.getTableShardingValue("logicTable")).getValues().size(), is(3));
+            assertThat(HintManagerHolder.getTableShardingValue("logicTable").get().getColumnName(), is(HintManagerHolder.DB_COLUMN_NAME));
+            assertThat(((ListShardingValue) HintManagerHolder.getTableShardingValue("logicTable").get()).getValues().size(), is(3));
         }
     }
 
@@ -73,8 +77,8 @@ public void assertAddDatabaseShardingOnly() {
         try (HintManager hintManager = HintManager.getInstance()) {
             hintManager.setDatabaseShardingValue("1");
             assertTrue(HintManagerHolder.isDatabaseShardingOnly());
-            assertThat((String) ((ListShardingValue) 
-                    hintManager.getDatabaseShardingValue(HintManagerHolder.DB_TABLE_NAME)).getValues().iterator().next(), is("1"));
+            assertThat((String) ((ListShardingValue)
+                    HintManagerHolder.getDatabaseShardingValue(HintManagerHolder.DB_TABLE_NAME).get()).getValues().iterator().next(), is("1"));
         }
     }
 }