[
https://issues.apache.org/jira/browse/HUDI-2028?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17373854#comment-17373854
]
ASF GitHub Bot commented on HUDI-2028:
--------------------------------------
nsivabalan commented on a change in pull request #3194:
URL: https://github.com/apache/hudi/pull/3194#discussion_r663292410
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDbDiskMap.java
##########
@@ -0,0 +1,173 @@
+/*
+ * 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 org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.exception.HoodieNotSupportedException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+ * This class provides a disk spillable only map implementation.
+ * All of the data is stored using the RocksDB implementation.
+ */
+public final class RocksDbDiskMap<T extends Serializable, R extends
Serializable> implements DiskMap<T, R> {
+ // ColumnFamily allows partitioning data within RockDB, which allows
+ // independent configuration and faster deletes across partitions
+ // https://github.com/facebook/rocksdb/wiki/Column-Families
+ // For this use case, we use a single static column family/ partition
+ //
+ private static final String COLUMN_FAMILY_NAME = "spill_map";
+
+ private static final Logger LOG = LogManager.getLogger(RocksDbDiskMap.class);
+ // Stores the key and corresponding value's latest metadata spilled to disk
+ private final Set<T> keySet;
+ private final String rocksDbStoragePath;
+ private RocksDBDAO rocksDb;
+
+ public RocksDbDiskMap(String rocksDbStoragePath) throws IOException {
+ this.keySet = new HashSet<>();
+ this.rocksDbStoragePath = rocksDbStoragePath;
+ }
+
+ @Override
+ public int size() {
+ return keySet.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return keySet.isEmpty();
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ return keySet.contains((T) key);
+ }
+
+ @Override
+ public boolean containsValue(Object value) {
+ throw new HoodieNotSupportedException("unable to compare values in map");
+ }
+
+ @Override
+ public R get(Object key) {
+ if (!containsKey(key)) {
+ return null;
+ }
+ return getRocksDb().get(COLUMN_FAMILY_NAME, (T) key);
+ }
+
+ @Override
+ public R put(T key, R value) {
+ getRocksDb().put(COLUMN_FAMILY_NAME, key, value);
+ keySet.add(key);
+ return value;
+ }
+
+ @Override
+ public R remove(Object key) {
+ R value = get(key);
+ if (value != null) {
+ keySet.remove((T) key);
+ getRocksDb().delete(COLUMN_FAMILY_NAME, (T) key);
+ }
+ return value;
+ }
+
+ @Override
+ public void putAll(Map<? extends T, ? extends R> keyValues) {
+ getRocksDb().writeBatch(batch -> keyValues.forEach((key, value) ->
getRocksDb().putInBatch(batch, COLUMN_FAMILY_NAME, key, value)));
+ keySet.addAll(keyValues.keySet());
+ }
+
+ @Override
+ public void clear() {
+ close();
+ }
+
+ @Override
+ public Set<T> keySet() {
+ return keySet;
+ }
+
+ @Override
+ public Collection<R> values() {
+ throw new HoodieException("Unsupported Operation Exception");
+ }
+
+ @Override
+ public Set<Entry<T, R>> entrySet() {
+ Set<Entry<T, R>> entrySet = new HashSet<>();
+ for (T key : keySet) {
+ entrySet.add(new AbstractMap.SimpleEntry<>(key, get(key)));
+ }
+ return entrySet;
+ }
+
+ /**
+ * Custom iterator to iterate over values written to disk.
+ */
+ @Override
+ public Iterator<R> iterator() {
+ return getRocksDb().iterator(COLUMN_FAMILY_NAME);
+ }
+
+ @Override
+ public Stream<R> valueStream() {
+ return keySet.stream().map(key -> (R) get(key));
+ }
+
+ @Override
+ public long sizeOfFileOnDiskInBytes() {
+ return getRocksDb().getTotalBytesWritten();
+ }
+
+ @Override
+ public void close() {
+ keySet.clear();
+ if (null != rocksDb) {
+ rocksDb.close();
+ }
+ rocksDb = null;
+ }
+
+ private RocksDBDAO getRocksDb() {
+ if (null == rocksDb) {
+ synchronized (this) {
+ if (null == rocksDb) {
+ rocksDb = new RocksDBDAO(COLUMN_FAMILY_NAME, rocksDbStoragePath);
+ rocksDb.addColumnFamily(COLUMN_FAMILY_NAME);
+ }
+ }
+ }
+ return rocksDb;
+ }
+}
Review comment:
line break
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDbDiskMap.java
##########
@@ -0,0 +1,173 @@
+/*
+ * 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 org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.exception.HoodieNotSupportedException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+ * This class provides a disk spillable only map implementation.
+ * All of the data is stored using the RocksDB implementation.
+ */
+public final class RocksDbDiskMap<T extends Serializable, R extends
Serializable> implements DiskMap<T, R> {
+ // ColumnFamily allows partitioning data within RockDB, which allows
+ // independent configuration and faster deletes across partitions
+ // https://github.com/facebook/rocksdb/wiki/Column-Families
+ // For this use case, we use a single static column family/ partition
+ //
+ private static final String COLUMN_FAMILY_NAME = "spill_map";
+
+ private static final Logger LOG = LogManager.getLogger(RocksDbDiskMap.class);
+ // Stores the key and corresponding value's latest metadata spilled to disk
+ private final Set<T> keySet;
+ private final String rocksDbStoragePath;
+ private RocksDBDAO rocksDb;
+
+ public RocksDbDiskMap(String rocksDbStoragePath) throws IOException {
+ this.keySet = new HashSet<>();
+ this.rocksDbStoragePath = rocksDbStoragePath;
+ }
+
+ @Override
+ public int size() {
+ return keySet.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return keySet.isEmpty();
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ return keySet.contains((T) key);
+ }
+
+ @Override
+ public boolean containsValue(Object value) {
+ throw new HoodieNotSupportedException("unable to compare values in map");
+ }
+
+ @Override
+ public R get(Object key) {
+ if (!containsKey(key)) {
+ return null;
+ }
+ return getRocksDb().get(COLUMN_FAMILY_NAME, (T) key);
+ }
+
+ @Override
+ public R put(T key, R value) {
+ getRocksDb().put(COLUMN_FAMILY_NAME, key, value);
+ keySet.add(key);
+ return value;
+ }
+
+ @Override
+ public R remove(Object key) {
+ R value = get(key);
+ if (value != null) {
+ keySet.remove((T) key);
+ getRocksDb().delete(COLUMN_FAMILY_NAME, (T) key);
+ }
+ return value;
+ }
+
+ @Override
+ public void putAll(Map<? extends T, ? extends R> keyValues) {
+ getRocksDb().writeBatch(batch -> keyValues.forEach((key, value) ->
getRocksDb().putInBatch(batch, COLUMN_FAMILY_NAME, key, value)));
+ keySet.addAll(keyValues.keySet());
+ }
+
+ @Override
+ public void clear() {
+ close();
+ }
+
+ @Override
+ public Set<T> keySet() {
+ return keySet;
+ }
+
+ @Override
+ public Collection<R> values() {
+ throw new HoodieException("Unsupported Operation Exception");
+ }
+
+ @Override
+ public Set<Entry<T, R>> entrySet() {
+ Set<Entry<T, R>> entrySet = new HashSet<>();
+ for (T key : keySet) {
+ entrySet.add(new AbstractMap.SimpleEntry<>(key, get(key)));
+ }
+ return entrySet;
+ }
+
+ /**
+ * Custom iterator to iterate over values written to disk.
+ */
+ @Override
+ public Iterator<R> iterator() {
+ return getRocksDb().iterator(COLUMN_FAMILY_NAME);
+ }
+
+ @Override
+ public Stream<R> valueStream() {
+ return keySet.stream().map(key -> (R) get(key));
+ }
+
+ @Override
+ public long sizeOfFileOnDiskInBytes() {
+ return getRocksDb().getTotalBytesWritten();
+ }
+
+ @Override
+ public void close() {
+ keySet.clear();
+ if (null != rocksDb) {
+ rocksDb.close();
+ }
+ rocksDb = null;
+ }
+
+ private RocksDBDAO getRocksDb() {
+ if (null == rocksDb) {
+ synchronized (this) {
Review comment:
Do we know if this could be called from multiple threads? if not, we
don't need to add the overhead with synchronized block.
##########
File path:
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java
##########
@@ -283,6 +285,11 @@
.defaultValue("false")
.withDocumentation("Allow duplicates with inserts while merging with
existing records");
+ public static final ConfigProperty<String> SPILLABLE_DISK_MAP_TYPE =
ConfigProperty
+ .key("hoodie.spillable.diskmap.type")
+ .defaultValue(ExternalSpillableMap.DiskMapType.BITCASK.name())
+ .withDocumentation("Enable usage of either Bitcask or RocksDb as disk
map for External Spillable Map");
Review comment:
can we use the enum type here directly. for instance
.. usage of either " + ExternalSpillableMap.DiskMapType.BITCASK.name() + "
or " ....
so thats users who directly copy this value from config page will not have
any issues when trying it out.
##########
File path:
hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDbDiskMap.java
##########
@@ -0,0 +1,196 @@
+/*
+ * 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 org.apache.avro.Schema;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.IndexedRecord;
+
+import org.apache.hudi.avro.HoodieAvroUtils;
+import org.apache.hudi.common.model.HoodieAvroPayload;
+import org.apache.hudi.common.model.HoodieKey;
+import org.apache.hudi.common.model.HoodieRecord;
+import org.apache.hudi.common.model.HoodieRecordPayload;
+import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.testutils.SchemaTestUtil;
+import org.apache.hudi.common.testutils.SpillableMapTestUtils;
+import org.apache.hudi.common.util.Option;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import static org.apache.hudi.common.testutils.SchemaTestUtil.getSimpleSchema;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test the rocksDb based Map {@link RocksDbDiskMap}
+ * that is used by {@link ExternalSpillableMap}.
+ */
+public class TestRocksDbDiskMap extends HoodieCommonTestHarness {
+
+ @BeforeEach
+ public void setUp() {
+ initPath();
+ }
+
+ @Test
+ public void testSimpleInsertSequential() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<String> recordKeys = setupMapWithRecords(rocksDBBasedMap, 100);
+
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ List<HoodieRecord> oRecords = new ArrayList<>();
+ while (itr.hasNext()) {
+ HoodieRecord<? extends HoodieRecordPayload> rec = itr.next();
+ oRecords.add(rec);
+ assert recordKeys.contains(rec.getRecordKey());
+ }
+ assertEquals(recordKeys.size(), oRecords.size());
+ }
+
+ @Test
+ public void testSimpleInsertRandomAccess() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<String> recordKeys = setupMapWithRecords(rocksDBBasedMap, 100);
+
+ Random random = new Random();
+ for (int i = 0; i < recordKeys.size(); i++) {
+ String key = recordKeys.get(random.nextInt(recordKeys.size()));
+ assert rocksDBBasedMap.get(key) != null;
+ }
+ }
+
+ @Test
+ public void testSimpleInsertWithoutHoodieMetadata() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<HoodieRecord> hoodieRecords =
SchemaTestUtil.generateHoodieTestRecordsWithoutHoodieMetadata(0, 1000);
+ Set<String> recordKeys = new HashSet<>();
+ // insert generated records into the map
+ hoodieRecords.forEach(r -> {
+ rocksDBBasedMap.put(r.getRecordKey(), r);
+ recordKeys.add(r.getRecordKey());
+ });
+ // make sure records have spilled to disk
+ assertTrue(rocksDBBasedMap.sizeOfFileOnDiskInBytes() > 0);
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ List<HoodieRecord> oRecords = new ArrayList<>();
Review comment:
same here.
##########
File path:
hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDbDiskMap.java
##########
@@ -0,0 +1,196 @@
+/*
+ * 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 org.apache.avro.Schema;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.IndexedRecord;
+
+import org.apache.hudi.avro.HoodieAvroUtils;
+import org.apache.hudi.common.model.HoodieAvroPayload;
+import org.apache.hudi.common.model.HoodieKey;
+import org.apache.hudi.common.model.HoodieRecord;
+import org.apache.hudi.common.model.HoodieRecordPayload;
+import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.testutils.SchemaTestUtil;
+import org.apache.hudi.common.testutils.SpillableMapTestUtils;
+import org.apache.hudi.common.util.Option;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import static org.apache.hudi.common.testutils.SchemaTestUtil.getSimpleSchema;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test the rocksDb based Map {@link RocksDbDiskMap}
+ * that is used by {@link ExternalSpillableMap}.
+ */
+public class TestRocksDbDiskMap extends HoodieCommonTestHarness {
+
+ @BeforeEach
+ public void setUp() {
+ initPath();
+ }
+
+ @Test
+ public void testSimpleInsertSequential() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<String> recordKeys = setupMapWithRecords(rocksDBBasedMap, 100);
+
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ List<HoodieRecord> oRecords = new ArrayList<>();
Review comment:
do we really need a list. just a counter to track size would suffice
right?
##########
File path:
hudi-common/src/test/java/org/apache/hudi/common/util/collection/TestRocksDbDiskMap.java
##########
@@ -0,0 +1,196 @@
+/*
+ * 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 org.apache.avro.Schema;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.IndexedRecord;
+
+import org.apache.hudi.avro.HoodieAvroUtils;
+import org.apache.hudi.common.model.HoodieAvroPayload;
+import org.apache.hudi.common.model.HoodieKey;
+import org.apache.hudi.common.model.HoodieRecord;
+import org.apache.hudi.common.model.HoodieRecordPayload;
+import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.testutils.SchemaTestUtil;
+import org.apache.hudi.common.testutils.SpillableMapTestUtils;
+import org.apache.hudi.common.util.Option;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import static org.apache.hudi.common.testutils.SchemaTestUtil.getSimpleSchema;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test the rocksDb based Map {@link RocksDbDiskMap}
+ * that is used by {@link ExternalSpillableMap}.
+ */
+public class TestRocksDbDiskMap extends HoodieCommonTestHarness {
+
+ @BeforeEach
+ public void setUp() {
+ initPath();
+ }
+
+ @Test
+ public void testSimpleInsertSequential() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<String> recordKeys = setupMapWithRecords(rocksDBBasedMap, 100);
+
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ List<HoodieRecord> oRecords = new ArrayList<>();
+ while (itr.hasNext()) {
+ HoodieRecord<? extends HoodieRecordPayload> rec = itr.next();
+ oRecords.add(rec);
+ assert recordKeys.contains(rec.getRecordKey());
+ }
+ assertEquals(recordKeys.size(), oRecords.size());
+ }
+
+ @Test
+ public void testSimpleInsertRandomAccess() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<String> recordKeys = setupMapWithRecords(rocksDBBasedMap, 100);
+
+ Random random = new Random();
+ for (int i = 0; i < recordKeys.size(); i++) {
+ String key = recordKeys.get(random.nextInt(recordKeys.size()));
+ assert rocksDBBasedMap.get(key) != null;
+ }
+ }
+
+ @Test
+ public void testSimpleInsertWithoutHoodieMetadata() throws IOException,
URISyntaxException {
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<HoodieRecord> hoodieRecords =
SchemaTestUtil.generateHoodieTestRecordsWithoutHoodieMetadata(0, 1000);
+ Set<String> recordKeys = new HashSet<>();
+ // insert generated records into the map
+ hoodieRecords.forEach(r -> {
+ rocksDBBasedMap.put(r.getRecordKey(), r);
+ recordKeys.add(r.getRecordKey());
+ });
+ // make sure records have spilled to disk
+ assertTrue(rocksDBBasedMap.sizeOfFileOnDiskInBytes() > 0);
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ List<HoodieRecord> oRecords = new ArrayList<>();
+ while (itr.hasNext()) {
+ HoodieRecord<? extends HoodieRecordPayload> rec = itr.next();
+ oRecords.add(rec);
+ assert recordKeys.contains(rec.getRecordKey());
+ }
+ }
+
+ @Test
+ public void testSimpleUpsert() throws IOException, URISyntaxException {
+ Schema schema = HoodieAvroUtils.addMetadataFields(getSimpleSchema());
+
+ RocksDbDiskMap rocksDBBasedMap = new RocksDbDiskMap<>(basePath);
+ List<IndexedRecord> insertedRecords =
SchemaTestUtil.generateHoodieTestRecords(0, 100);
+ List<String> recordKeys =
SpillableMapTestUtils.upsertRecords(insertedRecords, rocksDBBasedMap);
+ String oldCommitTime =
+ ((GenericRecord)
insertedRecords.get(0)).get(HoodieRecord.COMMIT_TIME_METADATA_FIELD).toString();
+
+ // generate updates from inserts for first 50 keys / subset of keys
+ List<IndexedRecord> updatedRecords =
SchemaTestUtil.updateHoodieTestRecords(recordKeys.subList(0, 50),
+ SchemaTestUtil.generateHoodieTestRecords(0, 50),
HoodieActiveTimeline.createNewInstantTime());
+ String newCommitTime =
+ ((GenericRecord)
updatedRecords.get(0)).get(HoodieRecord.COMMIT_TIME_METADATA_FIELD).toString();
+
+ // perform upserts
+ List<String> updatedRecordKeys =
SpillableMapTestUtils.upsertRecords(updatedRecords, rocksDBBasedMap);
+
+ // Upserted records (on disk) should have the latest commit time
+ Iterator<HoodieRecord<? extends HoodieRecordPayload>> itr =
rocksDBBasedMap.iterator();
+ while (itr.hasNext()) {
+ HoodieRecord<? extends HoodieRecordPayload> rec = itr.next();
+ try {
+ IndexedRecord indexedRecord = (IndexedRecord)
rec.getData().getInsertValue(schema).get();
+ String latestCommitTime =
+ ((GenericRecord)
indexedRecord).get(HoodieRecord.COMMIT_TIME_METADATA_FIELD).toString();
+ assert recordKeys.contains(rec.getRecordKey()) ||
updatedRecordKeys.contains(rec.getRecordKey());
+ if (updatedRecordKeys.contains(rec.getRecordKey())) {
Review comment:
we can probably fold this into 1 line.
```
assertEquals(latestCommitTime,
updatedRecordKeys.contains(rec.getRecordKey()) ? newCommittime : oldCommitTime
);
```
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/util/collection/DiskMap.java
##########
@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * This interface provides the map interface for storing records in disk after
they
+ * spill over from memory. Used by {@link ExternalSpillableMap}.
+ *
+ * @param <T> The generic type of the keys
+ * @param <R> The generic type of the values
+ */
+public interface DiskMap<T extends Serializable, R extends Serializable>
extends Map<T, R>, Iterable<R> {
+
+ /**
+ * @returns a stream of the values stored in the disk.
+ */
+ Stream<R> valueStream();
+
+ /**
+ * Number of bytes spilled to disk.
+ */
+ long sizeOfFileOnDiskInBytes();
+
+ /**
+ * Cleanup.
+ */
+ void close();
+
+}
Review comment:
guess you need to return carriage here.
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/util/collection/RocksDbDiskMap.java
##########
@@ -0,0 +1,173 @@
+/*
+ * 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 org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.exception.HoodieNotSupportedException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+ * This class provides a disk spillable only map implementation.
+ * All of the data is stored using the RocksDB implementation.
+ */
+public final class RocksDbDiskMap<T extends Serializable, R extends
Serializable> implements DiskMap<T, R> {
+ // ColumnFamily allows partitioning data within RockDB, which allows
+ // independent configuration and faster deletes across partitions
+ // https://github.com/facebook/rocksdb/wiki/Column-Families
+ // For this use case, we use a single static column family/ partition
+ //
+ private static final String COLUMN_FAMILY_NAME = "spill_map";
+
+ private static final Logger LOG = LogManager.getLogger(RocksDbDiskMap.class);
+ // Stores the key and corresponding value's latest metadata spilled to disk
+ private final Set<T> keySet;
+ private final String rocksDbStoragePath;
+ private RocksDBDAO rocksDb;
+
+ public RocksDbDiskMap(String rocksDbStoragePath) throws IOException {
+ this.keySet = new HashSet<>();
+ this.rocksDbStoragePath = rocksDbStoragePath;
+ }
+
+ @Override
+ public int size() {
+ return keySet.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return keySet.isEmpty();
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ return keySet.contains((T) key);
+ }
+
+ @Override
+ public boolean containsValue(Object value) {
+ throw new HoodieNotSupportedException("unable to compare values in map");
+ }
+
+ @Override
+ public R get(Object key) {
+ if (!containsKey(key)) {
+ return null;
+ }
+ return getRocksDb().get(COLUMN_FAMILY_NAME, (T) key);
+ }
+
+ @Override
+ public R put(T key, R value) {
+ getRocksDb().put(COLUMN_FAMILY_NAME, key, value);
+ keySet.add(key);
+ return value;
+ }
+
+ @Override
+ public R remove(Object key) {
+ R value = get(key);
+ if (value != null) {
+ keySet.remove((T) key);
+ getRocksDb().delete(COLUMN_FAMILY_NAME, (T) key);
+ }
+ return value;
+ }
+
+ @Override
+ public void putAll(Map<? extends T, ? extends R> keyValues) {
+ getRocksDb().writeBatch(batch -> keyValues.forEach((key, value) ->
getRocksDb().putInBatch(batch, COLUMN_FAMILY_NAME, key, value)));
+ keySet.addAll(keyValues.keySet());
+ }
+
+ @Override
+ public void clear() {
+ close();
+ }
+
+ @Override
+ public Set<T> keySet() {
+ return keySet;
+ }
+
+ @Override
+ public Collection<R> values() {
+ throw new HoodieException("Unsupported Operation Exception");
+ }
+
+ @Override
+ public Set<Entry<T, R>> entrySet() {
+ Set<Entry<T, R>> entrySet = new HashSet<>();
+ for (T key : keySet) {
+ entrySet.add(new AbstractMap.SimpleEntry<>(key, get(key)));
+ }
+ return entrySet;
+ }
+
+ /**
+ * Custom iterator to iterate over values written to disk.
+ */
+ @Override
+ public Iterator<R> iterator() {
+ return getRocksDb().iterator(COLUMN_FAMILY_NAME);
+ }
+
+ @Override
+ public Stream<R> valueStream() {
+ return keySet.stream().map(key -> (R) get(key));
Review comment:
what are the usages of this valueStream?
Guess this could be too much of an optimization. anyways let me know if my
understanding is right. not too strong on the suggestion though.
keySet.stream() may not give items in the same order as rocksDb has stored.
So, may be this could result in lot of seeks while fetching from rocksDb.
Instead, can't we go with rocksDb iterator itself and populate all values.
--
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-unsubscr...@hudi.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Implement RockDbBasedMap as an alternate to DiskBasedMap in SpillableMap
> ------------------------------------------------------------------------
>
> Key: HUDI-2028
> URL: https://issues.apache.org/jira/browse/HUDI-2028
> Project: Apache Hudi
> Issue Type: Improvement
> Components: Performance
> Reporter: Rajesh Mahindra
> Assignee: Rajesh Mahindra
> Priority: Major
> Labels: pull-request-available
>
> Implement RockDbBasedMap as an alternate to DiskBasedMap in SpillableMap
>
> RockDb can improve perf due to native code and very efficient compression.
>
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
