You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/02/08 01:58:13 UTC
[GitHub] [incubator-inlong] chantccc opened a new pull request #2400: [INLONG-2348] Support lzo/gzip compression when using CSV formats in hive sink
chantccc opened a new pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400
### Title Name: [INLONG-XYZ][component] Title of the pull request
where *XYZ* should be replaced by the actual issue number.
Fixes #<xyz>
### Motivation
*Explain here the context, and why you're making that change. What is the problem you're trying to solve.*
### Modifications
*Describe the modifications you've done.*
### Verifying this change
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a followup issue for adding the documentation
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] chantccc commented on pull request #2400: [INLONG-2348] Support lzo/gzip compression when using CSV formats in hive sink
Posted by GitBox <gi...@apache.org>.
chantccc commented on pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400#issuecomment-1033318226
@ifndef-SleePy @KevinWen007
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] KevinWen007 commented on a change in pull request #2400: [INLONG-2348] Support lzo/gzip compression when using text formats in hive sink
Posted by GitBox <gi...@apache.org>.
KevinWen007 commented on a change in pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400#discussion_r802305622
##########
File path: inlong-sort/sort-connectors/src/test/java/org/apache/inlong/sort/flink/hive/formats/TextRowWriterTest.java
##########
@@ -0,0 +1,170 @@
+/*
+ * 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.inlong.sort.flink.hive.formats;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import io.airlift.compress.lzo.LzopCodec;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.flink.core.fs.local.LocalDataOutputStream;
+import org.apache.flink.types.Row;
+import org.apache.hadoop.io.compress.CompressionInputStream;
+import org.apache.inlong.sort.configuration.Configuration;
+import org.apache.inlong.sort.configuration.Constants.CompressionType;
+import org.apache.inlong.sort.protocol.sink.HiveSinkInfo.TextFileFormat;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class TextRowWriterTest {
+ @ClassRule
+ public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Test
+ public void testWrite() throws IOException {
+ File file = temporaryFolder.newFile("test.txt");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(file),
+ new TextFileFormat(','),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+ textRowWriter.flush();
+ textRowWriter.finish();
+
+ final List<String> results = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(
+ new FileInputStream(file.getAbsolutePath()), StandardCharsets.UTF_8))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ results.add(line);
+ }
+ }
+
+ assertEquals(2, results.size());
+ assertEquals("zhangsan,1", results.get(0));
+ assertEquals("lisi,2", results.get(1));
+ }
+
+ @Test
+ public void testWriteGzip() throws IOException {
+ File gzipFile = temporaryFolder.newFile("test.gz");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(gzipFile),
+ new TextFileFormat(',', CompressionType.GZIP),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+
+ textRowWriter.flush();
+ textRowWriter.finish();
+
+ assertTrue(isSameFile(gzipFile.getAbsolutePath(), "src/test/resources/testGzip.gz"));
+ }
+
+ @Test
+ public void testWriteLZO() throws IOException {
+ File lzoFile = temporaryFolder.newFile("test.lzo");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(lzoFile),
+ new TextFileFormat(',', CompressionType.LZO),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+ textRowWriter.finish();
+
+ LzopCodec lzopCodec = new LzopCodec();
+ CompressionInputStream compressionInputStream = lzopCodec.createInputStream(
+ new FileInputStream(lzoFile.getAbsolutePath()));
+ final List<String> results = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(
+ compressionInputStream, StandardCharsets.UTF_8))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ results.add(line);
+ }
+ }
+
+ assertEquals(2, results.size());
+ assertEquals("zhangsan,1", results.get(0));
+ assertEquals("lisi,2", results.get(1));
+ }
+
+ public static boolean isSameFile(String fileName1, String fileName2) {
+ FileInputStream fis1 = null;
+ FileInputStream fis2 = null;
+
+ try {
Review comment:
Considering the following usage?
```
try(FileInputStream fis1 = new FileInputStream(fileName1);
FileInputStream fis2 = new FileInputStream(fileName2) ){} catch(){}
```
##########
File path: inlong-sort/sort-connectors/src/test/java/org/apache/inlong/sort/flink/hive/formats/TextRowWriterTest.java
##########
@@ -0,0 +1,170 @@
+/*
+ * 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.inlong.sort.flink.hive.formats;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import io.airlift.compress.lzo.LzopCodec;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.flink.core.fs.local.LocalDataOutputStream;
+import org.apache.flink.types.Row;
+import org.apache.hadoop.io.compress.CompressionInputStream;
+import org.apache.inlong.sort.configuration.Configuration;
+import org.apache.inlong.sort.configuration.Constants.CompressionType;
+import org.apache.inlong.sort.protocol.sink.HiveSinkInfo.TextFileFormat;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class TextRowWriterTest {
+ @ClassRule
+ public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Test
+ public void testWrite() throws IOException {
+ File file = temporaryFolder.newFile("test.txt");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(file),
+ new TextFileFormat(','),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+ textRowWriter.flush();
+ textRowWriter.finish();
+
+ final List<String> results = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(
+ new FileInputStream(file.getAbsolutePath()), StandardCharsets.UTF_8))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ results.add(line);
+ }
+ }
+
+ assertEquals(2, results.size());
+ assertEquals("zhangsan,1", results.get(0));
+ assertEquals("lisi,2", results.get(1));
+ }
+
+ @Test
+ public void testWriteGzip() throws IOException {
+ File gzipFile = temporaryFolder.newFile("test.gz");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(gzipFile),
+ new TextFileFormat(',', CompressionType.GZIP),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+
+ textRowWriter.flush();
+ textRowWriter.finish();
+
+ assertTrue(isSameFile(gzipFile.getAbsolutePath(), "src/test/resources/testGzip.gz"));
+ }
+
+ @Test
+ public void testWriteLZO() throws IOException {
+ File lzoFile = temporaryFolder.newFile("test.lzo");
+ TextRowWriter textRowWriter = new TextRowWriter(
+ new LocalDataOutputStream(lzoFile),
+ new TextFileFormat(',', CompressionType.LZO),
+ new Configuration()
+ );
+
+ textRowWriter.addElement(Row.of("zhangsan", 1));
+ textRowWriter.addElement(Row.of("lisi", 2));
+ textRowWriter.finish();
+
+ LzopCodec lzopCodec = new LzopCodec();
+ CompressionInputStream compressionInputStream = lzopCodec.createInputStream(
+ new FileInputStream(lzoFile.getAbsolutePath()));
+ final List<String> results = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(
+ compressionInputStream, StandardCharsets.UTF_8))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ results.add(line);
+ }
+ }
+
+ assertEquals(2, results.size());
+ assertEquals("zhangsan,1", results.get(0));
+ assertEquals("lisi,2", results.get(1));
+ }
+
+ public static boolean isSameFile(String fileName1, String fileName2) {
+ FileInputStream fis1 = null;
+ FileInputStream fis2 = null;
+
+ try {
+ fis1 = new FileInputStream(fileName1);
+ fis2 = new FileInputStream(fileName2);
+
+ int len1 = fis1.available();
+ int len2 = fis2.available();
+
+ if (len1 == len2) {
+
+ byte[] data1 = new byte[len1];
+ byte[] data2 = new byte[len2];
+
+ fis1.read(data1);
+ fis2.read(data2);
+
+ for (int i = 0; i < len1; i++) {
Review comment:
will it be simple if using `Arrays.equals(data1, data2)`?
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] codecov-commenter edited a comment on pull request #2400: [INLONG-2348] Support lzo/gzip compression when using text formats in hive sink
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400#issuecomment-1032141025
# [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#2400](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (9100526) into [master](https://codecov.io/gh/apache/incubator-inlong/commit/f38886ddd92e18ac160f53d76dd4675838ba39bb?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (f38886d) will **increase** coverage by `0.01%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## master #2400 +/- ##
============================================
+ Coverage 12.53% 12.55% +0.01%
- Complexity 1218 1221 +3
============================================
Files 420 420
Lines 36255 36255
Branches 5674 5674
============================================
+ Hits 4545 4551 +6
+ Misses 30901 30895 -6
Partials 809 809
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [.../producer/qltystats/DefaultBrokerRcvQltyStats.java](https://codecov.io/gh/apache/incubator-inlong/pull/2400/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtY2xpZW50L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9pbmxvbmcvdHViZW1xL2NsaWVudC9wcm9kdWNlci9xbHR5c3RhdHMvRGVmYXVsdEJyb2tlclJjdlFsdHlTdGF0cy5qYXZh) | `45.70% <0.00%> (+1.56%)` | :arrow_up: |
| [.../client/producer/qltystats/BrokerStatsItemSet.java](https://codecov.io/gh/apache/incubator-inlong/pull/2400/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtY2xpZW50L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9pbmxvbmcvdHViZW1xL2NsaWVudC9wcm9kdWNlci9xbHR5c3RhdHMvQnJva2VyU3RhdHNJdGVtU2V0LmphdmE=) | `72.09% <0.00%> (+4.65%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [f38886d...9100526](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] codecov-commenter commented on pull request #2400: [INLONG-2348] Support lzo/gzip compression when using CSV formats in hive sink
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400#issuecomment-1032141025
# [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#2400](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (820e5ff) into [master](https://codecov.io/gh/apache/incubator-inlong/commit/32e66a8d93915daf3b6def4ff78fca44355574fb?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (32e66a8) will **decrease** coverage by `0.00%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## master #2400 +/- ##
============================================
- Coverage 12.55% 12.54% -0.01%
+ Complexity 1221 1219 -2
============================================
Files 420 420
Lines 36240 36240
Branches 5670 5670
============================================
- Hits 4550 4547 -3
- Misses 30884 30886 +2
- Partials 806 807 +1
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [.../inlong/tubemq/corebase/policies/FlowCtrlItem.java](https://codecov.io/gh/apache/incubator-inlong/pull/2400/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtY29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvaW5sb25nL3R1YmVtcS9jb3JlYmFzZS9wb2xpY2llcy9GbG93Q3RybEl0ZW0uamF2YQ==) | `38.88% <0.00%> (-1.12%)` | :arrow_down: |
| [.../tubemq/corebase/policies/FlowCtrlRuleHandler.java](https://codecov.io/gh/apache/incubator-inlong/pull/2400/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtY29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvaW5sb25nL3R1YmVtcS9jb3JlYmFzZS9wb2xpY2llcy9GbG93Q3RybFJ1bGVIYW5kbGVyLmphdmE=) | `34.07% <0.00%> (-0.45%)` | :arrow_down: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [32e66a8...820e5ff](https://codecov.io/gh/apache/incubator-inlong/pull/2400?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] dockerzhang merged pull request #2400: [INLONG-2348] Support lzo/gzip compression when using text formats in hive sink
Posted by GitBox <gi...@apache.org>.
dockerzhang merged pull request #2400:
URL: https://github.com/apache/incubator-inlong/pull/2400
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org