You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by sj...@apache.org on 2016/08/18 01:05:03 UTC
asterixdb git commit: ASTERIXDB-1587 Made upsert look in the correct
dataverse for datatypes
Repository: asterixdb
Updated Branches:
refs/heads/master d015b566f -> ddc760f59
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 <pr...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/ddc760f5
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ddc760f5
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ddc760f5
Branch: refs/heads/master
Commit: ddc760f59b906e3124a5da7d73fa7d3575fd79b1
Parents: d015b56
Author: Steven Glenn Jacobs <sj...@ucr.edu>
Authored: Wed Aug 17 15:15:05 2016 -0700
Committer: Steven Jacobs <sj...@ucr.edu>
Committed: Wed Aug 17 18:04:33 2016 -0700
----------------------------------------------------------------------
.../org/apache/asterix/metadata/declared/AqlMetadataProvider.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ddc760f5/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 @@ public class AqlMetadataProvider implements IMetadataProvider<AqlSourceId, Strin
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();