Skip to content

Fix hudi bootstrap #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codope wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix hudi bootstrap #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6141b1c
Upgrade hudi-presto-bundle
codope Jan 31, 2023
44e091b
Avoid record reader path for COW bootstrap tables
codope Apr 6, 2023
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
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dep.pinot.version>0.11.0</dep.pinot.version>
<dep.druid.version>0.19.0</dep.druid.version>
<dep.jaxb.version>2.3.1</dep.jaxb.version>
<dep.hudi.version>0.12.1</dep.hudi.version>
<dep.hudi.version>0.14.0-SNAPSHOT</dep.hudi.version>
<dep.testcontainers.version>1.15.1</dep.testcontainers.version>
<dep.docker-java.version>3.2.12</dep.docker-java.version>
<dep.jayway.version>2.6.0</dep.jayway.version>
Expand Down Expand Up @@ -1294,6 +1294,10 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
<exclusion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- End dependencies for querying Hudi table-->
Expand Down
1 change: 1 addition & 0 deletions presto-hive-hadoop2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
Expand Down
1 change: 1 addition & 0 deletions presto-hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
Expand Down
6 changes: 1 addition & 5 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,7 @@ static boolean isHudiParquetInputFormat(InputFormat<?, ?> inputFormat)

private static boolean shouldUseFileSplitsForHudi(InputFormat<?, ?> inputFormat, HoodieTableMetaClient metaClient)
{
if (inputFormat instanceof HoodieParquetRealtimeInputFormat) {
return true;
}

return metaClient.getTableConfig().getBootstrapBasePath().isPresent();
return inputFormat instanceof HoodieParquetRealtimeInputFormat;
}

public static long parseHiveDate(String value)
Expand Down
4 changes: 3 additions & 1 deletion presto-hive/src/main/java/com/facebook/presto/hive/HudiDirectoryLister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.hudi.common.engine.HoodieEngineContext;
import org.apache.hudi.common.engine.HoodieLocalEngineContext;
import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.model.BaseFile;
import org.apache.hudi.common.model.HoodieBaseFile;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.view.FileSystemViewManager;
Expand Down Expand Up @@ -132,7 +133,8 @@ public boolean hasNext()
public HiveFileInfo next()
throws IOException
{
FileStatus fileStatus = hoodieBaseFileIterator.next().getFileStatus();
HoodieBaseFile baseFile = hoodieBaseFileIterator.next();
FileStatus fileStatus = baseFile.getBootstrapBaseFile().map(BaseFile::getFileStatus).orElse(baseFile.getFileStatus());
String[] name = new String[] {"localhost:" + DFS_DATANODE_DEFAULT_PORT};
String[] host = new String[] {"localhost"};
LocatedFileStatus hoodieFileStatus = new LocatedFileStatus(fileStatus,
Expand Down
6 changes: 5 additions & 1 deletion presto-hudi/src/main/java/com/facebook/presto/hudi/split/HudiPartitionSplitGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.model.FileSlice;
import org.apache.hudi.common.model.HoodieBaseFile;
import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
import org.apache.hudi.common.util.HoodieTimer;

Expand Down Expand Up @@ -121,7 +122,10 @@ private Optional<HudiSplit> createHudiSplit(
HudiPartition partition,
HudiSplitWeightProvider splitWeightProvider)
{
HudiFile baseFile = slice.getBaseFile().map(f -> new HudiFile(f.getPath(), 0, f.getFileLen())).orElse(null);
HudiFile baseFile = slice.getBaseFile().map(
f -> f.getBootstrapBaseFile().map(bootstrapFile -> new HudiFile(bootstrapFile.getPath(), 0, bootstrapFile.getFileLen()))
.orElse(new HudiFile(f.getPath(), 0, f.getFileLen())))
.orElse(null);
if (null == baseFile && table.getTableType() == HudiTableType.COW) {
return Optional.empty();
}
Expand Down
1 change: 1 addition & 0 deletions presto-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
<ignoredClassPattern>module-info</ignoredClassPattern>
<ignoredClassPattern>org.apache.avro.*</ignoredClassPattern>
<ignoredClassPattern>org.apache.parquet.*</ignoredClassPattern>
<ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions presto-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
Expand Down
7 changes: 7 additions & 0 deletions presto-native-execution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,14 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>com.esotericsoftware.kryo.*</ignoredClassPattern>
<ignoredClassPattern>com.esotericsoftware.minlog.Log</ignoredClassPattern>
<ignoredClassPattern>com.esotericsoftware.reflectasm.*</ignoredClassPattern>
<ignoredClassPattern>module-info</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 4 additions & 0 deletions presto-spark-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,14 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
<ignoredClassPattern>module-info</ignoredClassPattern>
<ignoredClassPattern>com.esotericsoftware.kryo.*</ignoredClassPattern>
<ignoredClassPattern>com.esotericsoftware.minlog.Log</ignoredClassPattern>
<ignoredClassPattern>com.esotericsoftware.reflectasm.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions presto-spark-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
<ignoredResourcePatterns>
<ignoredResourcePattern>parquet.thrift</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
<ignoredClassPatterns>
<ignoredClassPattern>shaded.parquet.it.unimi.dsi.fastutil.*</ignoredClassPattern>
Expand Down