s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 467 - provide JVM heap usage as part of the progress monitor during project creation.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2341 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2011-10-21 16:28:40 +00:00
parent ff7bbc8ec0
commit 9a9f4c1354
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/com/google/refine/importing/ImportingUtilities.java
View File

@ -635,7 +635,7 @@ public class ImportingUtilities {
static public String getEncoding(JSONObject fileRecord) { static public String getEncoding(JSONObject fileRecord) {
String encoding = JSONUtilities.getString(fileRecord, "encoding", null); String encoding = JSONUtilities.getString(fileRecord, "encoding", null);
if (encoding == null) { if (encoding == null || encoding.isEmpty()) {
encoding = JSONUtilities.getString(fileRecord, "declaredEncoding", null); encoding = JSONUtilities.getString(fileRecord, "declaredEncoding", null);
} }
return encoding; return encoding;
@ -942,5 +942,7 @@ public class ImportingUtilities {
} }
JSONUtilities.safePut(progress, "message", message); JSONUtilities.safePut(progress, "message", message);
JSONUtilities.safePut(progress, "percent", percent); JSONUtilities.safePut(progress, "percent", percent);
JSONUtilities.safePut(progress, "memory", Runtime.getRuntime().totalMemory() / 1000000);
JSONUtilities.safePut(progress, "maxmemory", Runtime.getRuntime().maxMemory() / 1000000);
} }
} }

1
main/webapp/modules/core/scripts/index/create-project-progress-panel.html
View File

@ -7,6 +7,7 @@
<tr><td colspan="3"> <tr><td colspan="3">
<button class="button" id="create-project-progress-cancel-button">Cancel</button> <button class="button" id="create-project-progress-cancel-button">Cancel</button>
<span id="create-project-progress-timing"></span> <span id="create-project-progress-timing"></span>
<span id="create-project-progress-memory"></span>
</td></tr> </td></tr>
</table></div> </table></div>
<iframe id="create-project-iframe" name="create-project-iframe"></iframe> <iframe id="create-project-iframe" name="create-project-iframe"></iframe>

1
main/webapp/modules/core/scripts/index/create-project-ui.js
View File

@ -228,6 +228,7 @@ Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID,
$('#create-project-progress-timing').empty(); $('#create-project-progress-timing').empty();
} }
$('#create-project-progress-message').text(progress.message); $('#create-project-progress-message').text(progress.message);
$('#create-project-progress-memory').text("Heap usage: "+progress.memory+'/'+progress.maxmemory+"MB");
} }
}, },
"json" "json"