Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Add getAllPackageInfoWithoutRefresh

Browse source
This commit is contained in:
1ambda 2017-02-27 17:39:42 +09:00
parent ce5f8c0c0f
commit dbc4f10fd3
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java
View file

@ -145,7 +145,7 @@ public class Helium {
}
private void clearNotExistsPackages() {
Map<String, List<HeliumPackageSearchResult>> all = getAllPackageInfo(false, null);
Map<String, List<HeliumPackageSearchResult>> all = getAllPackageInfoWithoutRefresh();
// clear visualization display order
List<String> packageOrder = heliumConf.getBundleDisplayOrder();
@ -166,6 +166,10 @@ public class Helium {
}
}
public Map<String, List<HeliumPackageSearchResult>> getAllPackageInfoWithoutRefresh() {
return getAllPackageInfo(false, null);
}
public Map<String, List<HeliumPackageSearchResult>> getAllPackageInfo() {
return getAllPackageInfo(true, null);
}
@ -249,7 +253,7 @@ public class Helium {
}
public HeliumPackageSearchResult getEnabledPackageInfo(String packageName) {
Map<String, List<HeliumPackageSearchResult>> infos = getAllPackageInfo();
Map<String, List<HeliumPackageSearchResult>> infos = getAllPackageInfoWithoutRefresh();
List<HeliumPackageSearchResult> packages = infos.get(packageName);
for (HeliumPackageSearchResult pkgSearchResult : packages) {
@ -353,7 +357,7 @@ public class Helium {
allResources = ResourcePoolUtils.getAllResources();
}
for (List<HeliumPackageSearchResult> pkgs : getAllPackageInfo(false, null).values()) {
for (List<HeliumPackageSearchResult> pkgs : getAllPackageInfoWithoutRefresh().values()) {
for (HeliumPackageSearchResult pkg : pkgs) {
if (pkg.getPkg().getType() == HeliumType.APPLICATION && pkg.isEnabled()) {
ResourceSet resources = ApplicationLoader.findRequiredResourceSet(
@ -381,7 +385,7 @@ public class Helium {
* @return ordered list of enabled buildBundle package
*/
public List<HeliumPackage> getBundlePackagesToBundle() {
Map<String, List<HeliumPackageSearchResult>> allPackages = getAllPackageInfo(false, null);
Map<String, List<HeliumPackageSearchResult>> allPackages = getAllPackageInfoWithoutRefresh();
List<String> visOrder = heliumConf.getBundleDisplayOrder();
List<HeliumPackage> orderedBundlePackages = new LinkedList<>();

4
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
View file

@ -122,7 +122,7 @@ public class HeliumTest {
""));
// then
assertEquals(1, helium.getAllPackageInfo(false, null).size());
assertEquals(1, helium.getAllPackageInfoWithoutRefresh().size());
// when
registry1.add(new HeliumPackage(
@ -136,7 +136,7 @@ public class HeliumTest {
""));
// then
assertEquals(1, helium.getAllPackageInfo(false, null).size());
assertEquals(1, helium.getAllPackageInfoWithoutRefresh().size());
assertEquals(2, helium.getAllPackageInfo(true, null).size());
}
}