PHILO-HE commented on code in PR #10591:
URL:
https://github.com/apache/incubator-gluten/pull/10591#discussion_r2318068771
##########
gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java:
##########
@@ -68,46 +67,35 @@ public class CelebornShuffleManager
private static final CelebornColumnarBatchSerializerFactory
columnarBatchSerializerFactory;
static {
+ final String backendName = BackendsApiManager.getBackendName();
final ServiceLoader<CelebornShuffleWriterFactory> loader =
ServiceLoader.load(CelebornShuffleWriterFactory.class);
final List<CelebornShuffleWriterFactory> factoryList =
Arrays.stream(Iterators.toArray(loader.iterator(),
CelebornShuffleWriterFactory.class))
.collect(Collectors.toList());
Preconditions.checkState(
- !factoryList.isEmpty(), "No factory found for Celeborn shuffle
writer");
- final Map<String, CelebornShuffleWriterFactory> factoryMap =
- factoryList.stream()
-
.collect(Collectors.toMap(CelebornShuffleWriterFactory::backendName, f -> f));
-
- final String backendName = BackendsApiManager.getBackendName();
- if (!factoryMap.containsKey(backendName)) {
- throw new UnsupportedOperationException(
- "No Celeborn shuffle writer factory found for backend " +
backendName);
- }
- writerFactory = factoryMap.get(backendName);
+ !factoryList.isEmpty(),
+ "No Celeborn shuffle writer factory found for backend " + backendName);
+ Preconditions.checkState(
+ factoryList.size() == 1,
+ "Multiple factory found for Celeborn shuffle writer for backend " +
backendName);
+ writerFactory = factoryList.get(0);
Review Comment:
It seems the above code can be simplified as follows.
```
final Iterator<CelebornShuffleWriterFactory> writerFactoryIterator =
ServiceLoader.load(CelebornShuffleWriterFactory.class).iterator();
Preconditions.checkState(writerFactoryIterator.hasNext(), "No factory found
for Celeborn shuffle writer");
writerFactory = writerFactoryIterator.next();
```
##########
gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java:
##########
@@ -68,46 +67,35 @@ public class CelebornShuffleManager
private static final CelebornColumnarBatchSerializerFactory
columnarBatchSerializerFactory;
static {
+ final String backendName = BackendsApiManager.getBackendName();
Review Comment:
Nit:
It's unnecessary to include backendName in error message. It's already clear
to users.
##########
gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java:
##########
@@ -68,46 +67,35 @@ public class CelebornShuffleManager
private static final CelebornColumnarBatchSerializerFactory
columnarBatchSerializerFactory;
static {
+ final String backendName = BackendsApiManager.getBackendName();
final ServiceLoader<CelebornShuffleWriterFactory> loader =
ServiceLoader.load(CelebornShuffleWriterFactory.class);
final List<CelebornShuffleWriterFactory> factoryList =
Arrays.stream(Iterators.toArray(loader.iterator(),
CelebornShuffleWriterFactory.class))
.collect(Collectors.toList());
Preconditions.checkState(
- !factoryList.isEmpty(), "No factory found for Celeborn shuffle
writer");
- final Map<String, CelebornShuffleWriterFactory> factoryMap =
- factoryList.stream()
-
.collect(Collectors.toMap(CelebornShuffleWriterFactory::backendName, f -> f));
-
- final String backendName = BackendsApiManager.getBackendName();
- if (!factoryMap.containsKey(backendName)) {
- throw new UnsupportedOperationException(
- "No Celeborn shuffle writer factory found for backend " +
backendName);
- }
- writerFactory = factoryMap.get(backendName);
+ !factoryList.isEmpty(),
+ "No Celeborn shuffle writer factory found for backend " + backendName);
+ Preconditions.checkState(
+ factoryList.size() == 1,
+ "Multiple factory found for Celeborn shuffle writer for backend " +
backendName);
+ writerFactory = factoryList.get(0);
- final ServiceLoader<CelebornColumnarBatchSerializerFactory>
- celebornColumnarBatchSerializerFactoriesLoader =
- ServiceLoader.load(CelebornColumnarBatchSerializerFactory.class);
- final List<CelebornColumnarBatchSerializerFactory>
columnarBatchSerializerFactoryList =
+ final ServiceLoader<CelebornColumnarBatchSerializerFactory>
serializerLoader =
+ ServiceLoader.load(CelebornColumnarBatchSerializerFactory.class);
+ final List<CelebornColumnarBatchSerializerFactory> serializerFactoryList =
Arrays.stream(
Iterators.toArray(
- celebornColumnarBatchSerializerFactoriesLoader.iterator(),
- CelebornColumnarBatchSerializerFactory.class))
+ serializerLoader.iterator(),
CelebornColumnarBatchSerializerFactory.class))
.collect(Collectors.toList());
Preconditions.checkState(
- !columnarBatchSerializerFactoryList.isEmpty(),
- "No factory found for Celeborn columnar batch serializer");
- final Map<String, CelebornColumnarBatchSerializerFactory>
columnarBatchSerializerFactoryMap =
- columnarBatchSerializerFactoryList.stream()
-
.collect(Collectors.toMap(CelebornColumnarBatchSerializerFactory::backendName,
f -> f));
-
- if (!columnarBatchSerializerFactoryMap.containsKey(backendName)) {
- throw new UnsupportedOperationException(
- "No Celeborn columnar batch serializer writer factory found for
backend " + backendName);
- }
- columnarBatchSerializerFactory =
columnarBatchSerializerFactoryMap.get(backendName);
+ !serializerFactoryList.isEmpty(),
+ "No factory found for Celeborn columnar batch serializer for backend "
+ backendName);
+ Preconditions.checkState(
+ serializerFactoryList.size() == 1,
+ "Multiple factory found for Celeborn columnar batch serializer for
backend " + backendName);
+ columnarBatchSerializerFactory = serializerFactoryList.get(0);
Review Comment:
ditto
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
