Steven Jacobs has submitted this change and it was merged.

Change subject: ASTERIXDB-1587 Made upsert look in the correct dataverse for 
datatypes
......................................................................


ASTERIXDB-1587 Made upsert look in the correct dataverse for datatypes

Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1085
Reviewed-by: Preston Carman <[email protected]>
Sonar-Qube: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
---
M 
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jenkins: Verified; No violations found
  Preston Carman: Looks good to me, approved

Objections:
  Jenkins: Fails



diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
index a5e5cda..679379b 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
@@ -2310,8 +2310,9 @@
             String indexName = primaryIndex.getIndexName();
 
             String itemTypeName = dataset.getItemTypeName();
+            String itemTypeDataverseName = dataset.getItemTypeDataverseName();
             ARecordType itemType = (ARecordType) MetadataManager.INSTANCE
-                    .getDatatype(mdTxnCtx, 
dataSource.getId().getDataverseName(), itemTypeName).getDatatype();
+                    .getDatatype(mdTxnCtx, itemTypeDataverseName, 
itemTypeName).getDatatype();
             ARecordType metaItemType = DatasetUtils.getMetaType(this, dataset);
             ITypeTraits[] typeTraits = 
DatasetUtils.computeTupleTypeTraits(dataset, itemType, metaItemType);
             IAsterixApplicationContextInfo appContext = 
(IAsterixApplicationContextInfo) context.getAppContext();

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1085
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Preston Carman <[email protected]>
Gerrit-Reviewer: Steven Jacobs <[email protected]>

Reply via email to