Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
be4aeae
[HUDI-2413] fix Sql source's checkpoint
Sep 11, 2021
02d8da9
Revert "[HUDI-2413] fix Sql source's checkpoint"
Sep 11, 2021
eb14274
Merge pull request #1 from apache/master
fengjian428 Nov 9, 2021
c281194
Merge pull request #2 from apache/master
fengjian428 Jan 24, 2022
7f4c141
Merge pull request #3 from apache/master
fengjian428 Mar 3, 2022
06ea24c
Merge pull request #4 from apache/master
fengjian428 Mar 13, 2022
4885c98
Merge pull request #5 from apache/master
fengjian428 Mar 23, 2022
179dc04
Merge pull request #6 from apache/master
fengjian428 Apr 10, 2022
8a533e8
Merge pull request #7 from apache/master
fengjian428 May 5, 2022
ee3559c
Merge pull request #8 from apache/master
fengjian428 May 21, 2022
e2eca01
Merge pull request #9 from apache/master
fengjian428 May 25, 2022
25ea8db
Merge pull request #10 from apache/master
fengjian428 Jun 4, 2022
424c1da
Merge pull request #12 from apache/master
fengjian428 Jul 8, 2022
4468648
Merge pull request #13 from apache/master
fengjian428 Jul 10, 2022
f6d1266
Merge remote-tracking branch 'upstream/master'
Jul 14, 2022
3602a44
Merge remote-tracking branch 'upstream/master'
Jul 15, 2022
7289f30
Merge remote-tracking branch 'upstream/master'
Jul 16, 2022
9ad631a
fix UT test
Jul 17, 2022
7ccbd5f
minor update
Jul 17, 2022
280c9d8
minor update
Jul 17, 2022
0420661
pass hive conf
Jul 19, 2022
0523468
add ut
Jul 19, 2022
8e798bf
[HUDI-4437] clear FileSystem CACHE
Jul 21, 2022
88a02e8
[HUDI-4437] minor update
Jul 21, 2022
f150822
fix closeall
xushiyan Jul 21, 2022
08c005c
Merge remote-tracking branch 'upstream/master' into fixTestHiveSyncGl…
Jul 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private static Iterable<Object[]> syncModeAndSchemaFromCommitMetadata() {
private HoodieHiveSyncClient hiveClient;

@AfterAll
public static void cleanUpClass() {
public static void cleanUpClass() throws IOException {
HiveTestUtil.shutdown();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -49,7 +48,6 @@
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

@Disabled
public class TestHiveSyncGlobalCommitTool {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static void setUp() throws IOException, InterruptedException, HiveExcepti
hiveSyncProps.setProperty(META_SYNC_PARTITION_FIELDS.key(), "datestr");
hiveSyncProps.setProperty(HIVE_BATCH_SYNC_PARTITION_NUM.key(), "3");

hiveSyncConfig = new HiveSyncConfig(hiveSyncProps, configuration);
hiveSyncConfig = new HiveSyncConfig(hiveSyncProps, getHiveConf());

dtfOut = DateTimeFormatter.ofPattern("yyyy/MM/dd");
ddlExecutor = new HiveQueryDDLExecutor(hiveSyncConfig);
Expand Down Expand Up @@ -176,7 +176,7 @@ public static HiveConf getHiveConf() {
return hiveServer.getHiveConf();
}

public static void shutdown() {
public static void shutdown() throws IOException {
if (hiveServer != null) {
hiveServer.stop();
}
Expand All @@ -186,6 +186,7 @@ public static void shutdown() {
if (zkServer != null) {
zkServer.shutdown();
}
FileSystem.closeAll();
}

public static void createCOWTable(String instantTime, int numberOfPartitions, boolean useSchemaFromCommitMetadata,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.hudi.hive.testutils;

import org.apache.hadoop.fs.FileSystem;
import org.apache.hudi.avro.HoodieAvroWriteSupport;
import org.apache.hudi.common.bloom.BloomFilter;
import org.apache.hudi.common.bloom.BloomFilterFactory;
Expand Down Expand Up @@ -264,10 +265,11 @@ public void startHiveServer2() {
}
}

public void shutDown() {
public void shutDown() throws IOException {
stopHiveServer2();
Hive.closeCurrent();
hiveTestService.getHiveMetaStore().stop();
hdfsTestService.stop();
FileSystem.closeAll();
}
}