>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
8 files changed, 15 insertions(+), 45 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 8317025..0eb1111 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -164,22 +164,15 @@
import
org.apache.asterix.transaction.management.opcallbacks.UpsertOperationCallback;
import
org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
-=======
-import org.apache.hyracks.algebricks.common.utils.Triple;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
import org.apache.hyracks.api.util.HyracksConstants;
-=======
import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -3076,7 +3069,6 @@
return txnIdFactory;
}
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private Database defaultDatabase(String databaseName) {
//TODO(DB): review
if (MetadataConstants.SYSTEM_DATABASE.equals(databaseName)) {
@@ -3084,7 +3076,8 @@
} else {
return MetadataBuiltinEntities.DEFAULT_DATABASE;
}
-=======
+ }
+
private ArrayNode getJsonNodes(TxnId txnId, IMetadataIndex mdIndex, int
payloadPosition)
throws AlgebricksException, HyracksDataException {
IValueExtractor<JsonNode> valueExtractor =
createValueExtractor(mdIndex, payloadPosition);
@@ -3123,6 +3116,5 @@
}
}
};
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
}
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
index 37a7ea8..7613dd3 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
@@ -89,13 +89,7 @@
*/
public class DatasetTupleTranslator extends AbstractTupleTranslator<Dataset> {
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
protected final DatasetEntity datasetEntity;
-=======
- // Payload field containing serialized Dataset.
- public static final int DATASET_PAYLOAD_TUPLE_FIELD_INDEX = 2;
-
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
protected AMutableInt32 aInt32;
protected AMutableInt64 aInt64;
protected AMutableDouble aDouble;
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
index 006bc3c..42fcfbb 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
@@ -38,13 +38,8 @@
*/
public class DataverseTupleTranslator extends
AbstractTupleTranslator<Dataverse> {
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private final DataverseEntity dataverseEntity;
private AMutableInt32 aInt32;
-=======
- // Payload field containing serialized Dataverse.
- public static final int DATAVERSE_PAYLOAD_TUPLE_FIELD_INDEX = 1;
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
protected DataverseTupleTranslator(boolean getTuple, DataverseEntity
dataverseEntity) {
super(getTuple, dataverseEntity.getIndex(),
dataverseEntity.payloadPosition());
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
index 35b4f0a..8191212 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
@@ -84,13 +84,7 @@
*/
public class FunctionTupleTranslator extends
AbstractDatatypeTupleTranslator<Function> {
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private final FunctionEntity functionEntity;
-=======
- // Payload field containing serialized Function.
- public static final int FUNCTION_PAYLOAD_TUPLE_FIELD_INDEX = 3;
-
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
protected OrderedListBuilder dependenciesListBuilder;
protected OrderedListBuilder dependencyListBuilder;
protected OrderedListBuilder dependencyNameListBuilder;
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
index 4f6c59a..453ccc1 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
@@ -83,13 +83,7 @@
*/
public class IndexTupleTranslator extends AbstractTupleTranslator<Index> {
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private final IndexEntity indexEntity;
-=======
- // Payload field containing serialized Index.
- public static final int INDEX_PAYLOAD_TUPLE_FIELD_INDEX = 3;
-
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
// Field name of open field.
public static final String GRAM_LENGTH_FIELD_NAME = "GramLength";
public static final String FULL_TEXT_CONFIG_FIELD_NAME = "FullTextConfig";
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
index c7d48ce..534a692 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
@@ -43,12 +43,7 @@
*/
public class LibraryTupleTranslator extends AbstractTupleTranslator<Library> {
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private final LibraryEntity libraryEntity;
-=======
- // Payload field containing serialized Library.
- public static final int LIBRARY_PAYLOAD_TUPLE_FIELD_INDEX = 2;
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
protected LibraryTupleTranslator(boolean getTuple, LibraryEntity
libraryEntity) {
super(getTuple, libraryEntity.getIndex(),
libraryEntity.payloadPosition());
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
index 4259254..bb3ad28 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
@@ -37,16 +37,9 @@
private final SynonymEntity synonymEntity;
-<<<<<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
protected SynonymTupleTranslator(boolean getTuple, SynonymEntity
synonymEntity) {
super(getTuple, synonymEntity.getIndex(),
synonymEntity.payloadPosition());
this.synonymEntity = synonymEntity;
-=======
- public static final int SYNONYM_PAYLOAD_TUPLE_FIELD_INDEX = 2;
-
- protected SynonymTupleTranslator(boolean getTuple) {
- super(getTuple, MetadataPrimaryIndexes.SYNONYM_DATASET,
SYNONYM_PAYLOAD_TUPLE_FIELD_INDEX);
->>>>>>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
}
@Override
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c
Gerrit-Change-Number: 18083
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
