You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by GitBox <gi...@apache.org> on 2021/06/27 18:18:20 UTC
[GitHub] [hudi] vinothchandar commented on a change in pull request #3117: [HUDI-2028] Implement RockDbBasedMap as an alternate to DiskBasedMap in ExternalSpillableMap
vinothchandar commented on a change in pull request #3117:
URL: https://github.com/apache/hudi/pull/3117#discussion_r659357702
##########
File path: hudi-common/src/main/java/org/apache/hudi/common/util/collection/ExternalSpillableMap.java
##########
@@ -80,22 +84,35 @@
private final String baseFilePath;
public ExternalSpillableMap(Long maxInMemorySizeInBytes, String baseFilePath, SizeEstimator<T> keySizeEstimator,
- SizeEstimator<R> valueSizeEstimator) throws IOException {
+ SizeEstimator<R> valueSizeEstimator) throws IOException {
+ this(maxInMemorySizeInBytes, baseFilePath, keySizeEstimator,
+ valueSizeEstimator, DiskMapType.DISK_MAP);
+ }
+
+ public ExternalSpillableMap(Long maxInMemorySizeInBytes, String baseFilePath, SizeEstimator<T> keySizeEstimator,
+ SizeEstimator<R> valueSizeEstimator, DiskMapType diskMapType) throws IOException {
this.inMemoryMap = new HashMap<>();
this.baseFilePath = baseFilePath;
- this.diskBasedMap = new DiskBasedMap<>(baseFilePath);
this.maxInMemorySizeInBytes = (long) Math.floor(maxInMemorySizeInBytes * sizingFactorForInMemoryMap);
this.currentInMemoryMapSize = 0L;
this.keySizeEstimator = keySizeEstimator;
this.valueSizeEstimator = valueSizeEstimator;
+ this.diskMapType = diskMapType;
}
- private DiskBasedMap<T, R> getDiskBasedMap() {
+ private SpillableDiskMap<T, R> getDiskBasedMap() {
if (null == diskBasedMap) {
synchronized (this) {
if (null == diskBasedMap) {
try {
- diskBasedMap = new DiskBasedMap<>(baseFilePath);
+ switch (diskMapType) {
+ case ROCK_DB:
Review comment:
rename: ROCKS_DB
##########
File path: hudi-common/src/main/java/org/apache/hudi/common/util/collection/ExternalSpillableMap.java
##########
@@ -61,15 +63,17 @@
private final long maxInMemorySizeInBytes;
// Map to store key-values in memory until it hits maxInMemorySizeInBytes
private final Map<T, R> inMemoryMap;
- // Map to store key-valuemetadata important to find the values spilled to disk
- private transient volatile DiskBasedMap<T, R> diskBasedMap;
+ // Map to store key-values on disk or db after it spilled over the memory
+ private transient volatile SpillableDiskMap<T, R> diskBasedMap;
Review comment:
does n't `DiskBasedMap` already mean its spilling to disk. May be a better hierarchy is to call the new interface
`DiskMap` (instead of SpillableDiskMap) and rename DiskBasedMap to `BitCaskDiskMap` (which is what the design is based on) https://github.com/basho/bitcask
##########
File path: hudi-common/src/main/java/org/apache/hudi/common/util/collection/ExternalSpillableMap.java
##########
@@ -259,6 +284,40 @@ public void close() {
return entrySet;
}
+ public enum DiskMapType {
+ DISK_MAP("disk_map"),
+ ROCK_DB("rock_db"),
+ UNKNOWN("unknown");
+
+ private final String value;
+
+ DiskMapType(String value) {
+ this.value = value;
+ }
+
+ /**
+ * Getter for spillable disk map type.
+ * @return
+ */
+ public String value() {
+ return value;
+ }
+
+ /**
+ * Convert string value to {@link DiskMapType}.
+ */
+ public static DiskMapType fromValue(String value) {
Review comment:
why the need for `value`? Can we not support either `DISK_MAP` or `disk_map` by just a .toUpperCase() when the config is parsed?
##########
File path: hudi-common/src/main/java/org/apache/hudi/common/util/collection/ExternalSpillableMap.java
##########
@@ -80,22 +84,35 @@
private final String baseFilePath;
public ExternalSpillableMap(Long maxInMemorySizeInBytes, String baseFilePath, SizeEstimator<T> keySizeEstimator,
- SizeEstimator<R> valueSizeEstimator) throws IOException {
+ SizeEstimator<R> valueSizeEstimator) throws IOException {
+ this(maxInMemorySizeInBytes, baseFilePath, keySizeEstimator,
+ valueSizeEstimator, DiskMapType.DISK_MAP);
+ }
+
+ public ExternalSpillableMap(Long maxInMemorySizeInBytes, String baseFilePath, SizeEstimator<T> keySizeEstimator,
+ SizeEstimator<R> valueSizeEstimator, DiskMapType diskMapType) throws IOException {
this.inMemoryMap = new HashMap<>();
this.baseFilePath = baseFilePath;
- this.diskBasedMap = new DiskBasedMap<>(baseFilePath);
this.maxInMemorySizeInBytes = (long) Math.floor(maxInMemorySizeInBytes * sizingFactorForInMemoryMap);
this.currentInMemoryMapSize = 0L;
this.keySizeEstimator = keySizeEstimator;
this.valueSizeEstimator = valueSizeEstimator;
+ this.diskMapType = diskMapType;
}
- private DiskBasedMap<T, R> getDiskBasedMap() {
+ private SpillableDiskMap<T, R> getDiskBasedMap() {
if (null == diskBasedMap) {
synchronized (this) {
if (null == diskBasedMap) {
try {
- diskBasedMap = new DiskBasedMap<>(baseFilePath);
+ switch (diskMapType) {
+ case ROCK_DB:
+ diskBasedMap = new SpillableRocksDBBasedMap<>(baseFilePath);
+ break;
+ case DISK_MAP:
Review comment:
then this enum will be `BITCASK`
##########
File path: hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java
##########
@@ -153,6 +154,10 @@
private static final String MERGE_ALLOW_DUPLICATE_ON_INSERTS = "hoodie.merge.allow.duplicate.on.inserts";
private static final String DEFAULT_MERGE_ALLOW_DUPLICATE_ON_INSERTS = "false";
+ // Enable usage of RocksDb for External Spillable Map
+ public static final String DEFAULT_SPILLABLE_DISK_MAP_TYPE = ExternalSpillableMap.DiskMapType.ROCK_DB.name();
Review comment:
lets do the flip now, that all the tests pass with rocksdb map?
##########
File path: hudi-common/src/main/java/org/apache/hudi/common/util/collection/SpillableDiskMap.java
##########
@@ -0,0 +1,37 @@
+/*
+ * 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.hudi.common.util.collection;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/**
+ * The spillable map that provides the map interface for storing records in disk/ db after they
+ * spill over from memory. Used by {@link ExternalSpillableMap}.
+ * @param <T>
+ * @param <R>
+ */
+public interface SpillableDiskMap<T extends Serializable, R extends Serializable> extends Map<T, R>, Iterable<R> {
+ Stream<R> valueStream();
+
+ long sizeOfFileOnDiskInBytes();
+
+ void close();
+}
Review comment:
nit:newline
--
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@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org