Return-Path: <commits-return-2644-archive-asf-public=cust-asf.ponee.io@asterixdb.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 58AED200B6B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 25 Aug 2016 22:00:10 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 573FF160AC6; Thu, 25 Aug 2016 20:00:10 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 9F3A4160AA4
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 25 Aug 2016 22:00:09 +0200 (CEST)
Received: (qmail 77157 invoked by uid 500); 25 Aug 2016 20:00:08 -0000
Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@asterixdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@asterixdb.apache.org>
List-Post: <mailto:commits@asterixdb.apache.org>
List-Id: <commits.asterixdb.apache.org>
Reply-To: dev@asterixdb.apache.org
Delivered-To: mailing list commits@asterixdb.apache.org
Received: (qmail 77123 invoked by uid 99); 25 Aug 2016 20:00:08 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 20:00:08 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 97F34E0A3F; Thu, 25 Aug 2016 20:00:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: wangsaeu@apache.org
To: commits@asterixdb.apache.org
Date: Thu, 25 Aug 2016 20:00:08 -0000
Message-Id: <4c3844b6e44a43fe9103fe1dcfeb1a41@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/4] asterixdb git commit: ASTERIXDB-1186: fixed a composite primary
 index search issue.
archived-at: Thu, 25 Aug 2016 20:00:10 -0000

Repository: asterixdb
Updated Branches:
  refs/heads/master fdc71eb74 -> 52a9d992d


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/52a9d992/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
index c951c62..fc3acc8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
@@ -36,3 +36,20 @@ Where
       LiteralExpr [STRING] [TwitterData]
     ]
   ]
+Orderby
+  FieldAccessor [
+    Variable [ Name=$l ]
+    Field=DataverseName
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$l ]
+    Field=DatasetName
+  ]
+  ASC
+  FieldAccessor [
+    Variable [ Name=$l ]
+    Field=DatatypeDataverseName
+  ]
+  ASC
+

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/52a9d992/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index e5710bc..bf1893a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -2739,6 +2739,11 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="index-selection">
+      <compilation-unit name="btree-index-composite-key-02">
+        <output-dir compare="Text">btree-index-composite-key-02</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="index-selection">
       <compilation-unit name="btree-index-composite-key-mixed-intervals">
         <output-dir compare="Text">btree-index-composite-key-mixed-intervals</output-dir>
       </compilation-unit>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/52a9d992/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
index 863dece..2751228 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
@@ -32,11 +32,11 @@ public class AqlIndex implements IDataSourceIndex<String, AqlSourceId> {
 
     // Every transactions needs to work with its own instance of an
     // AqlMetadataProvider.
-    public AqlIndex(Index index, String dataverse, String dataset, AqlMetadataProvider metadatProvider) {
+    public AqlIndex(Index index, String dataverse, String dataset, AqlMetadataProvider metadataProvider) {
         this.index = index;
         this.dataset = dataset;
         this.dataverse = dataverse;
-        this.metadataProvider = metadatProvider;
+        this.metadataProvider = metadataProvider;
     }
 
     // TODO: Maybe Index can directly implement IDataSourceIndex<String, AqlSourceId>
@@ -55,4 +55,7 @@ public class AqlIndex implements IDataSourceIndex<String, AqlSourceId> {
         return index.getIndexName();
     }
 
+    public Index getIndex() {
+        return index;
+    }
 }