Repository: kylin Updated Branches: refs/heads/2.1.x 71589d64f -> ea4edd6a7
Revert "KYLIN-2720 Should not allow user to access to all tables' metadata of a project" This reverts commit c8a0622d64658bf5999120874d7f282ba1cbb713. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ea4edd6a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ea4edd6a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ea4edd6a Branch: refs/heads/2.1.x Commit: ea4edd6a76bb0cb176dbc8e35851c783d7210d04 Parents: 71589d6 Author: Hongbin Ma <mahong...@apache.org> Authored: Tue Aug 1 10:29:33 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Aug 1 10:29:33 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/rest/service/QueryService.java | 56 +------------------- 1 file changed, 2 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ea4edd6a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java index 83acfd8..1c55f6b 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -142,10 +142,6 @@ public class QueryService extends BasicService { private ModelService modelService; @Autowired - @Qualifier("cubeMgmtService") - private CubeService cubeService; - - @Autowired private AclUtil aclUtil; public QueryService() { @@ -513,32 +509,6 @@ public class QueryService extends BasicService { } protected List<TableMeta> getMetadata(CubeManager cubeMgr, String project, boolean cubedOnly) throws SQLException { - //list all tableMetas first - List<TableMeta> tableMetas = listAllMetadata(cubeMgr, project, cubedOnly); - - //get cubes that current user can access to in this project, then get all tables of these cubes. - List<CubeInstance> cubeInstances = cubeService.listAllCubes(null, project, null, true); - Set<TableRef> tableRefs = new HashSet<TableRef>(); - for (CubeInstance cube : cubeInstances) { - tableRefs.addAll(cube.getDescriptor().getModel().getAllTables()); - } - - //filter out tableMetas that current user should not access to - List<TableMeta> filterTableMetas = new ArrayList<TableMeta>(); - for (TableMeta tableMeta : tableMetas) { - String fullTableName = tableMeta.getTABLE_SCHEM() + "." + tableMeta.getTABLE_NAME(); - for (TableRef t : tableRefs) { - if (t.getTableIdentity().equals(fullTableName)) { - filterTableMetas.add(tableMeta); - break; - } - } - } - - return filterTableMetas; - } - - protected List<TableMeta> listAllMetadata(CubeManager cubeMgr, String project, boolean cubedOnly) throws SQLException { Connection conn = null; ResultSet columnMeta = null; @@ -605,33 +575,11 @@ public class QueryService extends BasicService { } public List<TableMetaWithType> getMetadataV2(String project) throws SQLException, IOException { - //list all tableMetas first - List<TableMetaWithType> tableMetas = listAllMetadataV2(getCubeManager(), project, true); - - //get cubes that current user can access to in this project, then get all tables of these cubes. - List<CubeInstance> cubeInstances = cubeService.listAllCubes(null, project, null, true); - Set<TableRef> tableRefs = new HashSet<TableRef>(); - for (CubeInstance cube : cubeInstances) { - tableRefs.addAll(cube.getDescriptor().getModel().getAllTables()); - } - - //filter out tableMetas that current user should not access to - List<TableMetaWithType> filterTableMetas = new ArrayList<TableMetaWithType>(); - for (TableMetaWithType tableMeta : tableMetas) { - String fullTableName = tableMeta.getTABLE_SCHEM() + "." + tableMeta.getTABLE_NAME(); - for (TableRef t : tableRefs) { - if (t.getTableIdentity().equals(fullTableName)) { - filterTableMetas.add(tableMeta); - break; - } - } - } - - return filterTableMetas; + return getMetadataV2(getCubeManager(), project, true); } @SuppressWarnings("checkstyle:methodlength") - protected List<TableMetaWithType> listAllMetadataV2(CubeManager cubeMgr, String project, boolean cubedOnly) + protected List<TableMetaWithType> getMetadataV2(CubeManager cubeMgr, String project, boolean cubedOnly) throws SQLException, IOException { //Message msg = MsgPicker.getMsg();
