commit ddc760f59b906e3124a5da7d73fa7d3575fd79b1
author Steven Glenn Jacobs <sjaco002@ucr.edu> Wed Aug 17 15:15:05 2016 -0700
committer Steven Jacobs <sjaco002@ucr.edu> Wed Aug 17 18:04:33 2016 -0700
tree e6349f26c1d40734cb3e4082e96b5423c158b621
parent d015b566fba1cc1048cb045791357ceb30bfbbd7

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 <prestonc@apache.org>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java

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();