You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2014/01/21 03:02:31 UTC
git commit: TAJO-531: Fix warnings in tajo-client. (jinho)
Updated Branches:
refs/heads/master 948915151 -> abda8a0ac
TAJO-531: Fix warnings in tajo-client. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/abda8a0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/abda8a0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/abda8a0a
Branch: refs/heads/master
Commit: abda8a0ac541aedb2180006569d91074b6434e3a
Parents: 9489151
Author: jinossy <ji...@gmail.com>
Authored: Tue Jan 21 11:01:51 2014 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Tue Jan 21 11:01:51 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../main/java/org/apache/tajo/cli/TajoCli.java | 14 +++---
.../java/org/apache/tajo/client/TajoAdmin.java | 53 +++++++++++---------
.../java/org/apache/tajo/client/TajoClient.java | 10 ----
.../org/apache/tajo/jdbc/TajoResultSet.java | 10 ++--
5 files changed, 44 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/abda8a0a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 08a133b..5988ae2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -348,6 +348,8 @@ Release 0.8.0 - unreleased
TASKS
+ TAJO-531: Fix warnings in tajo-client. (jinho)
+
TAJO-478: Add request-patch-review.py that helps submitting patches to
jira and reviewboard. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/abda8a0a/tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java b/tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java
index fb9f515..80188a4 100644
--- a/tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java
+++ b/tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java
@@ -181,7 +181,7 @@ public class TajoCli {
String raw;
String line;
- String accumulatedLine = "";
+ StringBuffer accumulatedLine = new StringBuffer();
String prompt = "tajo";
String curPrompt = prompt;
boolean newStatement = true;
@@ -190,8 +190,8 @@ public class TajoCli {
sout.write("Try \\? for help.\n");
while((raw = reader.readLine(curPrompt + "> ")) != null) {
// each accumulated line has a space delimiter
- if (!accumulatedLine.equals("")) {
- accumulatedLine += ' ';
+ if (accumulatedLine.length() > 0) {
+ accumulatedLine.append(' ');
}
line = raw.trim();
@@ -229,14 +229,14 @@ public class TajoCli {
// reset accumulated lines
newStatement = true;
- accumulatedLine = "";
+ accumulatedLine = new StringBuffer();
curPrompt = prompt;
} else {
line = StringUtils.chomp(raw).trim();
// accumulate a line
- accumulatedLine = accumulatedLine + line;
+ accumulatedLine.append(line);
// replace the latest line with a accumulated line
if (!newStatement) { // if this is not first line, remove one more line.
@@ -245,7 +245,7 @@ public class TajoCli {
newStatement = false;
}
reader.getHistory().removeLast();
- reader.getHistory().add(accumulatedLine);
+ reader.getHistory().add(accumulatedLine.toString());
// use an alternative prompt during accumulating lines
curPrompt = StringUtils.repeat(" ", prompt.length());
@@ -516,7 +516,7 @@ public class TajoCli {
if (!specifier.getExpressions().equals("")) {
sb.append(", expressions:").append(specifier.getExpressions());
} else {
- if (desc.getPartitions().getPartitionsType().name().equals("RANGE"));
+ if (desc.getPartitions().getPartitionsType().name().equals("RANGE"))
sb.append(" expressions: MAXVALUE");
}
sb.append("\n");
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/abda8a0a/tajo-client/src/main/java/org/apache/tajo/client/TajoAdmin.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoAdmin.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoAdmin.java
index e1ac249..98939a5 100644
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoAdmin.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoAdmin.java
@@ -52,7 +52,7 @@ public class TajoAdmin {
final static String line20 = "--------------------";
final static String line25 = "-------------------------";
final static String line30 = "------------------------------";
- final static SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
static {
options = new Options();
@@ -139,16 +139,19 @@ public class TajoAdmin {
}
Writer writer = new PrintWriter(System.out);
- switch(cmdType) {
+ switch (cmdType) {
case 1:
processList(writer, client);
- break;
+ break;
case 2:
processDesc(writer, client);
break;
case 3:
processCluster(writer, client);
break;
+ default:
+ printUsage();
+ break;
}
writer.flush();
@@ -157,9 +160,10 @@ public class TajoAdmin {
System.exit(0);
}
- public static void processDesc(Writer writer, TajoClient client) throws ParseException, IOException, ServiceException, SQLException {
+ public static void processDesc(Writer writer, TajoClient client) throws ParseException, IOException,
+ ServiceException, SQLException {
List<BriefQueryInfo> queryList = client.getQueryList();
-
+ SimpleDateFormat df = new SimpleDateFormat(DATE_FORMAT);
int id = 1;
for (BriefQueryInfo queryInfo : queryList) {
String queryId = String.format("q_%s_%04d",
@@ -182,7 +186,7 @@ public class TajoAdmin {
if (state.equals("RUNNING") == false) {
writer.write("Finished Time: " + df.format(queryInfo.getFinishTime()));
writer.write("\n");
- }
+ }
writer.write("Execution Time: " + executionTime);
writer.write("\n");
writer.write("Query Progress: " + queryInfo.getProgress());
@@ -195,7 +199,8 @@ public class TajoAdmin {
}
}
- public static void processCluster(Writer writer, TajoClient client) throws ParseException, IOException, ServiceException, SQLException {
+ public static void processCluster(Writer writer, TajoClient client) throws ParseException, IOException,
+ ServiceException, SQLException {
List<WorkerResourceInfo> workerList = client.getClusterInfo();
int runningQueryMasterTasks = 0;
@@ -231,14 +236,14 @@ public class TajoAdmin {
String fmtInfo = "%1$-5s %2$-5s %3$-5s%n";
String infoLine = String.format(fmtInfo, "Live", "Dead", "Tasks");
-
+
writer.write("Query Master\n");
writer.write("============\n\n");
writer.write(infoLine);
String line = String.format(fmtInfo, line5, line5, line5);
writer.write(line);
- line = String.format(fmtInfo, liveQueryMasters.size(),
+ line = String.format(fmtInfo, liveQueryMasters.size(),
deadQueryMasters.size(), runningQueryMasterTasks);
writer.write(line);
writer.write("\n");
@@ -257,11 +262,11 @@ public class TajoAdmin {
line5, line10, line10);
writer.write(line);
for (WorkerResourceInfo queryMaster : liveQueryMasters) {
- String queryMasterHost = String.format("%s:%d",
+ String queryMasterHost = String.format("%s:%d",
queryMaster.getAllocatedHost(),
queryMaster.getQueryMasterPort());
String heap = String.format("%d MB", queryMaster.getMaxHeap()/1024/1024);
- line = String.format(fmtQueryMasterLine, queryMasterHost,
+ line = String.format(fmtQueryMasterLine, queryMasterHost,
queryMaster.getClientPort(),
queryMaster.getNumQueryMasterTasks(),
heap, queryMaster.getWorkerStatus());
@@ -282,10 +287,10 @@ public class TajoAdmin {
writer.write(line);
for (WorkerResourceInfo queryMaster : deadQueryMasters) {
- String queryMasterHost = String.format("%s:%d",
+ String queryMasterHost = String.format("%s:%d",
queryMaster.getAllocatedHost(),
queryMaster.getQueryMasterPort());
- line = String.format(fmtQueryMasterLine, queryMasterHost,
+ line = String.format(fmtQueryMasterLine, queryMasterHost,
queryMaster.getClientPort(),
queryMaster.getWorkerStatus());
writer.write(line);
@@ -313,7 +318,7 @@ public class TajoAdmin {
writer.write("No Live Workers\n\n");
} else {
writeWorkerInfo(writer, liveWorkers);
- }
+ }
writer.write("Dead Workers\n");
writer.write("============\n\n");
@@ -324,21 +329,22 @@ public class TajoAdmin {
}
}
- private static void writeWorkerInfo(Writer writer, List<WorkerResourceInfo> workers) throws ParseException, IOException, ServiceException, SQLException {
+ private static void writeWorkerInfo(Writer writer, List<WorkerResourceInfo> workers) throws ParseException,
+ IOException, ServiceException, SQLException {
String fmtWorkerLine = "%1$-25s %2$-5s %3$-5s %4$-10s %5$-10s %6$-12s %7$-10s%n";
- String line = String.format(fmtWorkerLine,
+ String line = String.format(fmtWorkerLine,
"Worker", "Port", "Tasks",
- "Mem", "Disk",
+ "Mem", "Disk",
"Heap", "Status");
writer.write(line);
- line = String.format(fmtWorkerLine,
- line25, line5, line5,
+ line = String.format(fmtWorkerLine,
+ line25, line5, line5,
line10, line10,
line12, line10);
writer.write(line);
for (WorkerResourceInfo worker : workers) {
- String workerHost = String.format("%s:%d",
+ String workerHost = String.format("%s:%d",
worker.getAllocatedHost(),
worker.getPeerRpcPort());
String mem = String.format("%d/%d", worker.getUsedMemoryMB(),
@@ -348,7 +354,7 @@ public class TajoAdmin {
String heap = String.format("%d/%d MB", worker.getFreeHeap()/1024/1024,
worker.getMaxHeap()/1024/1024);
- line = String.format(fmtWorkerLine, workerHost,
+ line = String.format(fmtWorkerLine, workerHost,
worker.getPullServerPort(),
worker.getNumRunningTasks(),
mem, disk, heap, worker.getWorkerStatus());
@@ -357,9 +363,10 @@ public class TajoAdmin {
writer.write("\n\n");
}
- public static void processList(Writer writer, TajoClient client) throws ParseException, IOException, ServiceException, SQLException {
+ public static void processList(Writer writer, TajoClient client) throws ParseException, IOException,
+ ServiceException, SQLException {
List<BriefQueryInfo> queryList = client.getQueryList();
-
+ SimpleDateFormat df = new SimpleDateFormat(DATE_FORMAT);
String fmt = "%1$-20s %2$-7s %3$-20s %4$-30s%n";
String line = String.format(fmt, "QueryId", "State",
"StartTime", "Query");
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/abda8a0a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
index a48142e..cda0608 100644
--- a/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
+++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
@@ -494,14 +494,4 @@ public class TajoClient {
return true;
}
-
- public static void main(String[] args) throws Exception {
- TajoClient client = new TajoClient(new TajoConf());
-
- client.close();
-
- synchronized(client) {
- client.wait();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/abda8a0a/tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java b/tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java
index 1005765..3977d76 100644
--- a/tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java
+++ b/tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java
@@ -19,7 +19,6 @@
package org.apache.tajo.jdbc;
import com.google.common.collect.Lists;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -55,12 +54,13 @@ public class TajoResultSet extends TajoResultSetBase {
}
public TajoResultSet(TajoClient tajoClient, QueryId queryId,
- Configuration conf, TableDesc desc) throws IOException {
- this.schema = desc.getSchema();
+ TajoConf conf, TableDesc desc) throws IOException {
this.tajoClient = tajoClient;
this.queryId = queryId;
if(desc != null) {
- fs = FileScanner.getFileSystem((TajoConf)conf, desc.getPath());
+ this.schema = desc.getSchema();
+
+ fs = FileScanner.getFileSystem(conf, desc.getPath());
this.totalRow = desc.getStats() != null ? desc.getStats().getNumRows() : 0;
Collection<FileFragment> frags = getFragments(desc.getMeta(), desc.getPath());
@@ -75,7 +75,7 @@ public class TajoResultSet extends TajoResultSetBase {
curRow = 0;
}
- class FileNameComparator implements Comparator<FileStatus> {
+ static class FileNameComparator implements Comparator<FileStatus> {
@Override
public int compare(FileStatus f1, FileStatus f2) {