You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by sh...@apache.org on 2015/12/30 08:10:29 UTC
[10/50] [abbrv] lens git commit: LENS-851 : Fix test failures on
java8 for union queries
LENS-851 : Fix test failures on java8 for union queries
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d820c32a
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d820c32a
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d820c32a
Branch: refs/heads/LENS-581
Commit: d820c32abd7e95bbd47c555772707df2fc2b786b
Parents: c445730
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Tue Nov 24 11:33:25 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Nov 24 11:33:25 2015 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/lens/cube/parse/CandidateFact.java | 2 +-
.../main/java/org/apache/lens/cube/parse/StorageTableResolver.java | 2 +-
.../src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/d820c32a/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateFact.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateFact.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateFact.java
index 8a6aa00..7f81461 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateFact.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CandidateFact.java
@@ -264,7 +264,7 @@ public class CandidateFact implements CandidateTable {
String database = SessionState.get().getCurrentDatabase();
// Add database name prefix for non default database
if (StringUtils.isNotBlank(database) && !"default".equalsIgnoreCase(database)) {
- Set<String> storageTbls = new HashSet<String>();
+ Set<String> storageTbls = new TreeSet<>();
Iterator<String> names = storageTables.iterator();
while (names.hasNext()) {
storageTbls.add(database + "." + names.next());
http://git-wip-us.apache.org/repos/asf/lens/blob/d820c32a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java
index 4db1626..cc8e68c 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageTableResolver.java
@@ -480,7 +480,7 @@ class StorageTableResolver implements ContextRewriter {
i.remove();
continue;
}
- Set<String> storageTables = new LinkedHashSet<String>();
+ Set<String> storageTables = new LinkedHashSet<>();
storageTables.addAll(minimalStorageTables.keySet());
cfact.setStorageTables(storageTables);
http://git-wip-us.apache.org/repos/asf/lens/blob/d820c32a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
index 494f81b..04b7ab1 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
@@ -563,7 +563,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
// Union query
String hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_MONTHS_RANGE_UPTO_HOURS, conf);
System.out.println("HQL:" + hqlQuery);
- ArrayList<String> storages = Lists.newArrayList("c1_testfact", "c3_testfact", "c2_testfact");
+ ArrayList<String> storages = Lists.newArrayList("c1_testfact", "c2_testfact", "c3_testfact");
String expected = getExpectedUnionQuery(cubeName, storages, provider,
"select sum(testcube.alias0)", null, null,
"select sum(testcube.msr2) as `alias0` from ", null, null