Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Steven Jacobs (Code Review)
Steven Jacobs has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1085

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
---
M 
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/85/1085/1

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: newchange
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 


Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2268/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Preston Carman 
Gerrit-HasComments: No


Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Preston Carman (Code Review)
Preston Carman has posted comments on this change.

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


Patch Set 1: Code-Review+2

Change looks good. Just confirm the tests pass.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Preston Carman 
Gerrit-HasComments: No


Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

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


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/353/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Preston Carman 
Gerrit-HasComments: No


Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

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


Patch Set 1: Integration-Tests-1

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/353/ : 
UNSTABLE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iccf04c2210a1535cd7de6eeea88dfefec9ba206a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Preston Carman 
Gerrit-HasComments: No


Change in asterixdb[master]: ASTERIXDB-1587 Made upsert look in the correct dataverse for...

2016-08-17 Thread Steven Jacobs (Code Review)
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 
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
---
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 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Preston Carman 
Gerrit-Reviewer: Steven Jacobs