[pinot] branch master updated: Fixing the bug of missing dot to extract sub props from ingestion job filesytem spec and minion segmentNameGeneratorSpec (#8511)

[xiangfu]

This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new bb46e466af Fixing the bug of missing dot to extract sub props from 
ingestion job filesytem spec and minion segmentNameGeneratorSpec (#8511)
bb46e466af is described below

commit bb46e466af122a0dcf0f2246db62615d699af625
Author: Xiang Fu <xiangfu.1...@gmail.com>
AuthorDate: Mon Apr 11 21:04:26 2022 -0700

    Fixing the bug of missing dot to extract sub props from ingestion job 
filesytem spec and minion segmentNameGeneratorSpec (#8511)
---
 .../java/org/apache/pinot/controller/util/FileIngestionHelper.java  | 2 +-
 .../SegmentGenerationAndPushTaskExecutor.java                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
 
b/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
index 92da871460..a180d9cb55 100644
--- 
a/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
+++ 
b/pinot-controller/src/main/java/org/apache/pinot/controller/util/FileIngestionHelper.java
@@ -176,7 +176,7 @@ public class FileIngestionHelper {
     if (!PinotFSFactory.isSchemeSupported(sourceFileURIScheme)) {
       PinotFSFactory.register(sourceFileURIScheme, 
batchConfigMap.get(BatchConfigProperties.INPUT_FS_CLASS),
           
IngestionConfigUtils.getInputFsProps(IngestionConfigUtils.getConfigMapWithPrefix(
-              batchConfigMap, BatchConfigProperties.INPUT_FS_PROP_PREFIX)));
+              batchConfigMap, BatchConfigProperties.INPUT_FS_PROP_PREFIX + 
IngestionConfigUtils.DOT_SEPARATOR)));
     }
     PinotFSFactory.create(sourceFileURIScheme).copyToLocalFile(sourceFileURI, 
destFile);
   }
diff --git 
a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
 
b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
index 374c996cd4..25ffea0977 100644
--- 
a/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
+++ 
b/pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/segmentgenerationandpush/SegmentGenerationAndPushTaskExecutor.java
@@ -190,7 +190,7 @@ public class SegmentGenerationAndPushTaskExecutor extends 
BaseTaskExecutor {
       case METADATA:
         try {
           Map<String, String> segmentUriToTarPathMap = 
SegmentPushUtils.getSegmentUriToTarPathMap(outputSegmentDirURI,
-              pushJobSpec, new String[] { outputSegmentTarURI.toString() });
+              pushJobSpec, new String[]{outputSegmentTarURI.toString()});
           SegmentPushUtils.sendSegmentUriAndMetadata(spec, outputFileFS, 
segmentUriToTarPathMap);
         } catch (RetriableOperationException | AttemptsExceededException e) {
           throw new RuntimeException(e);
@@ -305,8 +305,8 @@ public class SegmentGenerationAndPushTaskExecutor extends 
BaseTaskExecutor {
     }
     SegmentNameGeneratorSpec segmentNameGeneratorSpec = new 
SegmentNameGeneratorSpec();
     
segmentNameGeneratorSpec.setType(taskConfigs.get(BatchConfigProperties.SEGMENT_NAME_GENERATOR_TYPE));
-    segmentNameGeneratorSpec.setConfigs(IngestionConfigUtils
-        .getConfigMapWithPrefix(taskConfigs, 
BatchConfigProperties.SEGMENT_NAME_GENERATOR_PROP_PREFIX));
+    
segmentNameGeneratorSpec.setConfigs(IngestionConfigUtils.getConfigMapWithPrefix(taskConfigs,
+        BatchConfigProperties.SEGMENT_NAME_GENERATOR_PROP_PREFIX + 
IngestionConfigUtils.DOT_SEPARATOR));
     taskSpec.setSegmentNameGeneratorSpec(segmentNameGeneratorSpec);
     taskSpec.setCustomProperty(BatchConfigProperties.INPUT_DATA_FILE_URI_KEY, 
inputFileURI.toString());
     return taskSpec;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org