You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/04/12 19:38:05 UTC

Change in asterixdb[master]: Merge branch 'cheshire-cat'

From Dmitry Lychagin <dm...@couchbase.com>:

Dmitry Lychagin has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024 )


Change subject: Merge branch 'cheshire-cat'
......................................................................

Merge branch 'cheshire-cat'

Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
---
M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
4 files changed, 9 insertions(+), 18 deletions(-)



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

diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index b9522cf..1be99f0 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -233,17 +233,14 @@
     UNKNOWN_FEED_POLICY(1146),
     CANNOT_DROP_DATAVERSE_DEPENDENT_EXISTS(1147),
     CANNOT_DROP_OBJECT_DEPENDENT_EXISTS(1148),
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-    FULL_TEXT_CONFIG_ALREADY_EXISTS(1149),
-    FULL_TEXT_FILTER_ALREADY_EXISTS(1150),
+    ILLEGAL_FUNCTION_RECURSION(1149),
+    ILLEGAL_FUNCTION_USE(1150),
     FULL_TEXT_CONFIG_NOT_FOUND(1151),
     FULL_TEXT_FILTER_NOT_FOUND(1152),
     FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED(1153),
     COMPILATION_INCOMPATIBLE_INDEX_TYPE(1154),
-=======
-    ILLEGAL_FUNCTION_RECURSION(1149),
-    ILLEGAL_FUNCTION_USE(1150),
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+    FULL_TEXT_CONFIG_ALREADY_EXISTS(1155),
+    FULL_TEXT_FILTER_ALREADY_EXISTS(1156),
 
     // Feed errors
     DATAFLOW_ILLEGAL_STATE(3001),
diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index a123ece..591fa9a 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -235,17 +235,14 @@
 1146 = Cannot find feed policy with name %1$s
 1147 = Cannot drop dataverse: %1$s %2$s being used by %3$s %4$s
 1148 = Cannot drop %1$s %2$s being used by %3$s %4$s
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-1149 = Full-text config %1$s already exists
-1150 = Full-text filter %1$s already exists
+1149 = Illegal function recursion
+1150 = Illegal use of function %1$s
 1151 = Full-text config %1$s not found
 1152 = Full-text filter %1$s not found
 1153 = Default full-text config with a name of null cannot be deleted or created
 1154 = Incompatible index type %1$s
-=======
-1149 = Illegal function recursion
-1150 = Illegal use of function %1$s
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+1155 = Full-text config %1$s already exists
+1156 = Full-text filter %1$s already exists
 
 # Feed Errors
 3001 = Illegal state.
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 0b774e4..f8ba574 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -19,11 +19,8 @@
 
 package org.apache.asterix.metadata;
 
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
-=======
 import static org.apache.asterix.common.api.IIdentifierMapper.Modifier.PLURAL;
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
 import static org.apache.asterix.common.utils.IdentifierUtil.dataset;
 
 import java.rmi.RemoteException;

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
Gerrit-Change-Number: 11024
Gerrit-PatchSet: 1
Gerrit-Owner: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-MessageType: newchange

Change in asterixdb[master]: Merge branch 'cheshire-cat'

Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:

Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024 )

Change subject: Merge branch 'cheshire-cat'
......................................................................


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/11869/ : SUCCESS


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
Gerrit-Change-Number: 11024
Gerrit-PatchSet: 1
Gerrit-Owner: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Comment-Date: Mon, 12 Apr 2021 20:45:42 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in asterixdb[master]: Merge branch 'cheshire-cat'

Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Dmitry Lychagin <dm...@couchbase.com>:

Dmitry Lychagin has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024 )


Change subject: Merge branch 'cheshire-cat'
......................................................................

Merge branch 'cheshire-cat'

Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
---
M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
4 files changed, 9 insertions(+), 18 deletions(-)



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

diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index b9522cf..1be99f0 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -233,17 +233,14 @@
     UNKNOWN_FEED_POLICY(1146),
     CANNOT_DROP_DATAVERSE_DEPENDENT_EXISTS(1147),
     CANNOT_DROP_OBJECT_DEPENDENT_EXISTS(1148),
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-    FULL_TEXT_CONFIG_ALREADY_EXISTS(1149),
-    FULL_TEXT_FILTER_ALREADY_EXISTS(1150),
+    ILLEGAL_FUNCTION_RECURSION(1149),
+    ILLEGAL_FUNCTION_USE(1150),
     FULL_TEXT_CONFIG_NOT_FOUND(1151),
     FULL_TEXT_FILTER_NOT_FOUND(1152),
     FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED(1153),
     COMPILATION_INCOMPATIBLE_INDEX_TYPE(1154),
-=======
-    ILLEGAL_FUNCTION_RECURSION(1149),
-    ILLEGAL_FUNCTION_USE(1150),
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+    FULL_TEXT_CONFIG_ALREADY_EXISTS(1155),
+    FULL_TEXT_FILTER_ALREADY_EXISTS(1156),
 
     // Feed errors
     DATAFLOW_ILLEGAL_STATE(3001),
diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index a123ece..591fa9a 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -235,17 +235,14 @@
 1146 = Cannot find feed policy with name %1$s
 1147 = Cannot drop dataverse: %1$s %2$s being used by %3$s %4$s
 1148 = Cannot drop %1$s %2$s being used by %3$s %4$s
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-1149 = Full-text config %1$s already exists
-1150 = Full-text filter %1$s already exists
+1149 = Illegal function recursion
+1150 = Illegal use of function %1$s
 1151 = Full-text config %1$s not found
 1152 = Full-text filter %1$s not found
 1153 = Default full-text config with a name of null cannot be deleted or created
 1154 = Incompatible index type %1$s
-=======
-1149 = Illegal function recursion
-1150 = Illegal use of function %1$s
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+1155 = Full-text config %1$s already exists
+1156 = Full-text filter %1$s already exists
 
 # Feed Errors
 3001 = Illegal state.
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 0b774e4..f8ba574 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -19,11 +19,8 @@
 
 package org.apache.asterix.metadata;
 
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
-=======
 import static org.apache.asterix.common.api.IIdentifierMapper.Modifier.PLURAL;
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
 import static org.apache.asterix.common.utils.IdentifierUtil.dataset;
 
 import java.rmi.RemoteException;

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
Gerrit-Change-Number: 11024
Gerrit-PatchSet: 1
Gerrit-Owner: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-MessageType: newchange

Change in asterixdb[master]: Merge branch 'cheshire-cat'

Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:

Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024 )

Change subject: Merge branch 'cheshire-cat'
......................................................................


Patch Set 1: Code-Review+2


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
Gerrit-Change-Number: 11024
Gerrit-PatchSet: 1
Gerrit-Owner: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Comment-Date: Mon, 12 Apr 2021 23:35:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in asterixdb[master]: Merge branch 'cheshire-cat'

Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Dmitry Lychagin <dm...@couchbase.com>:

Dmitry Lychagin has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024 )

Change subject: Merge branch 'cheshire-cat'
......................................................................

Merge branch 'cheshire-cat'

Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
---
M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
4 files changed, 9 insertions(+), 18 deletions(-)

Approvals:
  Jenkins: Verified; Verified
  Michael Blow: Looks good to me, approved



diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index b9522cf..1be99f0 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -233,17 +233,14 @@
     UNKNOWN_FEED_POLICY(1146),
     CANNOT_DROP_DATAVERSE_DEPENDENT_EXISTS(1147),
     CANNOT_DROP_OBJECT_DEPENDENT_EXISTS(1148),
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-    FULL_TEXT_CONFIG_ALREADY_EXISTS(1149),
-    FULL_TEXT_FILTER_ALREADY_EXISTS(1150),
+    ILLEGAL_FUNCTION_RECURSION(1149),
+    ILLEGAL_FUNCTION_USE(1150),
     FULL_TEXT_CONFIG_NOT_FOUND(1151),
     FULL_TEXT_FILTER_NOT_FOUND(1152),
     FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED(1153),
     COMPILATION_INCOMPATIBLE_INDEX_TYPE(1154),
-=======
-    ILLEGAL_FUNCTION_RECURSION(1149),
-    ILLEGAL_FUNCTION_USE(1150),
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+    FULL_TEXT_CONFIG_ALREADY_EXISTS(1155),
+    FULL_TEXT_FILTER_ALREADY_EXISTS(1156),
 
     // Feed errors
     DATAFLOW_ILLEGAL_STATE(3001),
diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index a123ece..591fa9a 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -235,17 +235,14 @@
 1146 = Cannot find feed policy with name %1$s
 1147 = Cannot drop dataverse: %1$s %2$s being used by %3$s %4$s
 1148 = Cannot drop %1$s %2$s being used by %3$s %4$s
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-1149 = Full-text config %1$s already exists
-1150 = Full-text filter %1$s already exists
+1149 = Illegal function recursion
+1150 = Illegal use of function %1$s
 1151 = Full-text config %1$s not found
 1152 = Full-text filter %1$s not found
 1153 = Default full-text config with a name of null cannot be deleted or created
 1154 = Incompatible index type %1$s
-=======
-1149 = Illegal function recursion
-1150 = Illegal use of function %1$s
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+1155 = Full-text config %1$s already exists
+1156 = Full-text filter %1$s already exists
 
 # Feed Errors
 3001 = Illegal state.
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 0b774e4..f8ba574 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -19,11 +19,8 @@
 
 package org.apache.asterix.metadata;
 
-<<<<<<< HEAD   (583292 [NO-ISSUE][IDX] Removing "?" type quantifier for array index)
-import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
-=======
 import static org.apache.asterix.common.api.IIdentifierMapper.Modifier.PLURAL;
->>>>>>> BRANCH (55ad6a [NO ISSUE][MTD] Let active listeners acquire suspend locks)
+import static org.apache.asterix.common.exceptions.ErrorCode.FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED;
 import static org.apache.asterix.common.utils.IdentifierUtil.dataset;
 
 import java.rmi.RemoteException;

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11024
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I1f21eca41175d3b18f7fb0f639988d59a7d35434
Gerrit-Change-Number: 11024
Gerrit-PatchSet: 1
Gerrit-Owner: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Dmitry Lychagin <dm...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged