You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/08/23 22:28:20 UTC
[GitHub] [dolphinscheduler] kezhenxu94 commented on a diff in pull request #11614: [Improvement-#11613] Add spi priority factory
kezhenxu94 commented on code in PR #11614:
URL: https://github.com/apache/dolphinscheduler/pull/11614#discussion_r953152292
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPIFactory.java:
##########
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.spi.plugin;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+public class PrioritySPIFactory<T extends PrioritySPI> {
+
+ private final Logger logger = LoggerFactory.getLogger(PrioritySPIFactory.class);
+
+ private final Map<String, T> map = new HashMap<>();
+
+ public PrioritySPIFactory(Class<T> spiClass) {
+ for (T t : ServiceLoader.load(spiClass)) {
+ if (map.containsKey(t.getIdentify().getName())) {
+ resolveConflict(t);
+ } else {
+ map.put(t.getIdentify().getName(), t);
+ }
+ }
+ }
+
+ public Map<String, T> getSPIMap() {
+ return map;
Review Comment:
Should return an immutable map
```suggestion
return Collections.unmodifiableMap(map);
```
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/task/TaskPluginManager.java:
##########
@@ -53,19 +49,19 @@ public void loadPlugin() {
logger.warn("The task plugin has already been loaded");
return;
}
- ServiceLoader.load(TaskChannelFactory.class).forEach(factory -> {
- final String name = factory.getName();
+ PrioritySPIFactory<TaskChannelFactory> prioritySPIFactory = new PrioritySPIFactory<>(TaskChannelFactory.class);
+ for (Map.Entry<String, TaskChannelFactory> entry : prioritySPIFactory.getSPIMap().entrySet()) {
+ String factoryName = entry.getKey();
+ TaskChannelFactory factory = entry.getValue();
- logger.info("Registering task plugin: {}", name);
+ logger.info("Registry task plugin: {} - {}", factoryName, factory.getClass());
Review Comment:
Registry is a noun but here we want a verb, no?
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/SPIIdentify.java:
##########
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.spi.plugin;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SPIIdentify {
+
+ private static final int DEFAULT_PRIORITY = 0;
+
+ private String name;
+
+ private int priority = DEFAULT_PRIORITY;
+
+ public static SPIIdentify create(String name, int priority) {
+ return new SPIIdentify(name, priority);
+ }
+
+ public static SPIIdentify create(String name) {
+ return create(name, DEFAULT_PRIORITY);
+ }
+
+}
Review Comment:
```suggestion
@Data
@lombok.Builder
@AllArgsConstructor
public class SPIIdentify {
private static final int DEFAULT_PRIORITY = 0;
private String name;
@lombok.Builder.Default
private int priority = DEFAULT_PRIORITY;
}
```
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPIFactory.java:
##########
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.spi.plugin;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+public class PrioritySPIFactory<T extends PrioritySPI> {
+
+ private final Logger logger = LoggerFactory.getLogger(PrioritySPIFactory.class);
Review Comment:
```suggestion
@lombok.Slf4j
public class PrioritySPIFactory<T extends PrioritySPI> {
```
--
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.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org