[1/8] kylin git commit: minor bug fix in removing ext filter from project

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/master aaf3b870c -> 59cb57ca6


minor bug fix in removing ext filter from project


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b6c893db
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b6c893db
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b6c893db

Branch: refs/heads/master
Commit: b6c893dbeefead2523fc686055736526d4f3ca3e
Parents: b2a3861
Author: Hongbin Ma 
Authored: Tue Apr 12 16:01:45 2016 +0800
Committer: Hongbin Ma 
Committed: Wed Apr 13 11:11:15 2016 +0800

--
 .../java/org/apache/kylin/metadata/MetadataManager.java | 12 
 .../apache/kylin/metadata/project/ProjectInstance.java  |  9 +
 2 files changed, 9 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c893db/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index aa249fd..3391ef4 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -143,7 +143,7 @@ public class MetadataManager {
 return Lists.newArrayList(srcTableMap.values());
 }
 
-public List listAllExternalFilters(){
+public List listAllExternalFilters() {
 return Lists.newArrayList(extFilterMap.values());
 }
 
@@ -217,27 +217,23 @@ public class MetadataManager {
 }
 
 public void saveExternalFilter(ExternalFilterDesc desc) throws IOException 
{
-if(desc.getUuid() == null){
+if (desc.getUuid() == null) {
 throw new IllegalArgumentException("UUID not set.");
 }
 String path = desc.getResourcePath();
-getStore().putResource(path,desc,EXTERNAL_FILTER_DESC_SERIALIZER);
+getStore().putResource(path, desc, EXTERNAL_FILTER_DESC_SERIALIZER);
 desc = reloadExternalFilterAt(path);
-extFilterMap.put(desc.getName(),desc);
+extFilterMap.put(desc.getName(), desc);
 
 }
 
 public void removeExternalFilter(String name) throws IOException {
-if(name !=null ){
-name = name.toLowerCase();
-}
 String path = ExternalFilterDesc.concatResourcePath(name);
 getStore().deleteResource(path);
 extFilterMap.remove(name);
 
 }
 
-
 private void init(KylinConfig config) throws IOException {
 this.config = config;
 this.srcTableMap = new CaseInsensitiveStringCache<>(config, 
Broadcaster.TYPE.TABLE);

http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c893db/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
index 9567da3..74f843f 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
@@ -210,9 +210,13 @@ public class ProjectInstance extends RootPersistentEntity {
 public void removeTable(String tableName) {
 tables.remove(tableName.toUpperCase());
 }
+
+public void addExtFilter(String extFilterName){
+this.getExtFilters().add(extFilterName);
+}
 
 public void removeExtFilter(String filterName) {
-extFilters.remove(filterName.toUpperCase());
+extFilters.remove(filterName);
 }
 
 public int getTablesCount() {
@@ -227,9 +231,6 @@ public class ProjectInstance extends RootPersistentEntity {
 return tables;
 }
 
-public void addExtFilter(String extFilterName){
-this.getExtFilters().add(extFilterName.toLowerCase());
-}
 
 public Set getExtFilters(){
 return extFilters;

kylin git commit: minor bug fix in removing ext filter from project

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/yang-m1 c1af3c015 -> 71113643f


minor bug fix in removing ext filter from project


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/71113643
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/71113643
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/71113643

Branch: refs/heads/yang-m1
Commit: 71113643fc3d3137e0baf3edbba513ee0fd47820
Parents: c1af3c0
Author: Hongbin Ma 
Authored: Tue Apr 12 16:04:32 2016 +0800
Committer: Hongbin Ma 
Committed: Tue Apr 12 16:04:32 2016 +0800

--
 .../src/main/java/org/apache/kylin/metadata/MetadataManager.java | 3 ---
 .../java/org/apache/kylin/metadata/project/ProjectInstance.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/71113643/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java 
b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index 9ed1f13..26ee9c4 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -228,9 +228,6 @@ public class MetadataManager {
 }
 
 public void removeExternalFilter(String name) throws IOException {
-if(name !=null ){
-name = name.toLowerCase();
-}
 String path = ExternalFilterDesc.concatResourcePath(name);
 getStore().deleteResource(path);
 extFilterMap.remove(name);

http://git-wip-us.apache.org/repos/asf/kylin/blob/71113643/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
index 9567da3..b488d07 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
@@ -212,7 +212,7 @@ public class ProjectInstance extends RootPersistentEntity {
 }
 
 public void removeExtFilter(String filterName) {
-extFilters.remove(filterName.toUpperCase());
+extFilters.remove(filterName);
 }
 
 public int getTablesCount() {
@@ -228,7 +228,7 @@ public class ProjectInstance extends RootPersistentEntity {
 }
 
 public void addExtFilter(String extFilterName){
-this.getExtFilters().add(extFilterName.toLowerCase());
+this.getExtFilters().add(extFilterName);
 }
 
 public Set getExtFilters(){