Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2650
Change subject: Merge commit 'f02b43bcff1c859b933f55df9654899d025b1ed3' from
release-0.9.4-pre-rc
......................................................................
Merge commit 'f02b43bcff1c859b933f55df9654899d025b1ed3' from
release-0.9.4-pre-rc
Change-Id: I2b825e2d8b5defb67fba39f4912cfaa44111233f
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/50/2650/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index 7b779fc..524c684 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -2825,15 +2825,15 @@
rewriter.rewrite(stmt);
}
-<<<<<<< HEAD (10a3f2 [NO ISSUE][STO] Misc Storage Fixes and Improvements)
- protected void afterCompile() {
- if (sessionOutput.config().is(SessionConfig.FORMAT_HTML)) {
- ExecutionPlansHtmlPrintUtil.print(sessionOutput.out(),
getExecutionPlans());
-=======
private void ensureNonPrimaryIndexDrop(Index index) throws
AlgebricksException {
if (index.isPrimaryIndex()) {
throw new MetadataException(ErrorCode.CANNOT_DROP_INDEX,
index.getIndexName(), index.getDatasetName());
->>>>>>> BRANCH (f02b43 [ASTERIXDB-2387][MTD] Prevent Dataset Primary Index
Drop)
+ }
+ }
+
+ protected void afterCompile() {
+ if (sessionOutput.config().is(SessionConfig.FORMAT_HTML)) {
+ ExecutionPlansHtmlPrintUtil.print(sessionOutput.out(),
getExecutionPlans());
}
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/2650
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b825e2d8b5defb67fba39f4912cfaa44111233f
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
