feat: 分区获取不size时，按size进行分区分组报错

aliyun · Apr 22, 2022 · 8443b58 · 8443b58
1 parent e9bc293
commit 8443b58
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/mma-server/src/main/java/com/aliyun/odps/mma/server/job/AbstractTableJob.java b/mma-server/src/main/java/com/aliyun/odps/mma/server/job/AbstractTableJob.java
@@ -377,6 +377,21 @@ private List<TablePartitionGroup> generateAdaptiveTablePartitionGroups(
       tmpList.add(new JobAndPtMeta(job, metaSource, source));
     }
 
+    List<PartitionMetaModel> partitionMetaModels = tmpList.stream()
+            .map(o->o.partitionMetaModel).collect(Collectors.toList());
+
+    // Make sure that the size of each partition is valid.
+    for (PartitionMetaModel p : partitionMetaModels) {
+      if (p.getSize() == null) {
+        LOG.info(
+                "Database: {}, table: {}, partition: {}, size is not valid",
+                source.getDatabase(),
+                source.getTable(),
+                p.getPartitionValues());
+        return null;
+      }
+    }
+
     // Sort subjobs & ptModel by pt size in descending order
     tmpList.sort((o1, o2) -> {
       if (o1.partitionMetaModel.getSize() > o2.partitionMetaModel.getSize()) {
@@ -388,22 +403,8 @@ private List<TablePartitionGroup> generateAdaptiveTablePartitionGroups(
       }
     });
 
-    List<PartitionMetaModel> partitionMetaModels = tmpList.stream()
-        .map(o->o.partitionMetaModel).collect(Collectors.toList());
     pendingSubJobs = tmpList.stream().map(o->o.job).collect(Collectors.toList());
 
-    // Make sure that the size of each partition is valid.
-    for (PartitionMetaModel p : partitionMetaModels) {
-      if (p.getSize() == null) {
-        LOG.info(
-            "Database: {}, table: {}, partition: {}, size is not valid",
-            source.getDatabase(),
-            source.getTable(),
-            p.getPartitionValues());
-        return null;
-      }
-    }
-
     List<TablePartitionGroup> ret = new LinkedList<>();
 
     int groupDataSizeInGigaByte = Integer.valueOf(config.getOrDefault(