>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20468?usp=email )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/phoenix'
* [NO ISSUE][*DB][EXT] Make IDataParser extend Closeable, misc (MB-68827)
* [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS (MB-68683)
Ext-ref: MB-68827,MB-68683
Change-Id: I49f69c95163d54b4c199f234291047fd01c27775
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IRecordConverter.java
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
3 files changed, 8 insertions(+), 20 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/68/20468/1
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IRecordConverter.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IRecordConverter.java
index cb40058..317fa6d 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IRecordConverter.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IRecordConverter.java
@@ -22,24 +22,10 @@
import java.io.IOException;
@FunctionalInterface
-<<<<<<< HEAD (b9d299 [NO ISSUE]: Refactor AWS common properties)
-public interface IRecordConverter<I, O> {
- O convert(IRawRecord<? extends I> input) throws IOException;
-=======
public interface IRecordConverter<I, O> extends Closeable {
-
O convert(IRawRecord<? extends I> input) throws IOException;
- /**
- * Configures the converter with information suppliers from the {@link
IRecordReader} data source.
- *
- * @param lineNumber line number supplier
- */
- default void configure(LongSupplier lineNumber) {
- }
-
default void close() {
// default no-op
}
->>>>>>> BRANCH (48509e [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS)
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index b5eabc8..f7cfc50 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -19,14 +19,11 @@
package org.apache.hyracks.storage.am.lsm.common.impls;
-<<<<<<< HEAD (b9d299 [NO ISSUE]: Refactor AWS common properties)
import static
org.apache.hyracks.util.ExitUtil.EC_INCONSISTENT_STORAGE_REFERENCES;
-=======
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
->>>>>>> BRANCH (48509e [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS)
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -593,10 +590,10 @@
}
private static String threadName(ILSMIOOperation operation) {
- if (operation.getIOOpertionType() == LSMIOOperationType.NOOP) {
- return String.valueOf(operation.getIOOpertionType());
+ if (operation.getIOOperationType() == LSMIOOperationType.NOOP) {
+ return String.valueOf(operation.getIOOperationType());
}
- return operation.getIOOpertionType() + ":" +
operation.getTarget().getRelativePath() + "@"
+ return operation.getIOOperationType() + ":" +
operation.getTarget().getRelativePath() + "@"
+ OP_THREAD_TIMESTAMP.format(ZonedDateTime.now());
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20468?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I49f69c95163d54b4c199f234291047fd01c27775
Gerrit-Change-Number: 20468
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
