You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/04/15 21:50:14 UTC
[40/50] [abbrv] incubator-lens git commit: LENS-492: Fix all priority
High warnings
LENS-492: Fix all priority High warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/8f716a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/8f716a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/8f716a7d
Branch: refs/heads/current-release-line
Commit: 8f716a7db9fd080fa92a4f6c5cccdd2e95e8582c
Parents: 127c081
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Apr 10 19:55:37 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Fri Apr 10 19:55:37 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/findbugs-exclude.xml | 8 ++++++++
.../lens/client/jdbc/LensJdbcResultSet.java | 4 ++--
.../lens/cube/metadata/FactPartition.java | 3 ++-
.../lens/cube/parse/CubeQueryContext.java | 15 +++------------
.../apache/lens/cube/parse/JoinResolver.java | 20 +++++++++++---------
.../lens/cube/parse/TestJoinResolver.java | 18 ++++++------------
.../lens/cube/parse/TestQueryRewrite.java | 1 +
.../org/apache/lens/examples/DatabaseUtil.java | 2 +-
.../org/apache/lens/examples/SampleQueries.java | 2 +-
.../java/org/apache/lens/rdd/LensRDDClient.java | 2 +-
.../org/apache/lens/lib/query/CSVSerde.java | 2 +-
.../lens/lib/query/FilePersistentFormatter.java | 3 ++-
.../org/apache/lens/server/LensService.java | 14 +++++++-------
.../server/query/QueryExecutionServiceImpl.java | 2 +-
.../lens/server/session/HiveSessionService.java | 16 ++++++++--------
.../user/PropertyBasedUserConfigLoader.java | 2 +-
pom.xml | 4 ++--
17 files changed, 58 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/checkstyle/src/main/resources/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/checkstyle/src/main/resources/findbugs-exclude.xml b/checkstyle/src/main/resources/findbugs-exclude.xml
index f9c9d52..aade28d 100644
--- a/checkstyle/src/main/resources/findbugs-exclude.xml
+++ b/checkstyle/src/main/resources/findbugs-exclude.xml
@@ -14,4 +14,12 @@
limitations under the License.
-->
<FindBugsFilter>
+ <!-- Enable only high priority warnings -->
+ <Match>
+ <Priority value="2"/>
+ </Match>
+
+ <Match>
+ <Priority value="3"/>
+ </Match>
</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-client/src/main/java/org/apache/lens/client/jdbc/LensJdbcResultSet.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/jdbc/LensJdbcResultSet.java b/lens-client/src/main/java/org/apache/lens/client/jdbc/LensJdbcResultSet.java
index 0e2637c..ee5ed4d 100644
--- a/lens-client/src/main/java/org/apache/lens/client/jdbc/LensJdbcResultSet.java
+++ b/lens-client/src/main/java/org/apache/lens/client/jdbc/LensJdbcResultSet.java
@@ -245,7 +245,7 @@ public class LensJdbcResultSet implements ResultSet {
} else if (obj == null) {
return 0;
} else if (String.class.isInstance(obj)) {
- return Integer.valueOf((String) obj);
+ return Integer.parseInt((String) obj);
}
throw new Exception("Illegal Conversion");
} catch (Exception e) {
@@ -277,7 +277,7 @@ public class LensJdbcResultSet implements ResultSet {
} else if (obj == null) {
return 0;
} else if (String.class.isInstance(obj)) {
- return Long.valueOf((String) obj);
+ return Long.parseLong((String) obj);
}
throw new Exception("Illegal Conversion");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactPartition.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactPartition.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactPartition.java
index 729da30..44c6915 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactPartition.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactPartition.java
@@ -120,8 +120,9 @@ public class FactPartition implements Comparable<FactPartition> {
if (this.partSpec != null) {
if (o.partSpec == null) {
partComp = 1;
+ } else {
+ partComp = this.partSpec.compareTo(o.partSpec);
}
- partComp = this.partSpec.compareTo(o.partSpec);
} else {
if (o.partSpec != null) {
partComp = -1;
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
index 7ea67f4..0df4b2e 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
@@ -781,11 +781,7 @@ public class CubeQueryContext {
} else {
denormTables.addAll(deNormCtx.rewriteDenormctx(null, dimsToQuery, false));
}
- if (dimsToQuery == null) {
- dimsToQuery = pickCandidateDimsToQuery(denormTables);
- } else {
- dimsToQuery.putAll(pickCandidateDimsToQuery(denormTables));
- }
+ dimsToQuery.putAll(pickCandidateDimsToQuery(denormTables));
// Prune join paths once denorm tables are picked
if (autoJoinCtx != null) {
// prune join paths for picked fact and dimensions
@@ -801,14 +797,9 @@ public class CubeQueryContext {
joiningTables.addAll(factJoiningTables);
}
} else {
- joiningTables.addAll(autoJoinCtx.pickOptionalTables(null,
- dimsToQuery != null ? dimsToQuery.keySet() : null, this));
- }
- if (dimsToQuery == null) {
- dimsToQuery = pickCandidateDimsToQuery(joiningTables);
- } else {
- dimsToQuery.putAll(pickCandidateDimsToQuery(joiningTables));
+ joiningTables.addAll(autoJoinCtx.pickOptionalTables(null, dimsToQuery.keySet(), this));
}
+ dimsToQuery.putAll(pickCandidateDimsToQuery(joiningTables));
}
LOG.info("Picked Fact:" + cfacts + " dimsToQuery:" + dimsToQuery);
pickedDimTables = dimsToQuery.values();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
index bf57907..a41424a 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
@@ -937,14 +937,10 @@ class JoinResolver implements ContextRewriter {
public void rewriteContext(CubeQueryContext cubeql) throws SemanticException {
partialJoinConditions = new HashMap<AbstractCubeTable, String>();
tableJoinTypeMap = new HashMap<AbstractCubeTable, JoinType>();
- try {
- resolveJoins(cubeql);
- } catch (HiveException e) {
- throw new SemanticException(e);
- }
+ resolveJoins(cubeql);
}
- private void resolveJoins(CubeQueryContext cubeql) throws HiveException {
+ private void resolveJoins(CubeQueryContext cubeql) throws SemanticException {
QB cubeQB = cubeql.getQb();
boolean joinResolverDisabled =
cubeql.getConf().getBoolean(CubeQueryConfUtil.DISABLE_AUTO_JOINS, CubeQueryConfUtil.DEFAULT_DISABLE_AUTO_JOINS);
@@ -953,7 +949,13 @@ class JoinResolver implements ContextRewriter {
cubeQB.setQbJoinTree(genJoinTree(cubeQB, cubeql.getJoinTree(), cubeql));
}
} else {
- autoResolveJoins(cubeql);
+ try {
+ autoResolveJoins(cubeql);
+ } catch (SemanticException e) {
+ throw e;
+ } catch (HiveException e) {
+ throw new SemanticException(e);
+ }
}
}
@@ -996,6 +998,7 @@ class JoinResolver implements ContextRewriter {
String targetDimTable = cubeql.getQb().getTabNameForAlias(targetDimAlias);
if (targetDimTable == null) {
LOG.warn("Null table for alias " + targetDimAlias);
+ return;
}
target = cubeql.getMetastoreClient().getDimension(targetDimTable);
}
@@ -1029,7 +1032,6 @@ class JoinResolver implements ContextRewriter {
SchemaGraph graph = cubeql.getMetastoreClient().getSchemaGraph();
Map<Aliased<Dimension>, List<SchemaGraph.JoinPath>> multipleJoinPaths =
new LinkedHashMap<Aliased<Dimension>, List<SchemaGraph.JoinPath>>();
- Map<Dimension, String> dimensionAliasMap = new HashMap<Dimension, String>();
// Resolve join path for each dimension accessed in the query
for (Dimension joinee : dimTables) {
@@ -1286,7 +1288,7 @@ class JoinResolver implements ContextRewriter {
cubeql.setJoinCond(joinTree, HQLParser.getString(joinCond));
} else {
// No join condition specified. this should be an error
- new SemanticException(ErrorMsg.NO_JOIN_CONDITION_AVAIABLE);
+ throw new SemanticException(ErrorMsg.NO_JOIN_CONDITION_AVAIABLE);
}
return joinTree;
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-cube/src/test/java/org/apache/lens/cube/parse/TestJoinResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestJoinResolver.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestJoinResolver.java
index dfa178b..cb078e3 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestJoinResolver.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestJoinResolver.java
@@ -578,8 +578,7 @@ public class TestJoinResolver extends TestQueryRewrite {
Assert.fail("Should have failed. "
+ "The table citydim is getting accessed as both chain and without chain ");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
- Assert.assertEquals(e.getCause().getMessage().toLowerCase(),
+ Assert.assertEquals(e.getMessage().toLowerCase(),
"Table citydim is getting accessed via joinchain: citystate and no chain at all".toLowerCase());
}
@@ -590,8 +589,7 @@ public class TestJoinResolver extends TestQueryRewrite {
Assert.fail("Should have failed. "
+ "The table citydim is getting accessed as both chain and without chain ");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
- Assert.assertEquals(e.getCause().getMessage().toLowerCase(),
+ Assert.assertEquals(e.getMessage().toLowerCase(),
"Table citydim is getting accessed via joinchain: citystate and no chain at all".toLowerCase());
}
@@ -604,9 +602,8 @@ public class TestJoinResolver extends TestQueryRewrite {
+ "It's not possible to resolve which statedim is being asked for when cityState and cubeState both end at"
+ " statedim table.");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
Assert.assertEquals(
- e.getCause().getMessage().indexOf("Table statedim has 2 different paths through joinchains"), 0);
+ e.getMessage().indexOf("Table statedim has 2 different paths through joinchains"), 0);
}
// this test case should pass when default qualifiers for dimensions' chains are added
@@ -617,8 +614,7 @@ public class TestJoinResolver extends TestQueryRewrite {
Assert.fail("Should have failed. "
+ "The table statedim is getting accessed as both cubeState and statedim ");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
- Assert.assertEquals(e.getCause().getMessage().toLowerCase(),
+ Assert.assertEquals(e.getMessage().toLowerCase(),
"Table statedim is getting accessed via two different names: [cubestate, statedim]".toLowerCase());
}
// this should pass when default qualifiers are added
@@ -628,8 +624,7 @@ public class TestJoinResolver extends TestQueryRewrite {
Assert.fail("Should have failed. "
+ "The table statedim is getting accessed as both cubeState and statedim ");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
- Assert.assertEquals(e.getCause().getMessage().toLowerCase(),
+ Assert.assertEquals(e.getMessage().toLowerCase(),
"Table statedim is getting accessed via two different names: [citystate, statedim]".toLowerCase());
}
@@ -642,8 +637,7 @@ public class TestJoinResolver extends TestQueryRewrite {
Assert.fail("Should have failed. "
+ "The table citydim is getting accessed as both chain and without chain ");
} catch (SemanticException e) {
- Assert.assertNotNull(e.getCause());
- Assert.assertEquals(e.getCause().getMessage().toLowerCase(),
+ Assert.assertEquals(e.getMessage().toLowerCase(),
"Table citydim is getting accessed via joinchain: citystate and no chain at all".toLowerCase());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryRewrite.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryRewrite.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryRewrite.java
index 6a37756..c4449da 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryRewrite.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryRewrite.java
@@ -89,6 +89,7 @@ public abstract class TestQueryRewrite {
// unreachable
return null;
} catch (SemanticException e) {
+ e.printStackTrace();
return e;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-examples/src/main/java/org/apache/lens/examples/DatabaseUtil.java
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/java/org/apache/lens/examples/DatabaseUtil.java b/lens-examples/src/main/java/org/apache/lens/examples/DatabaseUtil.java
index 6191aa5..f81504e 100644
--- a/lens-examples/src/main/java/org/apache/lens/examples/DatabaseUtil.java
+++ b/lens-examples/src/main/java/org/apache/lens/examples/DatabaseUtil.java
@@ -52,7 +52,7 @@ public final class DatabaseUtil {
Statement statement = con.createStatement();
InputStream file = DatabaseUtil.class.getClassLoader().getResourceAsStream("db-storage-schema.sql");
- BufferedReader reader = new BufferedReader(new InputStreamReader(file));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(file, "UTF-8"));
String line;
while ((line = reader.readLine()) != null) {
if (line.trim().equals("") || line.startsWith("--")) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
index eac0e0b..6c820a4 100644
--- a/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
+++ b/lens-examples/src/main/java/org/apache/lens/examples/SampleQueries.java
@@ -119,7 +119,7 @@ public class SampleQueries {
*/
public void runQueries(String fileName) throws IOException {
InputStream file = SampleMetastore.class.getClassLoader().getResourceAsStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(file));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(file, "UTF-8"));
String query;
while ((query = reader.readLine()) != null) {
if (StringUtils.isBlank(query)) {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java b/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
index ac89eee..cdcdec0 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/rdd/LensRDDClient.java
@@ -373,8 +373,8 @@ public class LensRDDClient {
try {
JavaPairRDD<WritableComparable, HCatRecord> javaPairRDD = HiveTableRDD.createHiveTableRDD(sparkContext,
HIVE_CONF, "default", tempTableName, TEMP_TABLE_PART_COL + "='" + TEMP_TABLE_PART_VAL + "'");
- LOG.info("Created RDD " + resultRDD.name() + " for table " + tempTableName);
resultRDD = javaPairRDD.map(new HCatRecordToObjectListMapper()).rdd();
+ LOG.info("Created RDD " + resultRDD.name() + " for table " + tempTableName);
} catch (IOException e) {
throw new LensException("Error creating RDD for table " + tempTableName, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-query-lib/src/main/java/org/apache/lens/lib/query/CSVSerde.java
----------------------------------------------------------------------
diff --git a/lens-query-lib/src/main/java/org/apache/lens/lib/query/CSVSerde.java b/lens-query-lib/src/main/java/org/apache/lens/lib/query/CSVSerde.java
index 9831456..613d6ba 100644
--- a/lens-query-lib/src/main/java/org/apache/lens/lib/query/CSVSerde.java
+++ b/lens-query-lib/src/main/java/org/apache/lens/lib/query/CSVSerde.java
@@ -330,7 +330,7 @@ public final class CSVSerde extends AbstractSerDe {
StringBuilder unionString = new StringBuilder();
ByteArrayOutputStream tagStream = new ByteArrayOutputStream();
LazyInteger.writeUTF8(tagStream, uoi.getTag(field));
- unionString.append(new String(tagStream.toByteArray()));
+ unionString.append(new String(tagStream.toByteArray(), "UTF-8"));
unionString.append(unionTagFieldSeperator);
unionString.append(serializeField(uoi.getField(field), ois.get(uoi.getTag(field))));
return unionString.toString();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
----------------------------------------------------------------------
diff --git a/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java b/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
index 983580c..96476bf 100644
--- a/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
+++ b/lens-query-lib/src/main/java/org/apache/lens/lib/query/FilePersistentFormatter.java
@@ -126,7 +126,8 @@ public class FilePersistentFormatter extends WrappedFileFormatter implements Per
LOG.info("Processing file:" + entry.getValue().getPath());
BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(persistFs.open(entry.getValue().getPath())));
+ // default encoding in hadoop filesystem is utf-8
+ in = new BufferedReader(new InputStreamReader(persistFs.open(entry.getValue().getPath()), "UTF-8"));
String row = in.readLine();
while (row != null) {
writeRow(row);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-server/src/main/java/org/apache/lens/server/LensService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensService.java b/lens-server/src/main/java/org/apache/lens/server/LensService.java
index 2126a31..bd8699b 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensService.java
@@ -72,7 +72,7 @@ public abstract class LensService extends CompositeService implements Externaliz
// Static session map which is used by query submission thread to get the
// lens session before submitting a query to hive server
/** The session map. */
- protected static ConcurrentHashMap<String, LensSessionHandle> sessionMap
+ protected static final ConcurrentHashMap<String, LensSessionHandle> SESSION_MAP
= new ConcurrentHashMap<String, LensSessionHandle>();
/**
@@ -148,7 +148,7 @@ public abstract class LensService extends CompositeService implements Externaliz
}
LensSessionHandle lensSession = new LensSessionHandle(sessionHandle.getHandleIdentifier().getPublicId(),
sessionHandle.getHandleIdentifier().getSecretId());
- sessionMap.put(lensSession.getPublicId().toString(), lensSession);
+ SESSION_MAP.put(lensSession.getPublicId().toString(), lensSession);
return lensSession;
}
@@ -168,7 +168,7 @@ public abstract class LensService extends CompositeService implements Externaliz
new HashMap<String, String>());
LensSessionHandle restoredSession = new LensSessionHandle(restoredHandle.getHandleIdentifier().getPublicId(),
restoredHandle.getHandleIdentifier().getSecretId());
- sessionMap.put(restoredSession.getPublicId().toString(), restoredSession);
+ SESSION_MAP.put(restoredSession.getPublicId().toString(), restoredSession);
} catch (HiveSQLException e) {
throw new LensException("Error restoring session " + sessionHandle, e);
}
@@ -212,7 +212,7 @@ public abstract class LensService extends CompositeService implements Externaliz
public void closeSession(LensSessionHandle sessionHandle) throws LensException {
try {
cliService.closeSession(getHiveSessionHandle(sessionHandle));
- sessionMap.remove(sessionHandle.getPublicId().toString());
+ SESSION_MAP.remove(sessionHandle.getPublicId().toString());
} catch (Exception e) {
throw new LensException(e);
}
@@ -260,7 +260,7 @@ public abstract class LensService extends CompositeService implements Externaliz
* @param sessionHandle public UUID of the session
*/
public void acquire(String sessionHandle) {
- LensSessionHandle handle = sessionMap.get(sessionHandle);
+ LensSessionHandle handle = SESSION_MAP.get(sessionHandle);
if (handle == null) {
throw new NotFoundException("Session handle not found " + sessionHandle);
@@ -288,7 +288,7 @@ public abstract class LensService extends CompositeService implements Externaliz
* @throws LensException if session cannot be released
*/
public void release(String sessionHandle) throws LensException {
- LensSessionHandle handle = sessionMap.get(sessionHandle);
+ LensSessionHandle handle = SESSION_MAP.get(sessionHandle);
if (handle != null) {
getSession(handle).release();
}
@@ -301,7 +301,7 @@ public abstract class LensService extends CompositeService implements Externaliz
* @return the session handle
*/
protected LensSessionHandle getSessionHandle(String sessionid) {
- return sessionMap.get(sessionid);
+ return SESSION_MAP.get(sessionid);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
index d531010..b44ce7e 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
@@ -971,7 +971,7 @@ public class QueryExecutionServiceImpl extends LensService implements QueryExecu
synchronized (allQueries) {
for (QueryContext ctx : allQueries.values()) {
try {
- if (sessionMap.containsKey(ctx.getLensSessionIdentifier())) {
+ if (SESSION_MAP.containsKey(ctx.getLensSessionIdentifier())) {
// try setting configuration if the query session is still not closed
ctx.setConf(getLensConf(getSessionHandle(ctx.getLensSessionIdentifier()), ctx.getLensConf()));
} else {
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
index 754cf23..e4fb812 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/HiveSessionService.java
@@ -232,8 +232,8 @@ public class HiveSessionService extends LensService implements SessionService {
String[] auxJars = getSession(sessionid).getSessionConf().getStrings(LensConfConstants.AUX_JARS);
if (auxJars != null) {
- LOG.info("Adding aux jars:" + auxJars);
for (String jar : auxJars) {
+ LOG.info("Adding aux jar:" + jar);
addResourceToAllServices(sessionid, "jar", jar);
}
}
@@ -242,7 +242,7 @@ public class HiveSessionService extends LensService implements SessionService {
@Override
public boolean isOpen(LensSessionHandle sessionHandle) {
- return sessionMap.containsKey(sessionHandle);
+ return SESSION_MAP.containsKey(sessionHandle.getPublicId().toString());
}
/**
@@ -407,12 +407,12 @@ public class HiveSessionService extends LensService implements SessionService {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
// Write out all the sessions
- out.writeInt(sessionMap.size());
- for (LensSessionHandle sessionHandle : sessionMap.values()) {
+ out.writeInt(SESSION_MAP.size());
+ for (LensSessionHandle sessionHandle : SESSION_MAP.values()) {
LensSessionImpl session = getSession(sessionHandle);
session.getLensSessionPersistInfo().writeExternal(out);
}
- LOG.info("Session service pesristed " + sessionMap.size() + " sessions");
+ LOG.info("Session service pesristed " + SESSION_MAP.size() + " sessions");
}
/*
@@ -429,9 +429,9 @@ public class HiveSessionService extends LensService implements SessionService {
LensSessionImpl.LensSessionPersistInfo persistInfo = new LensSessionImpl.LensSessionPersistInfo();
persistInfo.readExternal(in);
restorableSessions.add(persistInfo);
- sessionMap.put(persistInfo.getSessionHandle().getPublicId().toString(), persistInfo.getSessionHandle());
+ SESSION_MAP.put(persistInfo.getSessionHandle().getPublicId().toString(), persistInfo.getSessionHandle());
}
- LOG.info("Session service recovered " + sessionMap.size() + " sessions");
+ LOG.info("Session service recovered " + SESSION_MAP.size() + " sessions");
}
/**
@@ -474,7 +474,7 @@ public class HiveSessionService extends LensService implements SessionService {
* Run internal.
*/
public void runInternal() {
- List<LensSessionHandle> sessionsToRemove = new ArrayList<LensSessionHandle>(sessionMap.values());
+ List<LensSessionHandle> sessionsToRemove = new ArrayList<LensSessionHandle>(SESSION_MAP.values());
Iterator<LensSessionHandle> itr = sessionsToRemove.iterator();
while (itr.hasNext()) {
LensSessionHandle sessionHandle = itr.next();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/lens-server/src/main/java/org/apache/lens/server/user/PropertyBasedUserConfigLoader.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/user/PropertyBasedUserConfigLoader.java b/lens-server/src/main/java/org/apache/lens/server/user/PropertyBasedUserConfigLoader.java
index 46a0e37..16a9a70 100644
--- a/lens-server/src/main/java/org/apache/lens/server/user/PropertyBasedUserConfigLoader.java
+++ b/lens-server/src/main/java/org/apache/lens/server/user/PropertyBasedUserConfigLoader.java
@@ -54,7 +54,7 @@ public class PropertyBasedUserConfigLoader extends UserConfigLoader {
+ "Please set property " + LensConfConstants.USER_RESOLVER_PROPERTYBASED_FILENAME);
}
try {
- properties.load(new InputStreamReader(new FileInputStream(new File(filename))));
+ properties.load(new InputStreamReader(new FileInputStream(new File(filename)), "UTF-8"));
} catch (IOException e) {
throw new UserConfigLoaderException("property file not found. Provided path was: " + filename);
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/8f716a7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e42144..1ffb135 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<war.plugin.version>2.1.1</war.plugin.version>
<license.plugin.version>2.6</license.plugin.version>
<buildnumber.plugin.version>1.0</buildnumber.plugin.version>
- <findbugs.plugin.version>3.0.1</findbugs.plugin.version>
+ <findbugs.plugin.version>2.5.5</findbugs.plugin.version>
<!-- debian -->
<mvn.deb.build.dir>${project.build.directory}/debian</mvn.deb.build.dir>
@@ -577,7 +577,7 @@
<configuration>
<xmlOutput>true</xmlOutput>
<excludeFilterFile>checkstyle/src/main/resources/findbugs-exclude.xml</excludeFilterFile>
- <failOnError>false</failOnError>
+ <failOnError>true</failOnError>
<skip>${skipCheck}</skip>
</configuration>
<executions>