Repository: tajo Updated Branches: refs/heads/master 84ff9272e -> 5853b47b4
TAJO-2018: Remove redundant 'String.toString()'. Closes #908 Signed-off-by: Jinho Kim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/5853b47b Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5853b47b Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5853b47b Branch: refs/heads/master Commit: 5853b47b4211bfd5437653eab345c1fcde6259cb Parents: 84ff927 Author: Dongkyu Hwangbo <[email protected]> Authored: Thu Jan 7 14:47:00 2016 +0900 Committer: Jinho Kim <[email protected]> Committed: Thu Jan 7 14:47:00 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../main/java/org/apache/tajo/catalog/NestedPathUtil.java | 2 +- .../org/apache/tajo/catalog/store/HiveCatalogStore.java | 6 +++--- .../org/apache/tajo/catalog/store/AbstractDBStore.java | 10 +++++----- .../java/org/apache/tajo/catalog/MiniCatalogServer.java | 2 +- tajo-core/src/main/resources/webapps/admin/querytasks.jsp | 4 ++-- tajo-core/src/main/resources/webapps/admin/task.jsp | 2 +- .../tajo/plan/function/python/PythonScriptEngine.java | 2 +- .../org/apache/tajo/pullserver/TajoPullServerService.java | 2 +- .../tajo/org/objectweb/asm/util/CheckClassAdapter.java | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 62f889f..2029fe9 100644 --- a/CHANGES +++ b/CHANGES @@ -141,6 +141,8 @@ Release 0.12.0 - unreleased TASKS + TAJO-2018: Remove redundant 'String.toString()'. (Dongkyu Hwangbo via jinho) + TAJO-1705: Update document for index support. (jihoon) TAJO-2028: Refining Hive Integration document including typo. http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/NestedPathUtil.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/NestedPathUtil.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/NestedPathUtil.java index 37dff3d..bf874b9 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/NestedPathUtil.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/NestedPathUtil.java @@ -57,7 +57,7 @@ public class NestedPathUtil { StringBuilder sb = new StringBuilder(); for (int i = startIndex; i < depth; i++) { sb.append(PATH_DELIMITER); - sb.append(parts[i].toString()); + sb.append(parts[i]); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java index b8cd57a..308cda5 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java @@ -165,7 +165,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { if (!isPartitionKey) { String fieldName = databaseName + CatalogConstants.IDENTIFIER_DELIMITER + tableName + CatalogConstants.IDENTIFIER_DELIMITER + eachField.getName(); - TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(eachField.getType().toString()); + TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(eachField.getType()); schema.addColumn(fieldName, dataType); } } @@ -242,7 +242,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { if (partitionKeys.size() > 0) { for (int i = 0; i < partitionKeys.size(); i++) { FieldSchema fieldSchema = partitionKeys.get(i); - TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(fieldSchema.getType().toString()); + TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(fieldSchema.getType()); String fieldName = databaseName + CatalogConstants.IDENTIFIER_DELIMITER + tableName + CatalogConstants.IDENTIFIER_DELIMITER + fieldSchema.getName(); expressionSchema.addColumn(new Column(fieldName, dataType)); @@ -808,7 +808,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { if (partitionKeys.size() > 0) { for (int i = 0; i < partitionKeys.size(); i++) { FieldSchema fieldSchema = partitionKeys.get(i); - TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(fieldSchema.getType().toString()); + TajoDataTypes.Type dataType = HiveCatalogUtil.getTajoFieldType(fieldSchema.getType()); String fieldName = databaseName + CatalogConstants.IDENTIFIER_DELIMITER + tableName + CatalogConstants.IDENTIFIER_DELIMITER + fieldSchema.getName(); expressionSchema.addColumn(new Column(fieldName, dataType)); http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java index c2b9529..99ffcb5 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java @@ -242,7 +242,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo String sql = "SELECT version FROM META"; if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); + LOG.debug(sql); } try (PreparedStatement pstmt = getConnection().prepareStatement(sql); @@ -1402,10 +1402,10 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo String sql = "SELECT TID FROM TABLES WHERE DB_ID = ? AND " + COL_TABLES_NAME + "=?"; if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); + LOG.debug(sql); } - try (PreparedStatement pstmt = getConnection().prepareStatement(sql.toString())) { + try (PreparedStatement pstmt = getConnection().prepareStatement(sql)) { int dbid = getDatabaseId(databaseName); pstmt.setInt(1, dbid); @@ -3006,10 +3006,10 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo String sql = "SELECT COLUMN_NAME FROM " + TB_COLUMNS + " WHERE TID = ? AND COLUMN_NAME = ?"; if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); + LOG.debug(sql); } - try (PreparedStatement pstmt = getConnection().prepareStatement(sql.toString())) { + try (PreparedStatement pstmt = getConnection().prepareStatement(sql)) { pstmt.setInt(1, tableId); pstmt.setString(2, columnName); res = pstmt.executeQuery(); http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/MiniCatalogServer.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/MiniCatalogServer.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/MiniCatalogServer.java index ef398ab..da375b2 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/MiniCatalogServer.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/MiniCatalogServer.java @@ -58,7 +58,7 @@ public class MiniCatalogServer extends CatalogServer { this.start(); catalog = new LocalCatalogWrapper(this); if (!catalog.existTablespace(TajoConstants.DEFAULT_TABLESPACE_NAME)) { - catalog.createTablespace(TajoConstants.DEFAULT_TABLESPACE_NAME, testDir.toString()); + catalog.createTablespace(TajoConstants.DEFAULT_TABLESPACE_NAME, testDir); } if (!catalog.existDatabase(DEFAULT_DATABASE_NAME)) { catalog.createDatabase(DEFAULT_DATABASE_NAME, TajoConstants.DEFAULT_TABLESPACE_NAME); http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-core/src/main/resources/webapps/admin/querytasks.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/admin/querytasks.jsp b/tajo-core/src/main/resources/webapps/admin/querytasks.jsp index f2dc68b..695e304 100644 --- a/tajo-core/src/main/resources/webapps/admin/querytasks.jsp +++ b/tajo-core/src/main/resources/webapps/admin/querytasks.jsp @@ -149,7 +149,7 @@ <div class='contents'> <h2>Tajo Master: <%=masterLabel%> <%=JSPUtil.getMasterActiveLabel(master.getContext())%></h2> <hr/> - <h3><a href='querydetail.jsp?queryId=<%=queryId%>&startTime=<%=startTime%>'><%=ebId.toString()%></a></h3> + <h3><a href='querydetail.jsp?queryId=<%=queryId%>&startTime=<%=startTime%>'><%=ebId%></a></h3> <hr/> <p/> <pre style="white-space:pre-wrap;"><%=stage.getPlan()%></pre> @@ -192,7 +192,7 @@ List<TaskHistory> filteredTasks = new ArrayList<>(); for(TaskHistory eachTask: allTasks) { if (!"ALL".equals(status)) { - if (!status.equals(eachTask.getState().toString())) { + if (!status.equals(eachTask.getState())) { continue; } } http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-core/src/main/resources/webapps/admin/task.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/admin/task.jsp b/tajo-core/src/main/resources/webapps/admin/task.jsp index d3014b1..7da83d3 100644 --- a/tajo-core/src/main/resources/webapps/admin/task.jsp +++ b/tajo-core/src/main/resources/webapps/admin/task.jsp @@ -97,7 +97,7 @@ String dataLocationInfos = ""; delim = ""; for (String eachLocation: task.getDataLocations()) { - dataLocationInfos += delim + eachLocation.toString(); + dataLocationInfos += delim + eachLocation; delim = "<br/>"; } http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java index 0a900cc..05a72fe 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java @@ -253,7 +253,7 @@ public class PythonScriptEngine extends TajoScriptEngine { private static final String PYTHON_LANGUAGE = "python"; private static final String TAJO_UTIL_NAME = "tajo_util.py"; private static final String CONTROLLER_NAME = "controller.py"; - private static final String BASE_DIR = FileUtils.getTempDirectoryPath().toString() + File.separator + "tajo-" + System.getProperty("user.name") + File.separator + "python"; + private static final String BASE_DIR = FileUtils.getTempDirectoryPath() + File.separator + "tajo-" + System.getProperty("user.name") + File.separator + "python"; private static final String PYTHON_CONTROLLER_JAR_PATH = "/python/" + CONTROLLER_NAME; // Relative to root of tajo jar. private static final String PYTHON_TAJO_UTIL_JAR_PATH = "/python/" + TAJO_UTIL_NAME; // Relative to root of tajo jar. http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java ---------------------------------------------------------------------- diff --git a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java index 4a7f2da..cbeba52 100644 --- a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java +++ b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java @@ -655,7 +655,7 @@ public class TajoPullServerService extends AbstractService { writeFuture = ctx.write(response); for (FileChunk chunk : file) { - writeFuture = sendFile(ctx, chunk, request.getUri().toString()); + writeFuture = sendFile(ctx, chunk, request.getUri()); if (writeFuture == null) { sendError(ctx, HttpResponseStatus.NOT_FOUND); return; http://git-wip-us.apache.org/repos/asf/tajo/blob/5853b47b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java ---------------------------------------------------------------------- diff --git a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java index 12e8712..d030099 100644 --- a/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java +++ b/tajo-thirdparty/asm/src/main/java/org/apache/tajo/org/objectweb/asm/util/CheckClassAdapter.java @@ -215,7 +215,7 @@ public class CheckClassAdapter extends ClassVisitor { List<Type> interfaces = new ArrayList<>(); for (Iterator<String> i = cn.interfaces.iterator(); i.hasNext();) { - interfaces.add(Type.getObjectType(i.next().toString())); + interfaces.add(Type.getObjectType(i.next())); } for (int i = 0; i < methods.size(); ++i) {
