You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2013/05/27 10:13:16 UTC
svn commit: r1486534 - in
/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube:
metadata/Cube.java parse/AliasReplacer.java parse/CubeQueryConstants.java
parse/CubeQueryContext.java parse/HQLParser.java
Author: amareshwari
Date: Mon May 27 08:13:16 2013
New Revision: 1486534
URL: http://svn.apache.org/r1486534
Log:
Fix lint problems
Modified:
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/metadata/Cube.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/AliasReplacer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryConstants.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryContext.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/HQLParser.java
Modified: hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/metadata/Cube.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/metadata/Cube.java?rev=1486534&r1=1486533&r2=1486534&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/metadata/Cube.java (original)
+++ hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/metadata/Cube.java Mon May 27 08:13:16 2013
@@ -115,7 +115,7 @@ public final class Cube extends Abstract
Constructor<?> constructor;
constructor = clazz.getConstructor(String.class, Map.class);
measure = (CubeMeasure) constructor.newInstance(new Object[]
- {measureName, props});
+ {measureName, props});
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Invalid measure", e);
} catch (SecurityException e) {
@@ -150,7 +150,7 @@ public final class Cube extends Abstract
Constructor<?> constructor;
constructor = clazz.getConstructor(String.class, Map.class);
dim = (CubeDimension) constructor.newInstance(new Object[]
- {dimName, props});
+ {dimName, props});
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Invalid dimension", e);
} catch (SecurityException e) {
Modified: hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/AliasReplacer.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/AliasReplacer.java?rev=1486534&r1=1486533&r2=1486534&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/AliasReplacer.java (original)
+++ hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/AliasReplacer.java Mon May 27 08:13:16 2013
@@ -15,7 +15,7 @@ public class AliasReplacer implements Co
}
@Override
- public void rewriteContext(CubeQueryContext cubeql) throws SemanticException {
+ public void rewriteContext(CubeQueryContext cubeql) throws SemanticException {
// Rewrite the all the columns in the query with table alias prefixed.
// If col1 of table tab1 is accessed, it would be changed as tab1.col1.
@@ -73,7 +73,8 @@ public class AliasReplacer implements Co
updateAggregates(havingAST, cubeql);
}
- private void replaceAliases(ASTNode node, int nodePos, Map<String, String> colToTableAlias) {
+ private void replaceAliases(ASTNode node, int nodePos,
+ Map<String, String> colToTableAlias) {
if (node == null) {
return;
}
@@ -90,22 +91,26 @@ public class AliasReplacer implements Co
if (nodeType == HiveParser.DOT) {
// No need to create a new node, just replace the table name ident
ASTNode aliasNode = (ASTNode) node.getChild(0);
- ASTNode newAliasIdent = new ASTNode(new CommonToken(HiveParser.Identifier, newAlias));
+ ASTNode newAliasIdent = new ASTNode(new CommonToken(
+ HiveParser.Identifier, newAlias));
aliasNode.setChild(0, newAliasIdent);
newAliasIdent.setParent(aliasNode);
} else {
// Just a column ref, we need to make it alias.col
// '.' will become the parent node
ASTNode dot = new ASTNode(new CommonToken(HiveParser.DOT, "."));
- ASTNode aliasIdentNode = new ASTNode(new CommonToken(HiveParser.Identifier, newAlias));
- ASTNode tabRefNode = new ASTNode(new CommonToken(HiveParser.TOK_TABLE_OR_COL, "TOK_TABLE_OR_COL"));
+ ASTNode aliasIdentNode = new ASTNode(new CommonToken(
+ HiveParser.Identifier, newAlias));
+ ASTNode tabRefNode = new ASTNode(new CommonToken(
+ HiveParser.TOK_TABLE_OR_COL, "TOK_TABLE_OR_COL"));
tabRefNode.addChild(aliasIdentNode);
aliasIdentNode.setParent(tabRefNode);
dot.addChild(tabRefNode);
tabRefNode.setParent(dot);
- ASTNode colIdentNode = new ASTNode(new CommonToken(HiveParser.Identifier, colName));
+ ASTNode colIdentNode = new ASTNode(new CommonToken(
+ HiveParser.Identifier, colName));
dot.addChild(colIdentNode);
Modified: hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryConstants.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryConstants.java?rev=1486534&r1=1486533&r2=1486534&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryConstants.java (original)
+++ hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryConstants.java Mon May 27 08:13:16 2013
@@ -7,7 +7,7 @@ public interface CubeQueryConstants {
public static final String VALID_STORAGE_DIM_TABLES = "cube.query.valid." +
"dim.storgaetables";
public static final String DRIVER_SUPPORTED_STORAGES = "cube.query.driver." +
- "supported.storages";
+ "supported.storages";
public static final String FAIL_QUERY_ON_PARTIAL_DATA =
"cube.query.fail.if.data.partial";
public static final String NON_EXISTING_PARTITIONS =
Modified: hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryContext.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryContext.java?rev=1486534&r1=1486533&r2=1486534&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryContext.java (original)
+++ hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/CubeQueryContext.java Mon May 27 08:13:16 2013
@@ -90,10 +90,10 @@ public class CubeQueryContext {
// storage specific
protected Map<CubeFactTable, Map<UpdatePeriod, List<String>>>
factPartitionMap =
- new HashMap<CubeFactTable, Map<UpdatePeriod, List<String>>>();
+ new HashMap<CubeFactTable, Map<UpdatePeriod, List<String>>>();
private final Map<CubeFactTable, Map<UpdatePeriod, List<String>>>
factStorageMap =
- new HashMap<CubeFactTable, Map<UpdatePeriod, List<String>>>();
+ new HashMap<CubeFactTable, Map<UpdatePeriod, List<String>>>();
private final Map<CubeDimensionTable, List<String>> dimStorageMap =
new HashMap<CubeDimensionTable, List<String>>();
private final Map<String, String> storageTableToWhereClause =
@@ -460,7 +460,7 @@ public class CubeQueryContext {
if (validFactTables != null) {
if (!validFactTables.contains(fact.getName().toLowerCase())) {
LOG.info("Not considering the fact table:" + fact + " as it is" +
- " not a valid fact");
+ " not a valid fact");
i.remove();
continue;
}
@@ -915,7 +915,7 @@ public class CubeQueryContext {
if (storageTableMap.get(updatePeriod) == null ||
storageTableMap.get(updatePeriod).isEmpty()) {
throw new SemanticException("No storage table available for fact" +
- fact + " for update period" + updatePeriod);
+ fact + " for update period" + updatePeriod);
}
String storageTable = storageTableMap.get(updatePeriod).get(0);
storageTableToQuery.put(getCube(), storageTable);
Modified: hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/HQLParser.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/HQLParser.java?rev=1486534&r1=1486533&r2=1486534&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/HQLParser.java (original)
+++ hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/cube/parse/HQLParser.java Mon May 27 08:13:16 2013
@@ -335,4 +335,4 @@ public class HQLParser {
return false;
}
-}
\ No newline at end of file
+}