[HUDI-232] Implement sealing/unsealing for HoodieRecord class (#938)
This commit is contained in:
@@ -132,7 +132,9 @@ public class InMemoryHashIndex<T extends HoodieRecordPayload> extends HoodieInde
|
|||||||
while (hoodieRecordIterator.hasNext()) {
|
while (hoodieRecordIterator.hasNext()) {
|
||||||
HoodieRecord<T> rec = hoodieRecordIterator.next();
|
HoodieRecord<T> rec = hoodieRecordIterator.next();
|
||||||
if (recordLocationMap.containsKey(rec.getKey())) {
|
if (recordLocationMap.containsKey(rec.getKey())) {
|
||||||
|
rec.unseal();
|
||||||
rec.setCurrentLocation(recordLocationMap.get(rec.getKey()));
|
rec.setCurrentLocation(recordLocationMap.get(rec.getKey()));
|
||||||
|
rec.seal();
|
||||||
}
|
}
|
||||||
taggedRecords.add(rec);
|
taggedRecords.add(rec);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -371,7 +371,9 @@ public class HoodieBloomIndex<T extends HoodieRecordPayload> extends HoodieIndex
|
|||||||
// currentLocation 2 times and it will fail the second time. So creating a new in memory
|
// currentLocation 2 times and it will fail the second time. So creating a new in memory
|
||||||
// copy of the hoodie record.
|
// copy of the hoodie record.
|
||||||
record = new HoodieRecord<>(inputRecord);
|
record = new HoodieRecord<>(inputRecord);
|
||||||
|
record.unseal();
|
||||||
record.setCurrentLocation(location.get());
|
record.setCurrentLocation(location.get());
|
||||||
|
record.seal();
|
||||||
}
|
}
|
||||||
return record;
|
return record;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -239,7 +239,9 @@ public class HBaseIndex<T extends HoodieRecordPayload> extends HoodieIndex<T> {
|
|||||||
currentRecord = new HoodieRecord(
|
currentRecord = new HoodieRecord(
|
||||||
new HoodieKey(currentRecord.getRecordKey(), partitionPath),
|
new HoodieKey(currentRecord.getRecordKey(), partitionPath),
|
||||||
currentRecord.getData());
|
currentRecord.getData());
|
||||||
|
currentRecord.unseal();
|
||||||
currentRecord.setCurrentLocation(new HoodieRecordLocation(commitTs, fileId));
|
currentRecord.setCurrentLocation(new HoodieRecordLocation(commitTs, fileId));
|
||||||
|
currentRecord.seal();
|
||||||
taggedRecords.add(currentRecord);
|
taggedRecords.add(currentRecord);
|
||||||
// the key from Result and the key being processed should be same
|
// the key from Result and the key being processed should be same
|
||||||
assert (currentRecord.getRecordKey().contentEquals(keyFromResult));
|
assert (currentRecord.getRecordKey().contentEquals(keyFromResult));
|
||||||
|
|||||||
@@ -293,7 +293,9 @@ public class HoodieAppendHandle<T extends HoodieRecordPayload> extends HoodieWri
|
|||||||
|
|
||||||
private void writeToBuffer(HoodieRecord<T> record) {
|
private void writeToBuffer(HoodieRecord<T> record) {
|
||||||
// update the new location of the record, so we know where to find it next
|
// update the new location of the record, so we know where to find it next
|
||||||
|
record.unseal();
|
||||||
record.setNewLocation(new HoodieRecordLocation(instantTime, fileId));
|
record.setNewLocation(new HoodieRecordLocation(instantTime, fileId));
|
||||||
|
record.seal();
|
||||||
Option<IndexedRecord> indexedRecord = getIndexedRecord(record);
|
Option<IndexedRecord> indexedRecord = getIndexedRecord(record);
|
||||||
if (indexedRecord.isPresent()) {
|
if (indexedRecord.isPresent()) {
|
||||||
recordList.add(indexedRecord.get());
|
recordList.add(indexedRecord.get());
|
||||||
|
|||||||
@@ -101,7 +101,9 @@ public class HoodieCreateHandle<T extends HoodieRecordPayload> extends HoodieWri
|
|||||||
IndexedRecord recordWithMetadataInSchema = rewriteRecord((GenericRecord) avroRecord.get());
|
IndexedRecord recordWithMetadataInSchema = rewriteRecord((GenericRecord) avroRecord.get());
|
||||||
storageWriter.writeAvroWithMetadata(recordWithMetadataInSchema, record);
|
storageWriter.writeAvroWithMetadata(recordWithMetadataInSchema, record);
|
||||||
// update the new location of record, so we know where to find it next
|
// update the new location of record, so we know where to find it next
|
||||||
|
record.unseal();
|
||||||
record.setNewLocation(new HoodieRecordLocation(instantTime, writeStatus.getFileId()));
|
record.setNewLocation(new HoodieRecordLocation(instantTime, writeStatus.getFileId()));
|
||||||
|
record.seal();
|
||||||
recordsWritten++;
|
recordsWritten++;
|
||||||
insertRecordsWritten++;
|
insertRecordsWritten++;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -208,7 +208,9 @@ public class HoodieMergeHandle<T extends HoodieRecordPayload> extends HoodieWrit
|
|||||||
HoodieRecord<T> record = newRecordsItr.next();
|
HoodieRecord<T> record = newRecordsItr.next();
|
||||||
partitionPath = record.getPartitionPath();
|
partitionPath = record.getPartitionPath();
|
||||||
// update the new location of the record, so we know where to find it next
|
// update the new location of the record, so we know where to find it next
|
||||||
|
record.unseal();
|
||||||
record.setNewLocation(new HoodieRecordLocation(instantTime, fileId));
|
record.setNewLocation(new HoodieRecordLocation(instantTime, fileId));
|
||||||
|
record.seal();
|
||||||
//NOTE: Once Records are added to map (spillable-map), DO NOT change it as they won't persist
|
//NOTE: Once Records are added to map (spillable-map), DO NOT change it as they won't persist
|
||||||
keyToNewRecords.put(record.getRecordKey(), record);
|
keyToNewRecords.put(record.getRecordKey(), record);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,7 +113,9 @@ public class TestUpdateMapFunction extends HoodieClientTestHarness {
|
|||||||
TestRawTripPayload rowChange1 = new TestRawTripPayload(recordStr1);
|
TestRawTripPayload rowChange1 = new TestRawTripPayload(recordStr1);
|
||||||
HoodieRecord record1 = new HoodieRecord(new HoodieKey(rowChange1.getRowKey(), rowChange1.getPartitionPath()),
|
HoodieRecord record1 = new HoodieRecord(new HoodieKey(rowChange1.getRowKey(), rowChange1.getPartitionPath()),
|
||||||
rowChange1);
|
rowChange1);
|
||||||
|
record1.unseal();
|
||||||
record1.setCurrentLocation(new HoodieRecordLocation("100", fileId));
|
record1.setCurrentLocation(new HoodieRecordLocation("100", fileId));
|
||||||
|
record1.seal();
|
||||||
updateRecords.add(record1);
|
updateRecords.add(record1);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -192,7 +192,9 @@ public class TestCopyOnWriteTable extends HoodieClientTestHarness {
|
|||||||
TestRawTripPayload updateRowChanges1 = new TestRawTripPayload(updateRecordStr1);
|
TestRawTripPayload updateRowChanges1 = new TestRawTripPayload(updateRecordStr1);
|
||||||
HoodieRecord updatedRecord1 = new HoodieRecord(
|
HoodieRecord updatedRecord1 = new HoodieRecord(
|
||||||
new HoodieKey(updateRowChanges1.getRowKey(), updateRowChanges1.getPartitionPath()), updateRowChanges1);
|
new HoodieKey(updateRowChanges1.getRowKey(), updateRowChanges1.getPartitionPath()), updateRowChanges1);
|
||||||
|
updatedRecord1.unseal();
|
||||||
updatedRecord1.setCurrentLocation(new HoodieRecordLocation(null, FSUtils.getFileId(parquetFile.getName())));
|
updatedRecord1.setCurrentLocation(new HoodieRecordLocation(null, FSUtils.getFileId(parquetFile.getName())));
|
||||||
|
updatedRecord1.seal();
|
||||||
|
|
||||||
TestRawTripPayload rowChange4 = new TestRawTripPayload(recordStr4);
|
TestRawTripPayload rowChange4 = new TestRawTripPayload(recordStr4);
|
||||||
HoodieRecord insertedRecord1 = new HoodieRecord(
|
HoodieRecord insertedRecord1 = new HoodieRecord(
|
||||||
@@ -407,7 +409,9 @@ public class TestCopyOnWriteTable extends HoodieClientTestHarness {
|
|||||||
List<HoodieRecord> insertRecords = dataGenerator.generateInserts("001", numInserts);
|
List<HoodieRecord> insertRecords = dataGenerator.generateInserts("001", numInserts);
|
||||||
List<HoodieRecord> updateRecords = dataGenerator.generateUpdates("001", numUpdates);
|
List<HoodieRecord> updateRecords = dataGenerator.generateUpdates("001", numUpdates);
|
||||||
for (HoodieRecord updateRec : updateRecords) {
|
for (HoodieRecord updateRec : updateRecords) {
|
||||||
|
updateRec.unseal();
|
||||||
updateRec.setCurrentLocation(new HoodieRecordLocation("001", "file1"));
|
updateRec.setCurrentLocation(new HoodieRecordLocation("001", "file1"));
|
||||||
|
updateRec.seal();
|
||||||
}
|
}
|
||||||
List<HoodieRecord> records = new ArrayList<>();
|
List<HoodieRecord> records = new ArrayList<>();
|
||||||
records.addAll(insertRecords);
|
records.addAll(insertRecords);
|
||||||
|
|||||||
@@ -63,17 +63,24 @@ public class HoodieRecord<T extends HoodieRecordPayload> implements Serializable
|
|||||||
*/
|
*/
|
||||||
private HoodieRecordLocation newLocation;
|
private HoodieRecordLocation newLocation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates whether the object is sealed.
|
||||||
|
*/
|
||||||
|
private boolean sealed;
|
||||||
|
|
||||||
public HoodieRecord(HoodieKey key, T data) {
|
public HoodieRecord(HoodieKey key, T data) {
|
||||||
this.key = key;
|
this.key = key;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
this.currentLocation = null;
|
this.currentLocation = null;
|
||||||
this.newLocation = null;
|
this.newLocation = null;
|
||||||
|
this.sealed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HoodieRecord(HoodieRecord<T> record) {
|
public HoodieRecord(HoodieRecord<T> record) {
|
||||||
this(record.key, record.data);
|
this(record.key, record.data);
|
||||||
this.currentLocation = record.currentLocation;
|
this.currentLocation = record.currentLocation;
|
||||||
this.newLocation = record.newLocation;
|
this.newLocation = record.newLocation;
|
||||||
|
this.sealed = record.sealed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HoodieKey getKey() {
|
public HoodieKey getKey() {
|
||||||
@@ -100,6 +107,7 @@ public class HoodieRecord<T extends HoodieRecordPayload> implements Serializable
|
|||||||
* Sets the current currentLocation of the record. This should happen exactly-once
|
* Sets the current currentLocation of the record. This should happen exactly-once
|
||||||
*/
|
*/
|
||||||
public HoodieRecord setCurrentLocation(HoodieRecordLocation location) {
|
public HoodieRecord setCurrentLocation(HoodieRecordLocation location) {
|
||||||
|
checkState();
|
||||||
assert currentLocation == null;
|
assert currentLocation == null;
|
||||||
this.currentLocation = location;
|
this.currentLocation = location;
|
||||||
return this;
|
return this;
|
||||||
@@ -114,6 +122,7 @@ public class HoodieRecord<T extends HoodieRecordPayload> implements Serializable
|
|||||||
* exactly-once.
|
* exactly-once.
|
||||||
*/
|
*/
|
||||||
public HoodieRecord setNewLocation(HoodieRecordLocation location) {
|
public HoodieRecord setNewLocation(HoodieRecordLocation location) {
|
||||||
|
checkState();
|
||||||
assert newLocation == null;
|
assert newLocation == null;
|
||||||
this.newLocation = location;
|
this.newLocation = location;
|
||||||
return this;
|
return this;
|
||||||
@@ -170,4 +179,18 @@ public class HoodieRecord<T extends HoodieRecordPayload> implements Serializable
|
|||||||
assert key != null;
|
assert key != null;
|
||||||
return key.getRecordKey();
|
return key.getRecordKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void seal() {
|
||||||
|
this.sealed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void unseal() {
|
||||||
|
this.sealed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkState() {
|
||||||
|
if (sealed) {
|
||||||
|
throw new UnsupportedOperationException("Not allowed to modify after sealed");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* 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.model;
|
||||||
|
|
||||||
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import org.apache.avro.generic.GenericRecord;
|
||||||
|
import org.apache.avro.generic.IndexedRecord;
|
||||||
|
import org.apache.hudi.common.util.Option;
|
||||||
|
import org.apache.hudi.common.util.SchemaTestUtil;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link HoodieRecord}.
|
||||||
|
*/
|
||||||
|
public class TestHoodieRecord {
|
||||||
|
|
||||||
|
private HoodieRecord hoodieRecord;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
final List<IndexedRecord> indexedRecords = SchemaTestUtil.generateHoodieTestRecords(0, 1);
|
||||||
|
final List<HoodieRecord> hoodieRecords = indexedRecords.stream()
|
||||||
|
.map(r -> new HoodieRecord(new HoodieKey(UUID.randomUUID().toString(), "0000/00/00"),
|
||||||
|
new AvroBinaryTestPayload(Option.of((GenericRecord) r)))).collect(Collectors.toList());
|
||||||
|
hoodieRecord = hoodieRecords.get(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testModificationAfterSeal() {
|
||||||
|
hoodieRecord.seal();
|
||||||
|
final HoodieRecordLocation location = new HoodieRecordLocation("100", "0");
|
||||||
|
try {
|
||||||
|
hoodieRecord.setCurrentLocation(location);
|
||||||
|
fail("should fail since modification after sealed is not allowed");
|
||||||
|
} catch (Exception e) {
|
||||||
|
Assert.assertTrue(e instanceof UnsupportedOperationException);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNormalModification() {
|
||||||
|
hoodieRecord.unseal();
|
||||||
|
final HoodieRecordLocation location = new HoodieRecordLocation("100", "0");
|
||||||
|
hoodieRecord.setCurrentLocation(location);
|
||||||
|
hoodieRecord.seal();
|
||||||
|
|
||||||
|
hoodieRecord.unseal();
|
||||||
|
hoodieRecord.setNewLocation(location);
|
||||||
|
hoodieRecord.seal();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,7 +45,9 @@ public class SpillableMapTestUtils {
|
|||||||
recordKeys.add(key);
|
recordKeys.add(key);
|
||||||
HoodieRecord record = new HoodieRecord<>(new HoodieKey(key, partitionPath),
|
HoodieRecord record = new HoodieRecord<>(new HoodieKey(key, partitionPath),
|
||||||
new HoodieAvroPayload(Option.of((GenericRecord) r)));
|
new HoodieAvroPayload(Option.of((GenericRecord) r)));
|
||||||
|
record.unseal();
|
||||||
record.setCurrentLocation(new HoodieRecordLocation("DUMMY_COMMIT_TIME", "DUMMY_FILE_ID"));
|
record.setCurrentLocation(new HoodieRecordLocation("DUMMY_COMMIT_TIME", "DUMMY_FILE_ID"));
|
||||||
|
record.seal();
|
||||||
records.put(key, record);
|
records.put(key, record);
|
||||||
});
|
});
|
||||||
return recordKeys;
|
return recordKeys;
|
||||||
|
|||||||
Reference in New Issue
Block a user