You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@orc.apache.org by GitBox <gi...@apache.org> on 2021/08/25 13:57:46 UTC
[GitHub] [orc] guiyanakuang opened a new pull request #882: Reordering statements, improve readability
guiyanakuang opened a new pull request #882:
URL: https://github.com/apache/orc/pull/882
<!--
Thanks for sending a pull request! Here are some tips for you:
1. File a JIRA issue first and use it as a prefix of your PR title, e.g., `ORC-001: Fix ABC`.
2. Use your PR title to summarize what this PR proposes instead of describing the problem.
3. Make PR title and description complete because these will be the permanent commit log.
4. If possible, provide a concise and reproducible example to reproduce the issue for a faster review.
5. If the PR is unfinished, use GitHub PR Draft feature.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If there is a discussion in the mailing list, please add the link.
-->
Reordered multiple statements. Make variable initialization and usage closer.
For example, before
```
193 buildIndex = rowIndexStride > 0;
216 if (buildIndex && rowIndexStride < MIN_ROW_INDEX_STRIDE) {
```
Put the heavy logic last and put the check logic first.
The create physicalWriter and treeWriter statements are placed at the end of constructor.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Clearer logic and improved readability.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
Pass the CIs.
--
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: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun commented on a change in pull request #882: ORC-970: Reordering statements, improve readability
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #882:
URL: https://github.com/apache/orc/pull/882#discussion_r695926553
##########
File path: java/core/src/java/org/apache/orc/impl/WriterImpl.java
##########
@@ -163,64 +162,69 @@ public WriterImpl(FileSystem fs,
opts.getKeyOverrides());
needKeyFlush = encryption.length > 0;
- // Set up the physical writer
- this.physicalWriter = opts.getPhysicalWriter() == null ?
- new PhysicalFsWriter(fs, path, opts, encryption) :
- opts.getPhysicalWriter();
- unencryptedOptions = physicalWriter.getStreamOptions();
- OutStream.assertBufferSizeValid(unencryptedOptions.getBufferSize());
-
- this.callback = opts.getCallback();
- this.writerVersion = opts.getWriterVersion();
- bloomFilterVersion = opts.getBloomFilterVersion();
this.directEncodingColumns = OrcUtils.includeColumns(
opts.getDirectEncodingColumns(), opts.getSchema());
dictionaryKeySizeThreshold =
OrcConf.DICTIONARY_KEY_SIZE_THRESHOLD.getDouble(conf);
+
+ this.callback = opts.getCallback();
if (callback != null) {
callbackContext = () -> WriterImpl.this;
} else {
callbackContext = null;
}
+
+ this.useProlepticGregorian = opts.getProlepticGregorian();
this.writeTimeZone = hasTimestamp(schema);
this.useUTCTimeZone = opts.getUseUTCTimestamp();
- this.stripeSize = opts.getStripeSize();
- this.version = opts.getVersion();
+
this.encodingStrategy = opts.getEncodingStrategy();
this.compressionStrategy = opts.getCompressionStrategy();
+
this.rowIndexStride = opts.getRowIndexStride();
- this.memoryManager = opts.getMemoryManager();
buildIndex = rowIndexStride > 0;
+ if (buildIndex && rowIndexStride < MIN_ROW_INDEX_STRIDE) {
+ throw new IllegalArgumentException("Row stride must be at least " +
+ MIN_ROW_INDEX_STRIDE);
+ }
+
+ this.writerVersion = opts.getWriterVersion();
+ this.version = opts.getVersion();
if (version == OrcFile.Version.FUTURE) {
throw new IllegalArgumentException("Can not write in a unknown version.");
} else if (version == OrcFile.Version.UNSTABLE_PRE_2_0) {
LOG.warn("ORC files written in " + version.getName() + " will not be" +
" readable by other versions of the software. It is only for" +
" developer testing.");
}
- boolean buildBloomFilter = buildIndex;
- if (version == OrcFile.Version.V_0_11) {
- /* do not write bloom filters for ORC v11 */
- buildBloomFilter = false;
- }
- if (!buildBloomFilter) {
+
+ this.bloomFilterVersion = opts.getBloomFilterVersion();
+ this.bloomFilterFpp = opts.getBloomFilterFpp();
+ /* do not write bloom filters for ORC v11 */
+ if (!buildIndex || version == OrcFile.Version.V_0_11) {
Review comment:
Ya, I agree with you that removing `buildBloomFilter` looks better.
--
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: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] guiyanakuang commented on pull request #882: ORC-970: Reordering statements, improve readability in WriterImpl
Posted by GitBox <gi...@apache.org>.
guiyanakuang commented on pull request #882:
URL: https://github.com/apache/orc/pull/882#issuecomment-906072578
😄 Thanks @dongjoon-hyun for review and merge.
--
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: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun merged pull request #882: ORC-970: Reordering statements, improve readability
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun merged pull request #882:
URL: https://github.com/apache/orc/pull/882
--
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: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org