http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java index 43e62d1..7e228f4 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java @@ -56,7 +56,7 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis operatorExpr.setExprList(newExprList); OperatorType opType = operatorExpr.getOpList().get(0); switch (opType) { - // There can only be one LIKE/NOT_LIKE/IN/NOT_IN in an operator expression (according to the grammar). + // There can only be one LIKE/NOT_LIKE/IN/NOT_IN in an operator expression (according to the grammar). case LIKE: case NOT_LIKE: return processLikeOperator(operatorExpr, opType); @@ -99,12 +99,14 @@ public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVis comparison.setCurrentop(true); if (opType == OperatorType.IN) { comparison.addOperator(OperatorType.EQ); - return new QuantifiedExpression(Quantifier.SOME, new ArrayList<>( - Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison); + return new QuantifiedExpression(Quantifier.SOME, + new ArrayList<>(Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), + comparison); } else { comparison.addOperator(OperatorType.NEQ); - return new QuantifiedExpression(Quantifier.EVERY, new ArrayList<>( - Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison); + return new QuantifiedExpression(Quantifier.EVERY, + new ArrayList<>(Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), + comparison); } }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java index 6f420b4..c5f0a54 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java @@ -282,9 +282,8 @@ public class SqlppGroupByAggregationSugarVisitor extends AbstractSqlppExpression new FieldAccessor(new FieldAccessor(fromBindingVar, fieldVars.values().iterator().next()), SqlppVariableUtil.toUserDefinedVariableName(usedVar.getVar()))); } else { - throw new CompilationException( - "Cannot resolve alias reference for undefined identifier " + usedVar.getVar().getValue() - + " in " + fieldVars); + throw new CompilationException("Cannot resolve alias reference for undefined identifier " + + usedVar.getVar().getValue() + " in " + fieldVars); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java index 3bd29ef..d1d95ac 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java @@ -248,8 +248,7 @@ public class SqlppInlineUdfsVisitor extends AbstractInlineUdfsVisitor Map<Expression, Expression> varExprMap = new HashMap<>(); for (LetClause lc : letClauses) { // inline let variables one by one iteratively. - lc.setBindingExpr(SqlppRewriteUtil.substituteExpression(lc.getBindingExpr(), - varExprMap, context)); + lc.setBindingExpr(SqlppRewriteUtil.substituteExpression(lc.getBindingExpr(), varExprMap, context)); varExprMap.put(lc.getVarExpr(), lc.getBindingExpr()); } return varExprMap; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java index 6d4816b..f157f4f 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SubstituteGroupbyExpressionWithVariableVisitor.java @@ -60,8 +60,8 @@ public class SubstituteGroupbyExpressionWithVariableVisitor extends AbstractSqlp SubstituteGroupbyExpressionVisitor visitor = new SubstituteGroupbyExpressionVisitor(context, map); // Rewrites LET/HAVING/SELECT clauses. - if(selectBlock.hasLetClausesAfterGroupby()){ - for(LetClause letClause : selectBlock.getLetListAfterGroupby()){ + if (selectBlock.hasLetClausesAfterGroupby()) { + for (LetClause letClause : selectBlock.getLetListAfterGroupby()) { letClause.accept(this, arg); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java index c28029a..04f8bc6 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java @@ -118,9 +118,8 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi SqlppVariableUtil.toUserDefinedVariableName(varName).getValue()); default: // More than one possibilities. - throw new CompilationException( - "Cannot resolve ambiguous alias reference for undefined identifier " + SqlppVariableUtil - .toUserDefinedVariableName(varName).getValue() + " in " + localVars); + throw new CompilationException("Cannot resolve ambiguous alias reference for undefined identifier " + + SqlppVariableUtil.toUserDefinedVariableName(varName).getValue() + " in " + localVars); } } @@ -159,10 +158,9 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi + " because there is no dataverse declared, nor an alias with name " + datasetName + "!"); } //If no available dataset nor in-scope variable to resolve to, we throw an error. - throw new CompilationException( - "Cannot find dataset " + datasetName + " in dataverse " + (dataverseName == null ? - defaultDataverseName : - dataverseName) + " nor an alias with name " + datasetName + "!"); + throw new CompilationException("Cannot find dataset " + datasetName + " in dataverse " + + (dataverseName == null ? defaultDataverseName : dataverseName) + " nor an alias with name " + + datasetName + "!"); } // For a From/Join/UNNEST/Quantifiers binding expression, we resolve the undefined identifier reference as @@ -175,8 +173,8 @@ public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopi private boolean datasetExists(String dataverseName, String datasetName) throws CompilationException { try { - return metadataProvider.findDataset(dataverseName, datasetName) != null || fullyQualifiedDatasetNameExists( - datasetName); + return metadataProvider.findDataset(dataverseName, datasetName) != null + || fullyQualifiedDatasetNameExists(datasetName); } catch (AlgebricksException e) { throw new CompilationException(e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java index 06bb1b9..1ff7c9e 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java @@ -143,8 +143,8 @@ public class FunctionMapUtil { return callExpr; } callExpr.setFunctionSignature(new FunctionSignature(FunctionConstants.ASTERIX_NS, internalFuncName, 1)); - callExpr.setExprList(new ArrayList<>(Collections.singletonList(new ListConstructor( - ListConstructor.Type.ORDERED_LIST_CONSTRUCTOR, callExpr.getExprList())))); + callExpr.setExprList(new ArrayList<>(Collections.singletonList( + new ListConstructor(ListConstructor.Type.ORDERED_LIST_CONSTRUCTOR, callExpr.getExprList())))); return callExpr; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java index 737cc53..bcb131b 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java @@ -274,7 +274,7 @@ public class AbstractSqlppExpressionScopingVisitor extends AbstractSqlppSimpleEx public Expression visit(LimitClause limitClause, ILangExpression arg) throws CompilationException { scopeChecker.pushForbiddenScope(scopeChecker.getCurrentScope()); limitClause.setLimitExpr(visit(limitClause.getLimitExpr(), limitClause)); - if(limitClause.hasOffset()) { + if (limitClause.hasOffset()) { limitClause.setOffset(visit(limitClause.getOffset(), limitClause)); } scopeChecker.popForbiddenScope(); @@ -375,8 +375,8 @@ public class AbstractSqlppExpressionScopingVisitor extends AbstractSqlppSimpleEx // Adds a new encountered alias identifier into a scope private void addNewVarSymbolToScope(Scope scope, VarIdentifier var) throws CompilationException { if (scope.findLocalSymbol(var.getValue()) != null) { - throw new CompilationException("Duplicate alias definitions: " - + SqlppVariableUtil.toUserDefinedName(var.getValue())); + throw new CompilationException( + "Duplicate alias definitions: " + SqlppVariableUtil.toUserDefinedName(var.getValue())); } scope.addNewVarSymbolToScope(var); } @@ -387,8 +387,7 @@ public class AbstractSqlppExpressionScopingVisitor extends AbstractSqlppSimpleEx for (String symbolToBeMerged : symbolsToBeMerged) { if (hostScope.findLocalSymbol(symbolToBeMerged) != null) { throw new CompilationException( - "Duplicate alias definitions: " - + SqlppVariableUtil.toUserDefinedName(symbolToBeMerged)); + "Duplicate alias definitions: " + SqlppVariableUtil.toUserDefinedName(symbolToBeMerged)); } } hostScope.merge(scopeToBeMerged); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorMissingCheckVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorMissingCheckVisitor.java b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorMissingCheckVisitor.java index adedee5..9339e8b 100644 --- a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorMissingCheckVisitor.java +++ b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorMissingCheckVisitor.java @@ -44,8 +44,8 @@ public class EvaluatorMissingCheckVisitor extends ClassVisitor { private static final String TYPE_CHECKER_DESC = "L" + TYPE_CHECKER_CLASS + ";"; private static final String TYPE_CHECKER_NAME = "typeChecker"; private static final String IS_MISSING = "isMissing"; - private static final String TYPECHECK_METHOD_DESC = "(Lorg/apache/hyracks/data/std/api/IPointable;" - + "Lorg/apache/hyracks/data/std/api/IPointable;)Z"; + private static final String TYPECHECK_METHOD_DESC = + "(Lorg/apache/hyracks/data/std/api/IPointable;" + "Lorg/apache/hyracks/data/std/api/IPointable;)Z"; private static final String CONSTRUCTOR = "<init>"; private String className = null; private Label lastAddedLabel = null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorNullCheckVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorNullCheckVisitor.java b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorNullCheckVisitor.java index 30f810b..84bc320 100644 --- a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorNullCheckVisitor.java +++ b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/src/main/java/org/apache/asterix/runtime/evaluators/staticcodegen/EvaluatorNullCheckVisitor.java @@ -31,8 +31,8 @@ public class EvaluatorNullCheckVisitor extends ClassVisitor { + "IFrameTupleReference;Lorg/apache/hyracks/data/std/api/IPointable;)V"; private final static String EVALUATE = "evaluate"; private final static MethodIdentifier METHOD_IDENTIFIER = new MethodIdentifier(EVALUATE, EVALUATE_DESC, null); - private final static String TYPE_CHECKER_CLASS = "org/apache/asterix/runtime/evaluators/staticcodegen/" - + "TypeChecker"; + private final static String TYPE_CHECKER_CLASS = + "org/apache/asterix/runtime/evaluators/staticcodegen/" + "TypeChecker"; private final static String TYPE_CHECKER_DESC = "L" + TYPE_CHECKER_CLASS + ";"; private final static String TYPE_CHECKER_NAME = "typeChecker"; private final static String IS_NULL = "isNull"; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/src/main/java/org/apache/asterix/extension/grammar/GrammarExtensionMojo.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/src/main/java/org/apache/asterix/extension/grammar/GrammarExtensionMojo.java b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/src/main/java/org/apache/asterix/extension/grammar/GrammarExtensionMojo.java index 0abca8a..52b2be5 100644 --- a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/src/main/java/org/apache/asterix/extension/grammar/GrammarExtensionMojo.java +++ b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/src/main/java/org/apache/asterix/extension/grammar/GrammarExtensionMojo.java @@ -61,8 +61,8 @@ public class GrammarExtensionMojo extends AbstractMojo { private static final char OPEN_PAREN = '('; private static final char CLOSE_PAREN = ')'; private static final char SEMICOLON = ';'; - private static final List<Character> SIG_SPECIAL_CHARS = Arrays - .asList(new Character[] { '(', ')', ':', '<', '>', ';', '.' }); + private static final List<Character> SIG_SPECIAL_CHARS = + Arrays.asList(new Character[] { '(', ')', ':', '<', '>', ';', '.' }); private static final String KWCLASS = "class"; private static final String KWIMPORT = "import"; private static final String KWUNIMPORT = "unimport"; @@ -80,8 +80,8 @@ public class GrammarExtensionMojo extends AbstractMojo { private static final String WITH = "with"; private static final String OPTION_TRUE = "true"; private static final String OPTION_FALSE = "false"; - private static final List<String> KEYWORDS = Arrays - .asList(new String[] { KWCLASS, KWIMPORT, KWPACKAGE, PARSER_BEGIN, PARSER_END }); + private static final List<String> KEYWORDS = + Arrays.asList(new String[] { KWCLASS, KWIMPORT, KWPACKAGE, PARSER_BEGIN, PARSER_END }); private static final List<String> EXTENSIONKEYWORDS = Arrays.asList(new String[] { KWIMPORT, KWUNIMPORT, NEWPRODUCTION, NEW_AT_THE_END_PRODUCTION, NEW_AT_THE_END_CLASS_DEFINITION, OVERRIDEPRODUCTION, MERGEPRODUCTION }); @@ -974,8 +974,8 @@ public class GrammarExtensionMojo extends AbstractMojo { int after = block.indexOf(AFTER); if (before >= 0) { // before exists - amendments[beforeIndex] = block.substring(before + BEFORE.length(), - (after >= 0) ? after : block.length() - 1); + amendments[beforeIndex] = + block.substring(before + BEFORE.length(), (after >= 0) ? after : block.length() - 1); if (amendments[beforeIndex].trim().length() == 0) { amendments[beforeIndex] = null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/src/main/java/org/apache/hyracks/maven/plugin/TestDataGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/src/main/java/org/apache/hyracks/maven/plugin/TestDataGeneratorMojo.java b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/src/main/java/org/apache/hyracks/maven/plugin/TestDataGeneratorMojo.java index b56ab47..dc56a29 100644 --- a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/src/main/java/org/apache/hyracks/maven/plugin/TestDataGeneratorMojo.java +++ b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/src/main/java/org/apache/hyracks/maven/plugin/TestDataGeneratorMojo.java @@ -55,7 +55,6 @@ public class TestDataGeneratorMojo extends AbstractMojo { */ File outputDir; - /** * @parameter default-value="${maven.test.skip}" */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGenerator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGenerator.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGenerator.java index 3ae7339..83678a5 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGenerator.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/main/java/org/apache/asterix/lexergenerator/LexerGenerator.java @@ -130,8 +130,7 @@ public class LexerGenerator { StringBuilder result = new StringBuilder(); Set<String> functions = main.neededAuxFunctions(); for (String token : functions) { - result.append("private int parse_" + token - + "(char currentChar) throws IOException {\n"); + result.append("private int parse_" + token + "(char currentChar) throws IOException {\n"); result.append(tokens.get(token).getNode().toJavaAuxFunction()); result.append("\n}\n\n"); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java index a6d0267..b7aa5e9 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/Fixtures.java @@ -22,28 +22,28 @@ import org.apache.asterix.lexergenerator.rules.Rule; import org.apache.asterix.lexergenerator.rules.RuleChar; public class Fixtures { - static String token_name = "MYTOKEN"; - static String token2_name = "MYTOKEN2"; - static String token_return = "return TOKEN_MYTOKEN;\n"; - static String token2_return = "return TOKEN_MYTOKEN2;\n"; - static String token_parseerror = "return parseError(TOKEN_MYTOKEN);\n"; - static String token_tostring = "! "; - static String rule_action = "myaction"; - static String rule_name = "myrule"; - static String rule_match = "matchCheck("+rule_name+")"; - static String rule2_action = "myaction2"; - static String rule2_name = "myrule2"; - static String rule2_match = "matchCheck2("+rule_name+")"; - - static public Rule createRule(final String name){ - return new Rule(){ - String rule_name = name; - String rule_action = "myaction"; - String rule_match = "matchCheck("+rule_name+")"; + static String token_name = "MYTOKEN"; + static String token2_name = "MYTOKEN2"; + static String token_return = "return TOKEN_MYTOKEN;\n"; + static String token2_return = "return TOKEN_MYTOKEN2;\n"; + static String token_parseerror = "return parseError(TOKEN_MYTOKEN);\n"; + static String token_tostring = "! "; + static String rule_action = "myaction"; + static String rule_name = "myrule"; + static String rule_match = "matchCheck(" + rule_name + ")"; + static String rule2_action = "myaction2"; + static String rule2_name = "myrule2"; + static String rule2_match = "matchCheck2(" + rule_name + ")"; + + static public Rule createRule(final String name) { + return new Rule() { + String rule_name = name; + String rule_action = "myaction"; + String rule_match = "matchCheck(" + rule_name + ")"; @Override - public Rule clone(){ - return Fixtures.createRule(name+"_clone"); + public Rule clone() { + return Fixtures.createRule(name + "_clone"); } @Override @@ -53,20 +53,20 @@ public class Fixtures { @Override public String javaMatch(String action) { - return rule_match+"{"+action+"}"; + return rule_match + "{" + action + "}"; } @Override - public String toString(){ + public String toString() { return rule_name; } }; } - static Rule rule = new Rule(){ + static Rule rule = new Rule() { - public Rule clone(){ + public Rule clone() { return null; } @@ -77,19 +77,19 @@ public class Fixtures { @Override public String javaMatch(String action) { - return rule_match+"{"+action+"}"; + return rule_match + "{" + action + "}"; } @Override - public String toString(){ + public String toString() { return rule_name; } }; - static Rule rule2 = new Rule(){ + static Rule rule2 = new Rule() { - public Rule clone(){ + public Rule clone() { return null; } @@ -100,11 +100,11 @@ public class Fixtures { @Override public String javaMatch(String act) { - return rule2_match+"{"+act+"}"; + return rule2_match + "{" + act + "}"; } @Override - public String toString(){ + public String toString() { return rule2_name; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java index dee1255..da2241c 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAddRuleTest.java @@ -33,16 +33,10 @@ public class LexerNodeAddRuleTest { node.append(rule); node.add(rule2); node.appendTokenName(token_name); - assertEquals(" ( " + rule_name +token_tostring + " || " + rule2_name + token_tostring + " ) ", node.toString()); - assertEquals(rule_match+"{" - +"\n" + rule_action - +"\n" +token_return - +"}" - +rule2_match+"{" - +"\n"+rule2_action - +"\n"+token_return - +"}" - +token_parseerror , node.toJava()); + assertEquals(" ( " + rule_name + token_tostring + " || " + rule2_name + token_tostring + " ) ", + node.toString()); + assertEquals(rule_match + "{" + "\n" + rule_action + "\n" + token_return + "}" + rule2_match + "{" + "\n" + + rule2_action + "\n" + token_return + "}" + token_parseerror, node.toJava()); } @Test @@ -52,18 +46,11 @@ public class LexerNodeAddRuleTest { node.add(ruleB); node.add(ruleC); node.appendTokenName(token_name); - assertEquals(" ( a" + token_tostring + " || b" + token_tostring + " || c" + token_tostring + " ) ", node.toString()); - assertEquals("switch(currentChar){\n" + - "case 'a':" + - "\n" + ruleABC_action + - "\n" + token_return + - "case 'b':" + - "\n" + ruleABC_action + - "\n" + token_return + - "case 'c':" + - "\n" + ruleABC_action + - "\n" + token_return + - "}\n"+ token_parseerror , node.toJava()); + assertEquals(" ( a" + token_tostring + " || b" + token_tostring + " || c" + token_tostring + " ) ", + node.toString()); + assertEquals("switch(currentChar){\n" + "case 'a':" + "\n" + ruleABC_action + "\n" + token_return + "case 'b':" + + "\n" + ruleABC_action + "\n" + token_return + "case 'c':" + "\n" + ruleABC_action + "\n" + + token_return + "}\n" + token_parseerror, node.toJava()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java index 206e69b..7838f5b 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendNodeTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.*; import org.junit.Test; - import org.apache.asterix.lexergenerator.LexerNode; import org.apache.asterix.lexergenerator.rules.RuleEpsilon; @@ -94,6 +93,6 @@ public class LexerNodeAppendNodeTest { node.append(node2); // TODO // assertEquals(" ( A_clone! A_clone! || A_clone! ) ", node.toString()); - } + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java index e532cf8..28c5e31 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAppendRuleTest.java @@ -31,7 +31,7 @@ public class LexerNodeAppendRuleTest { LexerNode node = new LexerNode(); node.appendTokenName(token_name); assertEquals(token_tostring, node.toString()); - assertEquals(token_return, node.toJava()); + assertEquals(token_return, node.toJava()); } @Test @@ -39,11 +39,9 @@ public class LexerNodeAppendRuleTest { LexerNode node = new LexerNode(); node.append(rule); node.appendTokenName(token_name); - assertEquals(rule_name+token_tostring, node.toString()); - assertEquals(rule_match+"{" - +"\n"+rule_action - +"\n"+token_return - +"}"+token_parseerror, node.toJava()); + assertEquals(rule_name + token_tostring, node.toString()); + assertEquals(rule_match + "{" + "\n" + rule_action + "\n" + token_return + "}" + token_parseerror, + node.toJava()); } @Test @@ -52,14 +50,8 @@ public class LexerNodeAppendRuleTest { node.append(rule); node.append(rule2); node.appendTokenName(token_name); - assertEquals(rule_name+rule2_name+token_tostring, node.toString()); - assertEquals(rule_match+"{" - +"\n"+rule_action - +"\n"+rule2_match+"{" - +"\n"+rule2_action - +"\n"+token_return - +"}" - +token_parseerror - +"}"+token_parseerror, node.toJava()); + assertEquals(rule_name + rule2_name + token_tostring, node.toString()); + assertEquals(rule_match + "{" + "\n" + rule_action + "\n" + rule2_match + "{" + "\n" + rule2_action + "\n" + + token_return + "}" + token_parseerror + "}" + token_parseerror, node.toJava()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java index 677d12e..7fd4aa7 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeAuxFunctionsTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.junit.Test; - import org.apache.asterix.lexergenerator.LexerNode; import org.apache.asterix.lexergenerator.Token; import org.apache.asterix.lexergenerator.rules.RuleEpsilon; @@ -42,16 +41,10 @@ public class LexerNodeAuxFunctionsTest { node.append(rule); node.add(rule2); node.appendTokenName(token_name); - assertEquals(" ( " + rule_name +token_tostring + " || " + rule2_name + token_tostring + " ) ", node.toString()); - assertEquals(rule_match+"{" - +"\n" + rule_action - +"\n" +token_return - +"}" - +rule2_match+"{" - +"\n"+rule2_action - +"\n"+token_return - +"}" - +expectedDifferentReturn , node.toJavaAuxFunction()); + assertEquals(" ( " + rule_name + token_tostring + " || " + rule2_name + token_tostring + " ) ", + node.toString()); + assertEquals(rule_match + "{" + "\n" + rule_action + "\n" + token_return + "}" + rule2_match + "{" + "\n" + + rule2_action + "\n" + token_return + "}" + expectedDifferentReturn, node.toJavaAuxFunction()); } @Test @@ -61,18 +54,11 @@ public class LexerNodeAuxFunctionsTest { node.add(ruleB); node.add(ruleC); node.appendTokenName(token_name); - assertEquals(" ( a" + token_tostring + " || b" + token_tostring + " || c" + token_tostring + " ) ", node.toString()); - assertEquals("switch(currentChar){\n" + - "case 'a':" + - "\n" + ruleABC_action + - "\n" + token_return + - "case 'b':" + - "\n" + ruleABC_action + - "\n" + token_return + - "case 'c':" + - "\n" + ruleABC_action + - "\n" + token_return + - "}\n"+ expectedDifferentReturn , node.toJavaAuxFunction()); + assertEquals(" ( a" + token_tostring + " || b" + token_tostring + " || c" + token_tostring + " ) ", + node.toString()); + assertEquals("switch(currentChar){\n" + "case 'a':" + "\n" + ruleABC_action + "\n" + token_return + "case 'b':" + + "\n" + ruleABC_action + "\n" + token_return + "case 'c':" + "\n" + ruleABC_action + "\n" + + token_return + "}\n" + expectedDifferentReturn, node.toJavaAuxFunction()); } @Test @@ -90,7 +76,7 @@ public class LexerNodeAuxFunctionsTest { assertEquals(expectedNeededAuxFunctions, node.neededAuxFunctions()); } - @Test(expected=Exception.class) + @Test(expected = Exception.class) public void NodeExpandFirstActionError() throws Exception { LexerNode node = new LexerNode(); node.append(ruleA); @@ -104,7 +90,8 @@ public class LexerNodeAuxFunctionsTest { try { node.expandFirstAction(tokens); } catch (Exception e) { - assertEquals("Cannot find a token used as part of another definition, missing token: token1", e.getMessage()); + assertEquals("Cannot find a token used as part of another definition, missing token: token1", + e.getMessage()); throw e; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeMergeNodeTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeMergeNodeTest.java b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeMergeNodeTest.java index caee9a5..a9f6012 100644 --- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeMergeNodeTest.java +++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/src/test/java/org/apache/asterix/lexergenerator/LexerNodeMergeNodeTest.java @@ -67,9 +67,11 @@ public class LexerNodeMergeNodeTest { node2.appendTokenName(token2_name); node.merge(node2); - assertEquals(" ( " + rule_name + token_tostring + " || " + rule2_name + token_tostring + " ) ", node.toString()); - assertEquals(rule_match + "{" + "\n" + rule_action + "\n" + token_return + "}" + rule2_match + "{" + "\n" - + rule2_action + "\n" + token2_return + "}return parseError(TOKEN_MYTOKEN,TOKEN_MYTOKEN2);\n", + assertEquals(" ( " + rule_name + token_tostring + " || " + rule2_name + token_tostring + " ) ", + node.toString()); + assertEquals( + rule_match + "{" + "\n" + rule_action + "\n" + token_return + "}" + rule2_match + "{" + "\n" + + rule2_action + "\n" + token2_return + "}return parseError(TOKEN_MYTOKEN,TOKEN_MYTOKEN2);\n", node.toJava()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java index ca53f66..805e194 100644 --- a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java +++ b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/Generator.java @@ -34,13 +34,8 @@ public class Generator { SUPPORT } - public static void generateSource( - TemplateType tmplType, - String packageName, - RecordType rec, - InputStream is, - StringBuilder sb, - boolean debug) { + public static void generateSource(TemplateType tmplType, String packageName, RecordType rec, InputStream is, + StringBuilder sb, boolean debug) { try { BufferedReader in = new BufferedReader(new InputStreamReader(is)); @@ -63,16 +58,12 @@ public class Generator { } - private static void generateMemoryManagerSource( - String packageName, - RecordType resource, - BufferedReader in, - StringBuilder sb, - boolean debug) throws IOException { + private static void generateMemoryManagerSource(String packageName, RecordType resource, BufferedReader in, + StringBuilder sb, boolean debug) throws IOException { String line = null; String indent = " "; - while((line = in.readLine()) != null) { + while ((line = in.readLine()) != null) { if (line.contains("@PACKAGE@")) { line = line.replace("@PACKAGE@", packageName); } @@ -114,16 +105,12 @@ public class Generator { } } - private static void generateArenaManagerSource( - String packageName, - RecordType resource, - BufferedReader in, - StringBuilder sb, - boolean debug) throws IOException { + private static void generateArenaManagerSource(String packageName, RecordType resource, BufferedReader in, + StringBuilder sb, boolean debug) throws IOException { String line = null; String indent = " "; - while((line = in.readLine()) != null) { + while ((line = in.readLine()) != null) { if (line.contains("@PACKAGE@")) { line = line.replace("@PACKAGE@", packageName); } @@ -152,13 +139,10 @@ public class Generator { } } - private static void generateSupportFileSource( - String packageName, - BufferedReader in, - StringBuilder sb, + private static void generateSupportFileSource(String packageName, BufferedReader in, StringBuilder sb, boolean debug) throws IOException { String line = null; - while((line = in.readLine()) != null) { + while ((line = in.readLine()) != null) { if (line.contains("@PACKAGE@")) { line = line.replace("@PACKAGE@", packageName); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java index 909edc3..e5f50d3 100644 --- a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java +++ b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/src/main/java/org/apache/asterix/recordmanagergenerator/RecordManagerGeneratorMojo.java @@ -68,7 +68,6 @@ public class RecordManagerGeneratorMojo extends AbstractMojo { */ MavenProject project; - String recordManagerTemplate = "RecordManager.java"; String arenaManagerTemplate = "ArenaManager.java"; String[] supportTemplates = { "RecordManagerStats.java", "AllocInfo.java", "TypeUtil.java" }; @@ -101,10 +100,8 @@ public class RecordManagerGeneratorMojo extends AbstractMojo { } public void execute() throws MojoExecutionException, MojoFailureException { - String outputPath = project.getBuild().getDirectory() + File.separator - + "generated-sources" + File.separator - + "java" + File.separator - + packageName.replace('.', File.separatorChar); + String outputPath = project.getBuild().getDirectory() + File.separator + "generated-sources" + File.separator + + "java" + File.separator + packageName.replace('.', File.separatorChar); File dir = new File(outputPath); if (!dir.exists()) { dir.mkdirs(); @@ -122,7 +119,8 @@ public class RecordManagerGeneratorMojo extends AbstractMojo { } } - private void generateSource(Generator.TemplateType mgrType, String template, String recordType, String outputPath) throws MojoFailureException { + private void generateSource(Generator.TemplateType mgrType, String template, String recordType, String outputPath) + throws MojoFailureException { InputStream is = getClass().getClassLoader().getResourceAsStream(template); if (is == null) { throw new MojoFailureException("template '" + template + "' not found in classpath"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java index 3205cb6..9753bcf 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java @@ -110,14 +110,14 @@ public class MetadataBootstrap { private static String metadataNodeName; private static List<String> nodeNames; private static boolean isNewUniverse; - private static final IMetadataIndex[] PRIMARY_INDEXES = new IMetadataIndex[] { - MetadataPrimaryIndexes.DATAVERSE_DATASET, MetadataPrimaryIndexes.DATASET_DATASET, - MetadataPrimaryIndexes.DATATYPE_DATASET, MetadataPrimaryIndexes.INDEX_DATASET, - MetadataPrimaryIndexes.NODE_DATASET, MetadataPrimaryIndexes.NODEGROUP_DATASET, - MetadataPrimaryIndexes.FUNCTION_DATASET, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, - MetadataPrimaryIndexes.FEED_DATASET, MetadataPrimaryIndexes.FEED_POLICY_DATASET, - MetadataPrimaryIndexes.LIBRARY_DATASET, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, - MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET }; + private static final IMetadataIndex[] PRIMARY_INDEXES = + new IMetadataIndex[] { MetadataPrimaryIndexes.DATAVERSE_DATASET, MetadataPrimaryIndexes.DATASET_DATASET, + MetadataPrimaryIndexes.DATATYPE_DATASET, MetadataPrimaryIndexes.INDEX_DATASET, + MetadataPrimaryIndexes.NODE_DATASET, MetadataPrimaryIndexes.NODEGROUP_DATASET, + MetadataPrimaryIndexes.FUNCTION_DATASET, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, + MetadataPrimaryIndexes.FEED_DATASET, MetadataPrimaryIndexes.FEED_POLICY_DATASET, + MetadataPrimaryIndexes.LIBRARY_DATASET, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, + MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET }; private MetadataBootstrap() { } @@ -267,9 +267,9 @@ public class MetadataBootstrap { private static void insertInitialCompactionPolicies(MetadataTransactionContext mdTxnCtx) throws AlgebricksException { - String[] builtInCompactionPolicyClassNames = new String[] { ConstantMergePolicyFactory.class.getName(), - PrefixMergePolicyFactory.class.getName(), NoMergePolicyFactory.class.getName(), - CorrelatedPrefixMergePolicyFactory.class.getName() }; + String[] builtInCompactionPolicyClassNames = + new String[] { ConstantMergePolicyFactory.class.getName(), PrefixMergePolicyFactory.class.getName(), + NoMergePolicyFactory.class.getName(), CorrelatedPrefixMergePolicyFactory.class.getName() }; for (String policyClassName : builtInCompactionPolicyClassNames) { CompactionPolicy compactionPolicy = getCompactionPolicyEntity(policyClassName); MetadataManager.INSTANCE.addCompactionPolicy(mdTxnCtx, compactionPolicy); @@ -289,8 +289,8 @@ public class MetadataBootstrap { private static CompactionPolicy getCompactionPolicyEntity(String compactionPolicyClassName) throws AlgebricksException { try { - String policyName = ((ILSMMergePolicyFactory) (Class.forName(compactionPolicyClassName).newInstance())) - .getName(); + String policyName = + ((ILSMMergePolicyFactory) (Class.forName(compactionPolicyClassName).newInstance())).getName(); return new CompactionPolicy(MetadataConstants.METADATA_DATAVERSE_NAME, policyName, compactionPolicyClassName); } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { @@ -327,13 +327,13 @@ public class MetadataBootstrap { // We are unable to do this since IStorageManager needs a dataset to determine // the appropriate // objects - ILSMOperationTrackerFactory opTrackerFactory = index.isPrimaryIndex() - ? new PrimaryIndexOperationTrackerFactory(datasetId) - : new SecondaryIndexOperationTrackerFactory(datasetId); - ILSMComponentIdGeneratorFactory idGeneratorProvider = new DatasetLSMComponentIdGeneratorFactory( - index.getDatasetId().getId()); - ILSMIOOperationCallbackFactory ioOpCallbackFactory = new LSMBTreeIOOperationCallbackFactory( - idGeneratorProvider); + ILSMOperationTrackerFactory opTrackerFactory = + index.isPrimaryIndex() ? new PrimaryIndexOperationTrackerFactory(datasetId) + : new SecondaryIndexOperationTrackerFactory(datasetId); + ILSMComponentIdGeneratorFactory idGeneratorProvider = + new DatasetLSMComponentIdGeneratorFactory(index.getDatasetId().getId()); + ILSMIOOperationCallbackFactory ioOpCallbackFactory = + new LSMBTreeIOOperationCallbackFactory(idGeneratorProvider); IStorageComponentProvider storageComponentProvider = appContext.getStorageComponentProvider(); if (isNewUniverse()) { LSMBTreeLocalResourceFactory lsmBtreeFactory = new LSMBTreeLocalResourceFactory( @@ -343,8 +343,8 @@ public class MetadataBootstrap { storageComponentProvider.getIoOperationSchedulerProvider(), appContext.getMetadataMergePolicyFactory(), GlobalConfig.DEFAULT_COMPACTION_POLICY_PROPERTIES, true, bloomFilterKeyFields, appContext.getBloomFilterFalsePositiveRate(), true, null); - DatasetLocalResourceFactory dsLocalResourceFactory = new DatasetLocalResourceFactory(datasetId, - lsmBtreeFactory); + DatasetLocalResourceFactory dsLocalResourceFactory = + new DatasetLocalResourceFactory(datasetId, lsmBtreeFactory); // TODO(amoudi) Creating the index should be done through the same code path as // other indexes // This is to be done by having a metadata dataset associated with each index @@ -364,8 +364,8 @@ public class MetadataBootstrap { if (index.getResourceId() != resource.getId()) { throw new HyracksDataException("Resource Id doesn't match expected metadata index resource id"); } - IndexDataflowHelper indexHelper = new IndexDataflowHelper(ncServiceCtx, - storageComponentProvider.getStorageManager(), file); + IndexDataflowHelper indexHelper = + new IndexDataflowHelper(ncServiceCtx, storageComponentProvider.getStorageManager(), file); indexHelper.open(); // Opening the index through the helper will ensure it gets instantiated indexHelper.close(); } @@ -420,8 +420,8 @@ public class MetadataBootstrap { LOGGER.info("Dropped a pending dataverse: " + dataverse.getDataverseName()); } } else { - List<Dataset> datasets = MetadataManager.INSTANCE.getDataverseDatasets(mdTxnCtx, - dataverse.getDataverseName()); + List<Dataset> datasets = + MetadataManager.INSTANCE.getDataverseDatasets(mdTxnCtx, dataverse.getDataverseName()); for (Dataset dataset : datasets) { recoverDataset(mdTxnCtx, dataset); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java index e2724e2..54a69eb 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java @@ -384,7 +384,6 @@ public final class MetadataRecordTypes { public static final int FEED_CONN_APPLIED_FUNCTIONS_FIELD_INDEX = 4; public static final int FEED_CONN_POLICY_FIELD_INDEX = 5; - public static final ARecordType FEED_CONNECTION_RECORDTYPE = createRecordType( // RecordTypeName RECORD_NAME_FEED_CONNECTION, @@ -393,7 +392,7 @@ public final class MetadataRecordTypes { FIELD_NAME_RETURN_TYPE, FIELD_NAME_APPLIED_FUNCTIONS, FIELD_NAME_POLICY_NAME }, // FieldTypes new IAType[] { BuiltinType.ASTRING, BuiltinType.ASTRING, BuiltinType.ASTRING, BuiltinType.ASTRING, - new AUnorderedListType(BuiltinType.ASTRING, null), BuiltinType.ASTRING}, + new AUnorderedListType(BuiltinType.ASTRING, null), BuiltinType.ASTRING }, //IsOpen? true); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java index 3c9e2d2..c6ef6e1 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/AbstractClusterManagementWork.java @@ -39,8 +39,6 @@ public abstract class AbstractClusterManagementWork implements IClusterManagemen this.workId = WorkIdGenerator.getNextWorkId(); } - - private static class WorkIdGenerator { private static AtomicInteger workId = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java index 61a35e3..396ada6 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagementWorkResponse.java @@ -32,7 +32,6 @@ public class ClusterManagementWorkResponse implements IClusterManagementWorkResp this.status = Status.IN_PROGRESS; } - @Override public IClusterManagementWork getWork() { return work; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java index ca22567..66283d6 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java @@ -64,8 +64,8 @@ public abstract class DataSource implements IDataSource<DataSourceId> { } } - public DataSource(DataSourceId id, IAType itemType, IAType metaItemType, byte datasourceType, - INodeDomain domain) throws AlgebricksException { + public DataSource(DataSourceId id, IAType itemType, IAType metaItemType, byte datasourceType, INodeDomain domain) + throws AlgebricksException { this.id = id; this.itemType = itemType; this.metaItemType = metaItemType; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java index 3f3a27f..d682484 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java @@ -48,8 +48,7 @@ public class DatasetDataSource extends DataSource { private Dataset dataset; public DatasetDataSource(DataSourceId id, Dataset dataset, IAType itemType, IAType metaItemType, - byte datasourceType, IDatasetDetails datasetDetails, INodeDomain datasetDomain) - throws AlgebricksException { + byte datasourceType, IDatasetDetails datasetDetails, INodeDomain datasetDomain) throws AlgebricksException { super(id, itemType, metaItemType, datasourceType, datasetDomain); this.dataset = dataset; switch (dataset.getDatasetType()) { @@ -116,9 +115,9 @@ public class DatasetDataSource extends DataSource { int[] minFilterFieldIndexes = createFilterIndexes(minFilterVars, opSchema); int[] maxFilterFieldIndexes = createFilterIndexes(maxFilterVars, opSchema); - return metadataProvider.buildBtreeRuntime(jobSpec, opSchema, typeEnv, context, true, - false, ((DatasetDataSource) dataSource).getDataset(), primaryIndex.getIndexName(), null, null, - true, true, false, minFilterFieldIndexes, maxFilterFieldIndexes); + return metadataProvider.buildBtreeRuntime(jobSpec, opSchema, typeEnv, context, true, false, + ((DatasetDataSource) dataSource).getDataset(), primaryIndex.getIndexName(), null, null, true, + true, false, minFilterFieldIndexes, maxFilterFieldIndexes); default: throw new AlgebricksException("Unknown datasource type"); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java index 6f58b0a..62337ad 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java @@ -297,8 +297,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> } public Dataset findDataset(String dataverse, String dataset) throws AlgebricksException { - String dv = dataverse == null ? (defaultDataverse == null ? null : defaultDataverse.getDataverseName()) - : dataverse; + String dv = + dataverse == null ? (defaultDataverse == null ? null : defaultDataverse.getDataverseName()) : dataverse; if (dv == null) { return null; } @@ -410,10 +410,10 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> public Triple<IOperatorDescriptor, AlgebricksPartitionConstraint, IAdapterFactory> buildFeedIntakeRuntime( JobSpecification jobSpec, Feed feed, FeedPolicyAccessor policyAccessor) throws Exception { Triple<IAdapterFactory, RecordDescriptor, IDataSourceAdapter.AdapterType> factoryOutput; - factoryOutput = FeedMetadataUtil.getFeedFactoryAndOutput(feed, policyAccessor, mdTxnCtx, - getApplicationContext()); - ARecordType recordType = FeedMetadataUtil.getOutputType(feed, - feed.getConfiguration().get(ExternalDataConstants.KEY_TYPE_NAME)); + factoryOutput = + FeedMetadataUtil.getFeedFactoryAndOutput(feed, policyAccessor, mdTxnCtx, getApplicationContext()); + ARecordType recordType = + FeedMetadataUtil.getOutputType(feed, feed.getConfiguration().get(ExternalDataConstants.KEY_TYPE_NAME)); IAdapterFactory adapterFactory = factoryOutput.first; FeedIntakeOperatorDescriptor feedIngestor = null; switch (factoryOutput.third) { @@ -446,14 +446,12 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> if (primaryIndex != null && (dataset.getDatasetType() != DatasetType.EXTERNAL)) { isSecondary = !indexName.equals(primaryIndex.getIndexName()); } - Index theIndex = isSecondary - ? MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), dataset.getDatasetName(), - indexName) - : primaryIndex; + Index theIndex = isSecondary ? MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), + dataset.getDatasetName(), indexName) : primaryIndex; int numPrimaryKeys = dataset.getPrimaryKeys().size(); RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = getSplitProviderAndConstraints(dataset, - theIndex.getIndexName()); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = + getSplitProviderAndConstraints(dataset, theIndex.getIndexName()); int[] primaryKeyFields = new int[numPrimaryKeys]; for (int i = 0; i < numPrimaryKeys; i++) { primaryKeyFields[i] = i; @@ -491,8 +489,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> "Code generation error: no index " + indexName + " for dataset " + dataset.getDatasetName()); } RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = getSplitProviderAndConstraints(dataset, - secondaryIndex.getIndexName()); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = + getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName()); int[] primaryKeyFields = new int[numPrimaryKeys]; for (int i = 0; i < numPrimaryKeys; i++) { primaryKeyFields[i] = i; @@ -501,8 +499,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory( storageComponentProvider, secondaryIndex, IndexOperation.SEARCH, primaryKeyFields); RTreeSearchOperatorDescriptor rtreeSearchOp; - IIndexDataflowHelperFactory indexDataflowHelperFactory = new IndexDataflowHelperFactory( - storageComponentProvider.getStorageManager(), spPc.first); + IIndexDataflowHelperFactory indexDataflowHelperFactory = + new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), spPc.first); if (dataset.getDatasetType() == DatasetType.INTERNAL) { rtreeSearchOp = new RTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, keyFields, true, true, indexDataflowHelperFactory, retainInput, retainMissing, context.getMissingWriterFactory(), @@ -527,8 +525,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> File outFile = new File(fs.getPath()); String nodeId = fs.getNodeName(); - SinkWriterRuntimeFactory runtime = new SinkWriterRuntimeFactory(printColumns, printerFactories, outFile, - getWriterFactory(), inputDesc); + SinkWriterRuntimeFactory runtime = + new SinkWriterRuntimeFactory(printColumns, printerFactories, outFile, getWriterFactory(), inputDesc); AlgebricksPartitionConstraint apc = new AlgebricksAbsolutePartitionConstraint(new String[] { nodeId }); return new Pair<>(runtime, apc); } @@ -577,16 +575,16 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> fieldPermutation[numKeys + 1] = idx; } - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = getSplitProviderAndConstraints( - dataset); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = + getSplitProviderAndConstraints(dataset); long numElementsHint = getCardinalityPerPartitionHint(dataset); // TODO // figure out the right behavior of the bulkload and then give the // right callback // (ex. what's the expected behavior when there is an error during // bulkload?) - IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory( - storageComponentProvider.getStorageManager(), splitsAndConstraint.first); + IIndexDataflowHelperFactory indexHelperFactory = + new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first); LSMIndexBulkLoadOperatorDescriptor btreeBulkLoad = new LSMIndexBulkLoadOperatorDescriptor(spec, null, fieldPermutation, GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, true, indexHelperFactory, null, BulkLoadUsage.LOAD, dataset.getDatasetId()); @@ -703,8 +701,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> numElementsHint = Long.parseLong(numElementsHintString); } int numPartitions = 0; - List<String> nodeGroup = MetadataManager.INSTANCE.getNodegroup(mdTxnCtx, dataset.getNodeGroupName()) - .getNodeNames(); + List<String> nodeGroup = + MetadataManager.INSTANCE.getNodegroup(mdTxnCtx, dataset.getNodeGroupName()).getNodeNames(); IClusterStateManager csm = appCtx.getClusterStateManager(); for (String nd : nodeGroup) { numPartitions += csm.getNodePartitionsCount(nd); @@ -720,9 +718,9 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> getApplicationContext().getServiceContext(), adapterName, configuration, itemType, metaType); // check to see if dataset is indexed - Index filesIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), - dataset.getDatasetName(), - dataset.getDatasetName().concat(IndexingConstants.EXTERNAL_FILE_INDEX_NAME_SUFFIX)); + Index filesIndex = + MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), dataset.getDatasetName(), + dataset.getDatasetName().concat(IndexingConstants.EXTERNAL_FILE_INDEX_NAME_SUFFIX)); if (filesIndex != null && filesIndex.getPendingOp() == 0) { // get files @@ -784,27 +782,26 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> MetadataProvider metadataProvider, boolean retainMissing) throws AlgebricksException { try { // Get data type - ARecordType itemType = (ARecordType) MetadataManager.INSTANCE - .getDatatype(metadataProvider.getMetadataTxnContext(), dataset.getDataverseName(), - dataset.getItemTypeName()) - .getDatatype(); + ARecordType itemType = + (ARecordType) MetadataManager.INSTANCE.getDatatype(metadataProvider.getMetadataTxnContext(), + dataset.getDataverseName(), dataset.getItemTypeName()).getDatatype(); ExternalDatasetDetails datasetDetails = (ExternalDatasetDetails) dataset.getDatasetDetails(); LookupAdapterFactory<?> adapterFactory = AdapterFactoryProvider.getLookupAdapterFactory( getApplicationContext().getServiceContext(), datasetDetails.getProperties(), itemType, ridIndexes, retainInput, retainMissing, context.getMissingWriterFactory()); String fileIndexName = IndexingConstants.getFilesIndexName(dataset.getDatasetName()); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = metadataProvider - .getSplitProviderAndConstraints(dataset, fileIndexName); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = + metadataProvider.getSplitProviderAndConstraints(dataset, fileIndexName); Index fileIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), dataset.getDatasetName(), fileIndexName); // Create the file index data flow helper - IIndexDataflowHelperFactory indexDataflowHelperFactory = new IndexDataflowHelperFactory( - storageComponentProvider.getStorageManager(), spPc.first); + IIndexDataflowHelperFactory indexDataflowHelperFactory = + new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), spPc.first); // Create the out record descriptor, appContext and fileSplitProvider for the // files index RecordDescriptor outRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context); - ISearchOperationCallbackFactory searchOpCallbackFactory = dataset - .getSearchCallbackFactory(storageComponentProvider, fileIndex, IndexOperation.SEARCH, null); + ISearchOperationCallbackFactory searchOpCallbackFactory = + dataset.getSearchCallbackFactory(storageComponentProvider, fileIndex, IndexOperation.SEARCH, null); // Create the operator ExternalLookupOperatorDescriptor op = new ExternalLookupOperatorDescriptor(jobSpec, adapterFactory, outRecDesc, indexDataflowHelperFactory, searchOpCallbackFactory, @@ -865,12 +862,12 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> throw new AlgebricksException("Can only scan datasets of records."); } - ISerializerDeserializer<?> payloadSerde = getDataFormat().getSerdeProvider() - .getSerializerDeserializer(itemType); + ISerializerDeserializer<?> payloadSerde = + getDataFormat().getSerdeProvider().getSerializerDeserializer(itemType); RecordDescriptor scannerDesc = new RecordDescriptor(new ISerializerDeserializer[] { payloadSerde }); - ExternalScanOperatorDescriptor dataScanner = new ExternalScanOperatorDescriptor(jobSpec, scannerDesc, - adapterFactory); + ExternalScanOperatorDescriptor dataScanner = + new ExternalScanOperatorDescriptor(jobSpec, scannerDesc, adapterFactory); AlgebricksPartitionConstraint constraint; try { @@ -896,9 +893,9 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> int i = 0; for (; i < sidxKeyFieldCount; ++i) { - Pair<IAType, Boolean> keyPairType = Index.getNonNullableOpenFieldType(sidxKeyFieldTypes.get(i), - sidxKeyFieldNames.get(i), - (hasMeta && secondaryIndexIndicators.get(i).intValue() == 1) ? metaType : recType); + Pair<IAType, Boolean> keyPairType = + Index.getNonNullableOpenFieldType(sidxKeyFieldTypes.get(i), sidxKeyFieldNames.get(i), + (hasMeta && secondaryIndexIndicators.get(i).intValue() == 1) ? metaType : recType); IAType keyType = keyPairType.first; comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); @@ -936,8 +933,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> List<LogicalVariable> additionalNonFilteringFields) throws AlgebricksException { String datasetName = dataSource.getId().getDatasourceName(); - Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataSource.getId().getDataverseName(), - datasetName); + Dataset dataset = + MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataSource.getId().getDataverseName(), datasetName); int numKeys = keys.size(); int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1; // Move key fields to front. @@ -965,8 +962,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> Index primaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(), dataset.getDatasetName(), dataset.getDatasetName()); - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = getSplitProviderAndConstraints( - dataset); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = + getSplitProviderAndConstraints(dataset); // prepare callback int[] primaryKeyFields = new int[numKeys]; @@ -975,8 +972,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> } IModificationOperationCallbackFactory modificationCallbackFactory = dataset .getModificationCallbackFactory(storageComponentProvider, primaryIndex, indexOp, primaryKeyFields); - IIndexDataflowHelperFactory idfh = new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), - splitsAndConstraint.first); + IIndexDataflowHelperFactory idfh = + new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first); IOperatorDescriptor op; if (bulkload) { long numElementsHint = getCardinalityPerPartitionHint(dataset); @@ -1135,8 +1132,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> dataset.getDatasetName(), indexName); List<List<String>> secondaryKeyExprs = secondaryIndex.getKeyFieldNames(); List<IAType> secondaryKeyTypes = secondaryIndex.getKeyFieldTypes(); - Pair<IAType, Boolean> keyPairType = Index.getNonNullableOpenFieldType(secondaryKeyTypes.get(0), - secondaryKeyExprs.get(0), recType); + Pair<IAType, Boolean> keyPairType = + Index.getNonNullableOpenFieldType(secondaryKeyTypes.get(0), secondaryKeyExprs.get(0), recType); IAType spatialType = keyPairType.first; int dimension = NonTaggedFormatUtil.getNumDimensions(spatialType.getTypeTag()); int numSecondaryKeys = dimension * 2; @@ -1189,14 +1186,14 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> prevFieldPermutation[numKeys] = idx; } } - Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = getSplitProviderAndConstraints( - dataset, secondaryIndex.getIndexName()); + Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = + getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName()); // prepare callback IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory( storageComponentProvider, secondaryIndex, indexOp, modificationCallbackPrimaryKeyFields); - IIndexDataflowHelperFactory indexDataflowHelperFactory = new IndexDataflowHelperFactory( - storageComponentProvider.getStorageManager(), splitsAndConstraint.first); + IIndexDataflowHelperFactory indexDataflowHelperFactory = + new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first); IOperatorDescriptor op; if (bulkload) { long numElementsHint = getCardinalityPerPartitionHint(dataset); @@ -1517,8 +1514,8 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> return null; } IExpressionRuntimeProvider expressionRuntimeProvider = context.getExpressionRuntimeProvider(); - IScalarEvaluatorFactory filterEvalFactory = expressionRuntimeProvider.createEvaluatorFactory(filterExpr, - typeEnv, inputSchemas, context); + IScalarEvaluatorFactory filterEvalFactory = + expressionRuntimeProvider.createEvaluatorFactory(filterExpr, typeEnv, inputSchemas, context); return new AsterixTupleFilterFactory(filterEvalFactory, context.getBinaryBooleanInspectorFactory()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java index 60dd158..ea2d715 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java @@ -586,16 +586,15 @@ public class Dataset implements IMetadataEntity<Dataset>, IDataset { * If the callback factory could not be created */ public IModificationOperationCallbackFactory getModificationCallbackFactory( - IStorageComponentProvider componentProvider, Index index, IndexOperation op, - int[] primaryKeyFields) throws AlgebricksException { + IStorageComponentProvider componentProvider, Index index, IndexOperation op, int[] primaryKeyFields) + throws AlgebricksException { if (index.isPrimaryIndex()) { return op == IndexOperation.UPSERT ? new UpsertOperationCallbackFactory(getDatasetId(), primaryKeyFields, - componentProvider.getTransactionSubsystemProvider(), Operation.get(op), - index.resourceType()) + componentProvider.getTransactionSubsystemProvider(), Operation.get(op), index.resourceType()) : op == IndexOperation.DELETE || op == IndexOperation.INSERT - ? new PrimaryIndexModificationOperationCallbackFactory(getDatasetId(), - primaryKeyFields, componentProvider.getTransactionSubsystemProvider(), - Operation.get(op), index.resourceType()) + ? new PrimaryIndexModificationOperationCallbackFactory(getDatasetId(), primaryKeyFields, + componentProvider.getTransactionSubsystemProvider(), Operation.get(op), + index.resourceType()) : NoOpOperationCallbackFactory.INSTANCE; } else { return op == IndexOperation.DELETE || op == IndexOperation.INSERT || op == IndexOperation.UPSERT @@ -656,8 +655,8 @@ public class Dataset implements IMetadataEntity<Dataset>, IDataset { public IPushRuntimeFactory getCommitRuntimeFactory(MetadataProvider metadataProvider, int[] primaryKeyFieldPermutation, boolean isSink) throws AlgebricksException { int[] datasetPartitions = getDatasetPartitions(metadataProvider); - return new CommitRuntimeFactory(datasetId, primaryKeyFieldPermutation, - metadataProvider.isWriteTransaction(), datasetPartitions, isSink); + return new CommitRuntimeFactory(datasetId, primaryKeyFieldPermutation, metadataProvider.isWriteTransaction(), + datasetPartitions, isSink); } public IFrameOperationCallbackFactory getFrameOpCallbackFactory() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java index 2f9f9cb..48d2908 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java @@ -89,12 +89,12 @@ public class ExternalDatasetDetails implements IDatasetDetails { externalRecordBuilder.reset(MetadataRecordTypes.EXTERNAL_DETAILS_RECORDTYPE); AMutableString aString = new AMutableString(""); - ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ASTRING); - ISerializerDeserializer<ADateTime> dateTimeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); - ISerializerDeserializer<AInt32> intSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT32); + ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + ISerializerDeserializer<ADateTime> dateTimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); + ISerializerDeserializer<AInt32> intSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); // write field 0 fieldValue.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java index 2d2f895..e9e6366 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java @@ -41,14 +41,14 @@ public abstract class AbstractTupleTranslator<T> implements IMetadataEntityTuple private static final long serialVersionUID = 1L; protected AMutableString aString = new AMutableString(""); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ASTRING); + protected ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABOOLEAN); + protected ISerializerDeserializer<ABoolean> booleanSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT32); + protected ISerializerDeserializer<AInt32> int32Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); protected final transient IARecordBuilder recordBuilder; protected final transient ArrayBackedValueStorage fieldValue;
