[HOTFIX] Support both listfile() and listfile(maxCount) in InsertStag… #3621
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e flow Why is this PR needed? Flink write files to obs with setting the filename in order of time, when loading stages files to carbondata, files are list and loaded with the parameter "maxcount" which will return "maxcount" files with smaller filename, in the other words, "maxcount" files with earliest generation time. but in same senario, it is possible that the filename of stage files is not in order of time, a switch is used here to judge whether to list files with specify batch size, or just list all files in the stage dir. What changes were proposed in this PR? A swith "CARBON_STAGE_FILENAME_IS_IN_ORDER_OF_TIME" is added. Does this PR introduce any user interface change? No Is any new testcase added? No
|
Build Success with Spark 2.4.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbon_PR_Builder_2.4.4/296/ |
|
Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbonPRBuilder2.3/2000/ |
| // an approximate value. For local files, as can it can we not guarantee the order, we | ||
| // just list all. | ||
| val allFiles = dir.listFiles(false, batchSize * 2) | ||
| // It is possible that the filename of stage files is not in order of time, |
There was a problem hiding this comment.
Can you explain in which scenario it won't be ordered of time ?
| val allFiles = dir.listFiles(false, batchSize * 2) | ||
| // It is possible that the filename of stage files is not in order of time, | ||
| // A switch is used here to judge whether to list files with specify batch size | ||
| val CARBON_STAGE_FILENAME_IS_IN_ORDER_OF_TIME = CarbonProperties.getInstance().getProperty( |
There was a problem hiding this comment.
Also need validation, toBoolean may fail if user sets a non-boolean value say 123 by mistake.
| val allFiles = dir.listFiles(false, batchSize * 2) | ||
| // It is possible that the filename of stage files is not in order of time, | ||
| // A switch is used here to judge whether to list files with specify batch size | ||
| val CARBON_STAGE_FILENAME_IS_IN_ORDER_OF_TIME = CarbonProperties.getInstance().getProperty( |
There was a problem hiding this comment.
change variable name to isSortedFileNames
| @@ -1593,6 +1593,14 @@ private CarbonCommonConstants() { | |||
|
|
|||
| public static final String SUPPORT_DIRECT_QUERY_ON_DATAMAP_DEFAULTVALUE = "false"; | |||
|
|
|||
| // Whether the filename of stage files is in order of time | |||
| @CarbonProperty | |||
There was a problem hiding this comment.
Need to update document also for any new carbon property added
jackylk
reviewed
Feb 18, 2020
| @@ -1593,6 +1593,14 @@ private CarbonCommonConstants() { | |||
|
|
|||
| public static final String SUPPORT_DIRECT_QUERY_ON_DATAMAP_DEFAULTVALUE = "false"; | |||
|
|
|||
| // Whether the filename of stage files is in order of time | |||
| @CarbonProperty | |||
There was a problem hiding this comment.
make it dynamic configurable
|
@marchpure Please rebase and fix the comments |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…e flow
Why is this PR needed?
Flink writes files to obs with setting the filename in order of time, when loading stages files to carbondata, files are list and loaded with the parameter "maxcount" which will return "maxcount" files with smaller filename, in the other words, "maxcount" files with earliest generation time. but in same senario, it is possible that the filename of stage files is not in order of time, a switch is used here to judge whether to list files with specify batch size, or just list all files in the stage dir.
What changes were proposed in this PR?
A swith "CARBON_STAGE_FILENAME_IS_IN_ORDER_OF_TIME" is added.
Does this PR introduce any user interface change?
Is any new testcase added?