Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3912/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3912/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7794/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: -Contrib Analytics Compatibility Compilation Successful https://goo.gl/zaW5vn : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][COMP] Window operator runtime optimization
Ali Alsuliman has posted comments on this change. Change subject: [NO ISSUE][COMP] Window operator runtime optimization .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3124 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If34d8eb05c069257c974f61810bee399136825fa Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Dmitry Lychagin Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/97/ (15/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7794/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/4967/ (11/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5308/ (14/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8916/ (3/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Anon. E. Moose #1000171 has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Contrib-2 Analytics Compatibility Compilation Failed https://goo.gl/XbuVyq : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/4977/ (13/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/376/ (6/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN: * asterixdb * hyracks-fullstack PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES! -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/133/ (5/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5351/ (8/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5190/ (4/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/372/ (9/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4879/ (1/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/2977/ (2/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10449/ (12/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Ali Alsuliman has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3125
Change subject: [NO ISSUE][OTH] Support log redaction 2
..
[NO ISSUE][OTH] Support log redaction 2
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Modify ILogRedactor to enable reversing the redaction
- Redact user data in exceptions thrown in the grammar file
Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5
---
M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/ILogRedactor.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/LogRedactionUtil.java
3 files changed, 30 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/25/3125/1
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index 45ba7c3..19a4da2 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -184,6 +184,7 @@
import
org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
+import org.apache.hyracks.util.LogRedactionUtil;
class SQLPPParser extends ScopeChecker implements IParser {
@@ -400,7 +401,7 @@
}
private SqlppParseException createUnexpectedTokenError() {
- return new SqlppParseException(getSourceLocation(token), "Unexpected
token: " + token.image);
+ return new SqlppParseException(getSourceLocation(token), "Unexpected
token: " + LogRedactionUtil.userData(token.image));
}
private boolean laToken(int idx, int kind, String image) {
@@ -2445,7 +2446,7 @@
try {
lit.setValue(new LongIntegerLiteral(Long.valueOf(token.image)));
} catch (NumberFormatException e) {
-throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + token.image +'"');
+throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + LogRedactionUtil.userData(token.image) +'"');
}
}
|
@@ -2453,7 +2454,7 @@
try {
lit.setValue(new FloatLiteral(Float.valueOf(token.image)));
} catch (NumberFormatException e) {
-throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + token.image +'"');
+throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + LogRedactionUtil.userData(token.image) +'"');
}
}
|
@@ -2461,7 +2462,7 @@
try {
lit.setValue(new DoubleLiteral(Double.valueOf(token.image)));
} catch (NumberFormatException e) {
-throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + token.image +'"');
+throw new SqlppParseException(getSourceLocation(token), "Could not
parse numeric literal \"" + LogRedactionUtil.userData(token.image) +'"');
}
}
|
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/ILogRedactor.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/ILogRedactor.java
index 18e9a34..b133894 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/ILogRedactor.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/ILogRedactor.java
@@ -22,8 +22,17 @@
/**
* Redacts user data argument.
+ *
* @param text user data to redact.
* @return redacted user data.
*/
String userData(String text);
+
+/**
+ * Unredacts user data found in the argument.
+ *
+ * @param text text that contains some redacted user data.
+ * @return the text with user data unredacted.
+ */
+String unredactUserData(String text);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/LogRedactionUtil.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/LogRedactionUtil.java
index 29242be..89c957e 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/LogRedactionUtil.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/LogRedactionUtil.java
@@ -21,8 +21,18 @@
public class LogRedactionUtil {
-private static final ILogRedactor defaultLogRedactor = text -> text;
-private static ILogRedactor redactor = defaultLogRedactor;
+private static final ILogRedactor DEFAULT_LOG_REDACTOR = new
ILogRedactor() {
+@Override
+
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4933/ (10/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][OTH] Support log redaction 2
Jenkins has posted comments on this change. Change subject: [NO ISSUE][OTH] Support log redaction 2 .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5537/ (7/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3125 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If971d0a913e2b7efe521e2d54646568f789937b5 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
