>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21077?usp=email )
Change subject: Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
......................................................................
Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
* [ASTERIXDB-3716]: Make DATATYPE_PAYLOAD_TUPLE_FIELD_INDEX public to allow
extensibility (MB-70734)
Change-Id: Id944ab9b2140502249cabb337b6e97197f2a21eb
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/77/21077/1
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
index 1052a37..186f91a 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
@@ -49,12 +49,9 @@
*/
public class DatatypeTupleTranslator extends
AbstractDatatypeTupleTranslator<Datatype> {
-<<<<<<< HEAD (0452b4 [ASTERIXDB-3634][EXT]: Fix error messages)
- private final DatatypeEntity datatypeEntity;
-=======
// Payload field containing serialized Datatype.
public static final int DATATYPE_PAYLOAD_TUPLE_FIELD_INDEX = 2;
->>>>>>> BRANCH (f6c93e Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
+ private final DatatypeEntity datatypeEntity;
protected DatatypeTupleTranslator(TxnId txnId, MetadataNode metadataNode,
boolean getTuple,
DatatypeEntity datatypeEntity) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21077?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: lumina
Gerrit-Change-Id: Id944ab9b2140502249cabb337b6e97197f2a21eb
Gerrit-Change-Number: 21077
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
