From 93a3d0970662bea90a4eeee4a0a3705df602a457 Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Fri, 11 Dec 2015 17:56:10 +0900 Subject: [PATCH 1/3] initial commit --- .../java/org/apache/tajo/catalog/NestedPathUtil.java | 2 +- .../apache/tajo/catalog/store/HiveCatalogStore.java | 6 +++--- .../org/apache/tajo/catalog/store/AbstractDBStore.java | 10 +++++----- .../org/apache/tajo/catalog/MiniCatalogServer.java | 2 +- .../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 +- .../apache/tajo/pullserver/TajoPullServerService.java | 4 ++-- .../tajo/org/objectweb/asm/util/CheckClassAdapter.java | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) 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 37dff3dad6..bf874b95b0 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 static String makePath(String[] parts, int startIndex, int depth) { 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(); 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 ae77a1f248..2b7b5047f2 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 @@ -166,7 +166,7 @@ public final CatalogProtos.TableDescProto getTable(String databaseName, final St 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); } } @@ -243,7 +243,7 @@ public final CatalogProtos.TableDescProto getTable(String databaseName, final St 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)); @@ -809,7 +809,7 @@ public CatalogProtos.PartitionMethodProto getPartitionMethod(String databaseName 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)); 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 88d4d60f9d..a3dc9ee32c 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 @@ -243,7 +243,7 @@ private int getSchemaVersion() { String sql = "SELECT version FROM META"; if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); + LOG.debug(sql); } try (PreparedStatement pstmt = getConnection().prepareStatement(sql); @@ -1403,10 +1403,10 @@ public boolean existTable(String databaseName, final String tableName) throws Un 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); @@ -3007,10 +3007,10 @@ private boolean existColumn(final int tableId, final String columnName) { 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(); 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 ef398ab1b9..da375b2ab3 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 @@ private void initAndStart() { 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); diff --git a/tajo-core/src/main/resources/webapps/admin/querytasks.jsp b/tajo-core/src/main/resources/webapps/admin/querytasks.jsp index f2dc68b190..695e30474a 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 @@

Tajo Master: <%=masterLabel%> <%=JSPUtil.getMasterActiveLabel(master.getContext())%>

-

<%=ebId.toString()%>

+

<%=ebId%>

<%=stage.getPlan()%>
@@ -192,7 +192,7 @@ List filteredTasks = new ArrayList<>(); for(TaskHistory eachTask: allTasks) { if (!"ALL".equals(status)) { - if (!status.equals(eachTask.getState().toString())) { + if (!status.equals(eachTask.getState())) { continue; } } diff --git a/tajo-core/src/main/resources/webapps/admin/task.jsp b/tajo-core/src/main/resources/webapps/admin/task.jsp index d3014b15e6..7da83d3d54 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 = "
"; } 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 19a4ac2338..5130bd2718 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 @@ private static List getFunctions(InputStream is) throws IOExceptio 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. 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 4a7f2dad8d..0ccae5b9dd 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 @@ -510,7 +510,7 @@ public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) sendError(ctx, request.getDecoderResult().toString(), HttpResponseStatus.BAD_REQUEST); return; } - + if (request.getMethod() == HttpMethod.DELETE) { HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NO_CONTENT); ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); @@ -655,7 +655,7 @@ public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) 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; 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 12e8712a94..d030099a7c 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 static void verify(final ClassReader cr, final ClassLoader loader, List interfaces = new ArrayList<>(); for (Iterator 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) { From 3f4b2ce45fdb26b99c4e9b09118020091ce85df6 Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Mon, 4 Jan 2016 15:11:49 +0900 Subject: [PATCH 2/3] rollback unnecessarily changed --- .../java/org/apache/tajo/pullserver/TajoPullServerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0ccae5b9dd..cbeba5287c 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 @@ -510,7 +510,7 @@ public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) sendError(ctx, request.getDecoderResult().toString(), HttpResponseStatus.BAD_REQUEST); return; } - + if (request.getMethod() == HttpMethod.DELETE) { HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NO_CONTENT); ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); From d29d82ecdca4fb9a945caa7834fe0c94224fbc2e Mon Sep 17 00:00:00 2001 From: Dongkyu Hwangbo Date: Tue, 5 Jan 2016 20:37:39 +0900 Subject: [PATCH 3/3] travis trigger