From notifications-return-158049-archive-asf-public=cust-asf.ponee.io@asterixdb.apache.org Thu Jun 3 19:32:33 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 6870A180643 for ; Thu, 3 Jun 2021 21:32:33 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 51ECF61BE4 for ; Thu, 3 Jun 2021 19:32:30 +0000 (UTC) Received: (qmail 26001 invoked by uid 500); 3 Jun 2021 19:32:29 -0000 Mailing-List: contact notifications-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list notifications@asterixdb.apache.org Received: (qmail 25968 invoked by uid 99); 3 Jun 2021 19:32:29 -0000 Received: from spamproc1-he-de.apache.org (HELO spamproc1-he-de.apache.org) (116.203.196.100) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2021 19:32:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamproc1-he-de.apache.org (ASF Mail Server at spamproc1-he-de.apache.org) with ESMTP id B3E611FF485 for ; Thu, 3 Jun 2021 19:32:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamproc1-he-de.apache.org X-Spam-Flag: NO X-Spam-Score: 0.213 X-Spam-Level: X-Spam-Status: No, score=0.213 tagged_above=-999 required=6.31 tests=[HTML_MESSAGE=0.2, SPF_NONE=0.001, T_KAM_HTML_FONT_INVALID=0.01, URIBL_BLOCKED=0.001, WEIRD_PORT=0.001] autolearn=disabled Received: from mx1-he-de.apache.org ([116.203.227.195]) by localhost (spamproc1-he-de.apache.org [116.203.196.100]) (amavisd-new, port 10024) with ESMTP id gsKAKrj7SrVy for ; Thu, 3 Jun 2021 19:32:28 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=128.195.1.133; helo=adrian-monk-v3.ics.uci.edu; envelope-from=do-not-reply@asterix-gerrit.ics.uci.edu; receiver= Received: from adrian-monk-v3.ics.uci.edu (adrian-monk-v3.ics.uci.edu [128.195.1.133]) by mx1-he-de.apache.org (ASF Mail Server at mx1-he-de.apache.org) with ESMTPS id A1A367FF8E for ; Thu, 3 Jun 2021 19:32:27 +0000 (UTC) Received: from 7c2109483a62 (vitalstatistix.ics.uci.edu [128.195.52.38]) by adrian-monk-v3.ics.uci.edu (Postfix) with ESMTP id 84C95C02A0C1; Thu, 3 Jun 2021 12:32:23 -0700 (PDT) X-Gerrit-PatchSet: 1 Date: Thu, 3 Jun 2021 19:32:23 +0000 From: AsterixDB Code Review To: Till Westmann Cc: Ian Maxon Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat' X-Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1 X-Gerrit-Change-Number: 11765 X-Gerrit-Project: asterixdb X-Gerrit-ChangeURL: X-Gerrit-Commit: 774b4110dd7ac97d2382170c9187df839efbdc18 References: Reply-To: imaxon@uci.edu, dmitry.lychagin@couchbase.com, notifications@asterixdb.apache.org, lwhaywhu@gmail.com, imaxon@uci.edu, tillw@apache.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/3.0.12 Content-Type: multipart/alternative; boundary="TxJ866fY+os="; charset=UTF-8 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: 84C95C02A0C1.A384D X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-0.986, required 5, ALL_TRUSTED -1.00, FSL_HELO_NON_FQDN_1 0.00, HELO_NO_DOMAIN 0.00, HTML_MESSAGE 0.00, T_KAM_HTML_FONT_INVALID 0.01, URIBL_BLOCKED 0.00) X-ICS-MailScanner-From: do-not-reply@asterix-gerrit.ics.uci.edu --TxJ866fY+os= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable From Ian Maxon : Ian Maxon has uploaded this change for = review=2E ( https://asterix-gerrit=2Eics=2Euci=2Eedu/c/asterixdb/+/11765 ) = Change subject: Merge branch 'mad-hatter' into 'cheshire-cat' =2E=2E=2E= =2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E= =2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E= =2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E Merge branch 'mad-hatt= er' into 'cheshire-cat' Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09= e1 --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/= ParserTestExecutor=2Ejava M asterixdb/pom=2Exml M hyracks-fullstack/pom=2Ex= ml 4 files changed, 18 insertions(+), 36 deletions(-) git pull ssh://a= sterix-gerrit=2Eics=2Euci=2Eedu:29418/asterixdb refs/changes/65/11765/1 di= ff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlp= p/ParserTestExecutor=2Ejava b/asterixdb/asterix-app/src/test/java/org/apach= e/asterix/test/sqlpp/ParserTestExecutor=2Ejava index 8637faf=2E=2E2039d53 1= 00644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sql= pp/ParserTestExecutor=2Ejava +++ b/asterixdb/asterix-app/src/test/java/org/= apache/asterix/test/sqlpp/ParserTestExecutor=2Ejava @@ -19,11 +19,6 @@ pac= kage org=2Eapache=2Easterix=2Etest=2Esqlpp; import static org=2Eapache= =2Ehyracks=2Eutil=2Efile=2EFileUtil=2Ecanonicalize; -<<<<<<< HEAD (b4f8dd= Merge branch 'gerrit/stabilization-3b6982ce7f') -import static org=2Emocki= to=2EMatchers=2Eany; -import static org=2Emockito=2EMatchers=2EanyString; -= =3D=3D=3D=3D=3D=3D=3D ->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java= version 8->11) import static org=2Emockito=2EMockito=2Emock; import stat= ic org=2Emockito=2EMockito=2Ewhen; @@ -155,8 +150,7 @@ when(= metadataProvider=2EgetDefaultDataverseName())=2EthenReturn(dvName); = when(metadataProvider=2EgetConfig())=2EthenReturn(config); = when(config=2Eget(FunctionUtil=2EIMPORT_PRIVATE_FUNCTIONS))=2EthenReturn= ("true"); -<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982= ce7f') - when(metadataProvider=2EfindDataverse(any(DataverseName= =2Eclass)))=2EthenAnswer(new Answer() { + when(metada= taProvider=2EfindDataverse(Mockito=2E any()))=2EthenAnswer(n= ew Answer() { @Override public= Dataverse answer(InvocationOnMock invocation) { Objec= t[] args =3D invocation=2EgetArguments(); @@ -165,17 +159,18 @@ = return mockDataverse; } }); - = when(metadataProvider=2EfindDataset(any(DataverseName=2Eclass), anySt= ring()))=2EthenAnswer(new Answer() { - @Override - = public Dataset answer(InvocationOnMock invocation) { - = Object[] args =3D invocation=2EgetArguments(); - = final Dataset mockDataset =3D mock(Dataset=2Eclass); - = when(mockDataset=2EgetDataverseName())=2EthenReturn((DataverseName) a= rgs[0]); - when(mockDataset=2EgetDatasetName())=2EthenRe= turn((String) args[1]); - return mockDataset; - = } - }); - when(metadataProvider=2ElookupUserDe= finedFunction(any(FunctionSignature=2Eclass))) + when(metadataPr= ovider=2EfindDataset(Mockito=2E any(), Mockito=2E an= y())) + =2EthenAnswer(new Answer() { + = @Override + public Dataset answer(Inv= ocationOnMock invocation) { + Object[] args =3D = invocation=2EgetArguments(); + final Dataset moc= kDataset =3D mock(Dataset=2Eclass); + when(mockD= ataset=2EgetDataverseName())=2EthenReturn((DataverseName) args[0]); + = when(mockDataset=2EgetDatasetName())=2EthenReturn((St= ring) args[1]); + return mockDataset; + = } + }); + when(metadataProvide= r=2ElookupUserDefinedFunction(Mockito=2E any())) = =2EthenAnswer(new Answer() { = @Override public Function answer(InvocationOnMo= ck invocation) { @@ -187,17 +182,6 @@ Function= mockFunction =3D mock(Function=2Eclass); when= (mockFunction=2EgetSignature())=2EthenReturn(fs); = return mockFunction; -=3D=3D=3D=3D=3D=3D=3D - when(metadataP= rovider=2EfindDataset(Mockito=2E any(), Mockito=2E any())) = - =2EthenAnswer(new Answer() { - = @Override - public Dataset answer(Invocatio= nOnMock invocation) { - Object[] args =3D invoca= tion=2EgetArguments(); - final Dataset mockDatas= et =3D mock(Dataset=2Eclass); - String fullyQual= ifiedName =3D args[0] !=3D null ? args[0] + "=2E" + args[1] : (String) args= [1]; - when(mockDataset=2EgetFullyQualifiedName(= ))=2EthenReturn(fullyQualifiedName); - return mo= ckDataset; ->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8-= >11) } }); diff --git a/ast= erixdb/pom=2Exml b/asterixdb/pom=2Exml index 4461193=2E=2E7d90c0d 100644 --= - a/asterixdb/pom=2Exml +++ b/asterixdb/pom=2Exml @@ -629,7 +629,7 @@ = 6=2E1=2E2 = - + = net=2Erevelc=2Ecode=2Eformatter <= artifactId>formatter-maven-plugin @@ -641,15 +641,14 @@ = 1=2E2=2E0 -<<<= <<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f') = org=2Ecodehaus=2Emojo exec-ma= ven-plugin 1=2E6=2E0 -=3D=3D=3D= =3D=3D=3D=3D + + org= =2Eapache=2Emaven=2Eplugins maven-enforcer= -plugin 3=2E0=2E0-M3 ->>>>>>> BR= ANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11) diff --git a/hyracks-fullstack= /pom=2Exml b/hyracks-fullstack/pom=2Exml index dc7af06=2E=2E09ae228 100644 = --- a/hyracks-fullstack/pom=2Exml +++ b/hyracks-fullstack/pom=2Exml @@ -302= ,7 +302,6 @@ 3=2E6=2E3 = -<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization= -3b6982ce7f') it=2Eunimi=2Edsi fastutil-core 8=2E5=2E4 @@ -3= 11,7 +310,8 @@ org=2Eapache=2Elogging=2Elog4j = log4j-1=2E2-api 2=2E13= =2E1 -=3D=3D=3D=3D=3D=3D=3D + + org=2Emockito mockito-= core 3=2E10=2E0 @@ -330,7 +330,6 @= @ org=2Epowermock powermoc= k-core 2=2E0=2E9 ->>>>>>> BRANCH (= 4889f6 [ASTERIXDB-2890] Minimum Java version 8->11) = -- To view, visit https://a= sterix-gerrit=2Eics=2Euci=2Eedu/c/asterixdb/+/11765 To unsubscribe, or for = help writing mail filters, visit https://asterix-gerrit=2Eics=2Euci=2Eedu/s= ettings Gerrit-Project: asterixdb Gerrit-Branch: cheshire-cat Gerrit-Chang= e-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1 Gerrit-Change-Number: 11765= Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon Gerrit-Messa= geType: newchange --TxJ866fY+os= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Ian Maxon has uploaded this change for review=2E

= Vi= ew Change

Merge branch 'mad-hatter' into 'cheshire-cat'=


Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
---
M as=
terixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestE=
xecutor=2Ejava
M asterixdb/pom=2Exml
M hyracks-fullstack/pom=2Exml4 files changed, 18 insertions(+), 36 deletions(-)

git pull ssh:=
//asterix-gerrit=2Eics=2Euci=2Eedu:29418/asterixdb refs/changes/65/11765/1<=
/pre>
-=
<<<<<<< HEAD   (b4f8dd Merge branch 'gerrit/stabil=
ization-3b6982ce7f')
-import static org=2Emockito=2EMatchers=2EanyStri=
ng;
-=3D=3D=3D=3D=3D=3D=
=3D
->>>>&g=
t;>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
 import static org=2Emockito=2EMockito=2Emock;
 import static org=2Emockito=2EMockito=2Ewhen;
 <=
br>@@ -155,8 +150,7 @@
             when(metadataProv=
ider=2EgetDefaultDataverseName())=2EthenReturn(dvName);
   =
          when(metadataProvider=2EgetConfig())=2EthenReturn(config);=

             when(config=2Eget(FunctionUtil=2EIMPORT_PRIVATE_FUNC=
TIONS))=2EthenReturn("true");
-<<<<<<< HEAD   (b4f8dd Merge branch =
'gerrit/stabilization-3b6982ce7f')
-            when(metadataProvider=2EfindDataverse(any(=
DataverseName=2Eclass)))=2EthenAnswer(new Answer<Dataverse>() {
+            when(metadata=
Provider=2EfindDataverse(Mockito=2E<DataverseName> any()))=2EthenAnsw=
er(new Answer<Dataverse>() {
                 @Overri=
de
                 public Dataverse answer(InvocationOnMoc=
k invocation) {
                     Object[] args =3D invo=
cation=2EgetArguments();
@@ -165,17 +159,18 @@
                     return mockDataverse;
            =
     }
             });
-            when(metadataProvider=2EfindDataset(any(Datav=
erseName=2Eclass), anyString()))=2EthenAnswer(new Answer<Dataset>() {=

-                @Over=
ride
-                p=
ublic Dataset answer(InvocationOnMock invocation) {
-                    Object[] args =3D invoc=
ation=2EgetArguments();
-                    final Dataset mockDataset =3D mock(Dataset=2Eclass);<=
/span>
-                    wh=
en(mockDataset=2EgetDataverseName())=2EthenReturn((DataverseName) args[0]);=

-                    w=
hen(mockDataset=2EgetDatasetName())=2EthenReturn((String) args[1]);<=
br>-                    return mo=
ckDataset;
-           =
     }
-            });=

-            when(meta=
dataProvider=2ElookupUserDefinedFunction(any(FunctionSignature=2Eclass)))
+            when(meta=
dataProvider=2EfindDataset(Mockito=2E<DataverseName> any(), Mockito=
=2E<String> any()))
+                    =2EthenAnswer(new Answer<Dataset>() {
+                        @=
Override
+           =
             public Dataset answer(InvocationOnMock invocation) {+                            O=
bject[] args =3D invocation=2EgetArguments();
+                            final Dataset mockDat=
aset =3D mock(Dataset=2Eclass);
+                            when(mockDataset=2EgetDataverseName=
())=2EthenReturn((DataverseName) args[0]);
+                            when(mockDataset=2EgetDa=
tasetName())=2EthenReturn((String) args[1]);
+                            return mockDataset;
+                      =
  }
+                =
    });
+            =
when(metadataProvider=2ElookupUserDefinedFunction(Mockito=2E<FunctionSig=
nature> any()))
                     =2EthenAnswer(new A=
nswer<Function>() {
                         @Overrid=
e
                         public Function answer(Invocatio=
nOnMock invocation) {
@@ -187,17 +182,6 @@
=
                             Function mockFunction =3D mock(Function=2Eclas=
s);
                             when(mockFunction=2EgetSig=
nature())=2EthenReturn(fs);
                             re=
turn mockFunction;
-=3D=
=3D=3D=3D=3D=3D=3D
-   =
         when(metadataProvider=2EfindDataset(Mockito=2E<String> any()=
, Mockito=2E<String> any()))
-                    =2EthenAnswer(new Answer<Dataset>() =
{
-                    =
    @Override
-        =
                public Dataset answer(InvocationOnMock invocation) {=

-                            =
Object[] args =3D invocation=2EgetArguments();
-                            final Dataset mockData=
set =3D mock(Dataset=2Eclass);
-                            String fullyQualifiedName =3D args[0] =
!=3D null ? args[0] + "=2E" + args[1] : (String) args[1];<=
br>-                            w=
hen(mockDataset=2EgetFullyQualifiedName())=2EthenReturn(fullyQualifiedName)=
;
-                    =
        return mockDataset;
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum =
Java version 8->11)
                         }                     });
 
diff --gi=
t a/asterixdb/pom=2Exml b/asterixdb/pom=2Exml
index 4461193=
=2E=2E7d90c0d 100644
--- a/asterixdb/pom=2Exml
+++ b/asterixdb/pom=2Exml
@@ -629,7 +629,7 @@               <version>6=2E1=2E2</version>
             </dependency>
           </depend=
encies>
-        <=
;/plugin>
+       =
   </plugin>
         <plugin>
=
           <groupId>net=2Erevelc=2Ecode=2Eformatter</groupId>
           <artifactId>formatter-maven-plugin</arti=
factId>
@@ -641,15 +641,14 @@
          =
 <version>1=2E2=2E0</version>
         </plu=
gin>
         <plugin>
-<<<<<<< HEAD   (b4f8dd Merge=
 branch 'gerrit/stabilization-3b6982ce7f')
        =
   <groupId>org=2Ecodehaus=2Emojo</groupId>
   =
        <artifactId>exec-maven-plugin</artifactId>
           <version>1=2E6=2E0</version>
-=3D=3D=3D=3D=3D=3D=3D
+        </plugin>
+        <plugin>
           <groupId>org=2Eapache=2Emaven=2Eplugins</groupId>=
;
           <artifactId>maven-enforcer-plugin</ar=
tifactId>
           <version>3=2E0=2E0-M3</ver=
sion>
->>>&=
gt;>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->=
11)
         </plugin>
       </pl=
ugins>
     </pluginManagement>
di=
ff --git a/hyracks-fullstack/pom=2Exml b/hyracks-fullstack/pom=2Exml=

index dc7af06=2E=2E09ae228 100644
--- a/hyracks-f=
ullstack/pom=2Exml
+++ b/hyracks-fullstack/pom=2Exml=

@@ -302,7 +302,6 @@
         <version>3=2E6=
=2E3</version>
       </dependency>
<=
span>       <dependency>
-<<<<<<< HEAD   (b4f8dd Merge branch 'gerr=
it/stabilization-3b6982ce7f')
         <groupId>i=
t=2Eunimi=2Edsi</groupId>
         <artifactId>=
fastutil-core</artifactId>
         <version>8=
=2E5=2E4</version>
@@ -311,7 +310,8 @@
         <groupId>org=2Eapache=2Elogging=2Elog4j</groupId>
         <artifactId>log4j-1=2E2-api</artifactId>=

         <version>2=2E13=2E1</version><=
br>-=3D=3D=3D=3D=3D=3D=3D<=
br>+      </dependency>
+      <dependency&=
gt;
         <groupId>org=2Emockito</groupId>
         <artifactId>mockito-core</artifactId>
         <version>3=2E10=2E0</version>@@ -330,7 +330,6 @@
         <groupId>org=2Epo=
wermock</groupId>
         <artifactId>powermoc=
k-core</artifactId>
         <version>2=2E0=2E9=
</version>
->&=
gt;>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java versio=
n 8->11)
       </dependency>
    =
 </dependencies>
   </dependencyManagement>

To view, visit change 11765=2E To unsubs=
cribe, or for help writing mail filters, visit settings=2E



 Gerrit-Project: asterixdb 

 Gerrit-Branch: cheshire-cat 


 Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1 <=
/div>

 Gerrit-Change-Number: 11765 


 Gerrit-PatchSet: 1 


 Gerrit-Owner: Ian Maxon <imaxon@uci=2Eedu> 


 Gerrit-MessageType: newchange 



--TxJ866fY+os=--