>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20434?usp=email )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/phoenix'
* [NO ISSUE][HYR][STO] Update FileMapManager serialVersionUID
* [NO ISSUE][*DB] += valid tx check, allow active setRunning to throw
* [NO ISSUE][HYR][MISC] Add utility method to abbreviate a stack overflow error
Ext-ref: MB-68720,MB-68587
Change-Id: I0ec0f3f3203af1c0844bf07875c55dd154b3b542
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
M
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
6 files changed, 25 insertions(+), 42 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/34/20434/1
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
index 39efad9..7120d8d 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
@@ -1343,7 +1343,6 @@
}
@Override
-<<<<<<< HEAD (d22fc3 [ASTERIXDB-3653][EXT]: Properly handle errors when
deleting )
public List<Dataset> getAllDatasets(MetadataTransactionContext ctx) throws
AlgebricksException {
try {
return metadataNode.getAllDatasets(ctx.getTxnId());
@@ -1353,8 +1352,6 @@
}
@Override
-=======
->>>>>>> BRANCH (99fa79 Merge "Merge branch 'gerrit/neo' into 'gerrit/trinity'"
into)
public boolean isActive(TxnId txnId) throws AlgebricksException {
try {
return metadataNode.isActive(txnId);
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 6e01442..4bb8424 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
@@ -1462,17 +1462,6 @@
}
}
- @Override
- public boolean isActive(TxnId txnId) {
- // TODO(mblow): avoid using exceptions for control flow
- try {
-
transactionSubsystem.getTransactionManager().getTransactionContext(txnId);
- return true;
- } catch (ACIDException ignore) {
- return false;
- }
- }
-
public List<Function> getAllFunctions(TxnId txnId) throws
AlgebricksException {
return getFunctionsImpl(txnId, null);
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
index f1a1dcf..d8d37b7 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
@@ -921,10 +921,7 @@
long getMaxTxnId();
-<<<<<<< HEAD (d22fc3 [ASTERIXDB-3653][EXT]: Properly handle errors when
deleting )
List<Dataset> getAllDatasets(MetadataTransactionContext ctx) throws
AlgebricksException;
-=======
->>>>>>> BRANCH (99fa79 Merge "Merge branch 'gerrit/neo' into 'gerrit/trinity'"
into)
boolean isActive(TxnId txnId) throws AlgebricksException;
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
index 15bc9ca..da0c801 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
@@ -1020,11 +1020,5 @@
List<Dataset> getAllDatasets(TxnId txnId) throws AlgebricksException,
RemoteException;
-<<<<<<< HEAD (d22fc3 [ASTERIXDB-3653][EXT]: Properly handle errors when
deleting )
-=======
- List<FeedConnection> getFeedConnections(TxnId txnId, DataverseName
dataverseName, String feedName)
- throws AlgebricksException, RemoteException;
-
->>>>>>> BRANCH (99fa79 Merge "Merge branch 'gerrit/neo' into 'gerrit/trinity'"
into)
boolean isActive(TxnId txnId) throws RemoteException;
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
index aeafc12..81de6ed 100644
---
a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
+++
b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExceptionUtils.java
@@ -238,7 +238,24 @@
return throwable.getError().isPresent() && throwable.getError().get()
== code;
}
-<<<<<<< HEAD (d22fc3 [ASTERIXDB-3653][EXT]: Properly handle errors when
deleting )
+ public static Throwable truncateStackOverflowStack(Throwable ex, int
limit) {
+ if (ex instanceof StackOverflowError) {
+ StackTraceElement[] fullTrace = ex.getStackTrace();
+ if (fullTrace.length > limit * 2) {
+ StackOverflowError copy = new
StackOverflowError(ex.getMessage());
+ // keep the cause if there was one
+ copy.initCause(ex.getCause());
+ StackTraceElement[] trimmedTrace = new StackTraceElement[limit
+ 1];
+ System.arraycopy(fullTrace, 0, trimmedTrace, 0, limit);
+ trimmedTrace[limit] = new StackTraceElement("...<truncated " +
(fullTrace.length - limit) + " lines>",
+ "..", null, -1);
+ copy.setStackTrace(trimmedTrace);
+ return copy;
+ }
+ }
+ return ex;
+ }
+
/**
* Checks if the specific type T exception is in the causes of the current
throwable, and if so returns it,
* otherwise returns null
@@ -262,23 +279,5 @@
}
return Optional.empty();
-=======
- public static Throwable truncateStackOverflowStack(Throwable ex, int
limit) {
- if (ex instanceof StackOverflowError) {
- StackTraceElement[] fullTrace = ex.getStackTrace();
- if (fullTrace.length > limit * 2) {
- StackOverflowError copy = new
StackOverflowError(ex.getMessage());
- // keep the cause if there was one
- copy.initCause(ex.getCause());
- StackTraceElement[] trimmedTrace = new StackTraceElement[limit
+ 1];
- System.arraycopy(fullTrace, 0, trimmedTrace, 0, limit);
- trimmedTrace[limit] = new StackTraceElement("...<truncated " +
(fullTrace.length - limit) + " lines>",
- "..", null, -1);
- copy.setStackTrace(trimmedTrace);
- return copy;
- }
- }
- return ex;
->>>>>>> BRANCH (99fa79 Merge "Merge branch 'gerrit/neo' into 'gerrit/trinity'"
into)
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20434?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I0ec0f3f3203af1c0844bf07875c55dd154b3b542
Gerrit-Change-Number: 20434
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
