fixed yugong

BulkSecurityGeneratorProjectV2 · Mar 17, 2017 · adaf6c1 · adaf6c1
1 parent 968d10c
commit adaf6c1
Showing 1 changed file with 34 additions and 27 deletions.
diff --git a/src/main/java/com/taobao/yugong/controller/YuGongController.java b/src/main/java/com/taobao/yugong/controller/YuGongController.java
@@ -70,24 +70,24 @@
  */
 public class YuGongController extends AbstractYuGongLifeCycle {
 
-    private DataSourceFactory        dataSourceFactory = new DataSourceFactory();
-    private JdkCompiler              compiler          = new JdkCompiler();
-    private Configuration            config;
-
-    private RunMode                  runMode;
-    private YuGongContext            globalContext;
-    private DbType                   sourceDbType      = DbType.ORACLE;
-    private DbType                   targetDbType      = DbType.MYSQL;
-    private File                     translatorDir;
-    private AlarmService             alarmService;
-
-    private TableController          tableController;
-    private ProgressTracer           progressTracer;
-    private List<YuGongInstance>     instances         = Lists.newArrayList();
+    private DataSourceFactory dataSourceFactory = new DataSourceFactory();
+    private JdkCompiler compiler = new JdkCompiler();
+    private Configuration config;
+
+    private RunMode runMode;
+    private YuGongContext globalContext;
+    private DbType sourceDbType = DbType.ORACLE;
+    private DbType targetDbType = DbType.MYSQL;
+    private File translatorDir;
+    private AlarmService alarmService;
+
+    private TableController tableController;
+    private ProgressTracer progressTracer;
+    private List<YuGongInstance> instances = Lists.newArrayList();
     private ScheduledExecutorService schedule;
     // 全局的工作线程池
-    private ThreadPoolExecutor       extractorExecutor = null;
-    private ThreadPoolExecutor       applierExecutor   = null;
+    private ThreadPoolExecutor extractorExecutor = null;
+    private ThreadPoolExecutor applierExecutor = null;
 
     public YuGongController(Configuration config){
         this.config = config;
@@ -592,14 +592,21 @@ private DataTranslator buildExtKeys(Table table, String tableStr, DbType targetD
             } catch (Exception e) {
                 throw new YuGongException(e);
             }
-            // 使用源表的表名查询一次拆分表名
-            String schemaName = translator.translatorSchema();
-            String tableName = translator.translatorTable();
-            if (schemaName == null) {
-                schemaName = table.getSchema();
-            }
-            if (tableName == null) {
-                tableName = table.getName();
+
+            String schemaName = table.getSchema();
+            String tableName = table.getName();
+
+            if (translator != null) {
+                // 使用源表的表名查询一次拆分表名
+                String tschemaName = translator.translatorSchema();
+                String ttableName = translator.translatorTable();
+                if (tschemaName != null) {
+                    schemaName = tschemaName;
+                }
+
+                if (ttableName != null) {
+                    tableName = ttableName;
+                }
             }
             String drdsExtKey = TableMetaGenerator.getShardKeyByDRDS(globalContext.getTargetDs(), schemaName, tableName);
             if (extKey != null && !StringUtils.equalsIgnoreCase(drdsExtKey, extKey)) {
@@ -731,9 +738,9 @@ public TableHolder(Table table){
             this.table = table;
         }
 
-        Table          table;
-        boolean        ignoreSchema = false;
-        DataTranslator translator   = null;
+        Table table;
+        boolean ignoreSchema = false;
+        DataTranslator translator = null;
 
         @Override
         public int hashCode() {