lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-2268] Add upgrade and downgrade to and from 0.9.0 (#3470)

Browse Source 
- Added upgrade and downgrade step to and from 0.9.0. Upgrade adds few table properties. Downgrade recreates timeline server based marker files if any.
This commit is contained in:
Y Ethan Guo
2021-08-14 17:20:23 -07:00
committed by GitHub
parent 18e6b79947
commit 23dca6c237
27 changed files with 851 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableVersion.java
View File

@@ -30,7 +30,9 @@ public enum HoodieTableVersion {
// < 0.6.0 versions
ZERO(0),
// 0.6.0 onwards
ONE(1);
ONE(1),
// 0.9.0 onwards
TWO(2);
private final int versionCode;
@@ -43,10 +45,10 @@ public enum HoodieTableVersion {
}
public static HoodieTableVersion current() {
return ONE;
return TWO;
}
static HoodieTableVersion versionFromCode(int versionCode) {
public static HoodieTableVersion versionFromCode(int versionCode) {
return Arrays.stream(HoodieTableVersion.values())
.filter(v -> v.versionCode == versionCode).findAny()
.orElseThrow(() -> new HoodieException("Unknown versionCode:" + versionCode));

11
hudi-common/src/main/java/org/apache/hudi/common/util/MarkerUtils.java
View File

@@ -179,12 +179,13 @@ public class MarkerUtils {
try {
if (fileSystem.exists(dirPath)) {
FileStatus[] fileStatuses = fileSystem.listStatus(dirPath);
Predicate<String> prefixFilter = pathStr -> pathStr.contains(MARKERS_FILENAME_PREFIX);
Predicate<String> markerTypeFilter =
pathStr -> !stripMarkerFolderPrefix(pathStr, markerDir).equals(MARKER_TYPE_FILENAME);
Predicate<FileStatus> prefixFilter = fileStatus ->
fileStatus.getPath().getName().startsWith(MARKERS_FILENAME_PREFIX);
Predicate<FileStatus> markerTypeFilter = fileStatus ->
!fileStatus.getPath().getName().equals(MARKER_TYPE_FILENAME);
List<String> markerDirSubPaths = Arrays.stream(fileStatuses)
.map(fileStatus -> fileStatus.getPath().toString())
.filter(prefixFilter.and(markerTypeFilter))
.map(fileStatus -> fileStatus.getPath().toString())
.collect(Collectors.toList());
if (markerDirSubPaths.size() > 0) {
@@ -216,4 +217,4 @@ public class MarkerUtils {
throw new HoodieIOException(ioe.getMessage(), ioe);
}
}
}
}