Skip to content

Commit

Permalink
perf improvement for dataset list page
Browse files Browse the repository at this point in the history
  • Loading branch information
@datasetutil
datasetutil committed Sep 28, 2016
1 parent 7a0a9e9 commit 2d15f14
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/sforce/dataset/util/DatasetDownloader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static Map<String,String> getXMD(String EM_NAME, PartnerConnection partne
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Map<String,String> getXMD(String alias, String datasetId,String datasetVersion, PartnerConnection partnerConnection) throws Exception
{
if(datasetId == null || datasetVersion == null || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
if(datasetId == null || datasetId.trim().equalsIgnoreCase("null") || datasetVersion == null || datasetVersion.trim().equalsIgnoreCase("null") || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
return getXMD(alias,partnerConnection);

// partnerConnection.getServerTimestamp();
Expand Down
38 changes: 17 additions & 21 deletions src/main/java/com/sforce/dataset/util/DatasetType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ public String toString() {

@Override
public int compareTo(DatasetType o) {
if(this.edgemartData!=null && o.edgemartData!=null)
{
if (this.edgemartData._createdDateTime > o.edgemartData._createdDateTime)
return 1;
else if (this.edgemartData._createdDateTime < o.edgemartData._createdDateTime)
return -1;
else
return 0;
}
// if(this.edgemartData!=null && o.edgemartData!=null)
// {
// if (this.edgemartData._createdDateTime > o.edgemartData._createdDateTime)
// return 1;
// else if (this.edgemartData._createdDateTime < o.edgemartData._createdDateTime)
// return -1;
// else
// return 0;
// }

if (this._createdDateTime > o._createdDateTime)
return 1;
Expand Down Expand Up @@ -196,9 +196,9 @@ public static Map<String,String> getJsonFiles(Map<String,String> input)

public static PermissionType getPermissionType(DatasetType obj,Map<String,?> input)
{
PermissionType ret = obj.new PermissionType();
if(input!=null && !input.isEmpty())
{
PermissionType ret = obj.new PermissionType();
Object var = input.get("modify");
if(var != null && var instanceof Boolean)
{
Expand All @@ -216,29 +216,27 @@ public static PermissionType getPermissionType(DatasetType obj,Map<String,?> inp
{
ret.view = ((Boolean)var).booleanValue();
}
return ret;
}
return null;
return ret;
}

public static FolderType getFolderType(DatasetType obj,Map<String,?> input)
{
FolderType ret = obj.new FolderType();
if(input!=null && !input.isEmpty())
{
FolderType ret = obj.new FolderType();
ret._uid = (String) input.get("_uid");
ret._type = (String) input.get("_type");
return ret;
}
return null;
return ret;
}

@SuppressWarnings("unchecked")
public static EdgemartDataType getEdgemartDataType(DatasetType obj,Map<String,?> input)
{
EdgemartDataType ret = obj.new EdgemartDataType();
if(input!=null && !input.isEmpty())
{
EdgemartDataType ret = obj.new EdgemartDataType();
ret._uid = (String) input.get("_uid");
Object temp = input.get("_createdDateTime");
if(temp != null && temp instanceof Number)
Expand All @@ -247,23 +245,21 @@ public static EdgemartDataType getEdgemartDataType(DatasetType obj,Map<String,?>
}
ret._type = (String) input.get("_type");
ret._createdBy = DatasetType.getUserType(obj, (Map<String, String>) input.get("_createdBy"));
return ret;
}
return null;
return ret;
}

public static UserType getUserType(DatasetType obj,Map<String,String> input)
{
UserType ret = obj.new UserType();
if(input!=null && !input.isEmpty())
{
UserType ret = obj.new UserType();
ret._type = (String) input.get("_type");
ret._uid = (String) input.get("_uid");
ret.name = (String) input.get("name");
ret.profilePhotoUrl = (String) input.get("profilePhotoUrl");
return ret;
}
return null;
return ret;
}


Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/sforce/dataset/util/XmdUploader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static boolean uploadXmd(String userXmdFile, String datasetAlias, String

URI u = new URI(serviceEndPoint);

if(datasetId == null || datasetVersion == null || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
if(datasetId == null || datasetId.trim().equalsIgnoreCase("null") || datasetVersion == null || datasetVersion.trim().equalsIgnoreCase("null") || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
{

URI listEMURI = new URI(u.getScheme(),u.getUserInfo(), u.getHost(), u.getPort(), "/insights/internal_api/v1.0/esObject/edgemart", "current=true&alias="+datasetAlias,null);
Expand Down Expand Up @@ -190,7 +190,7 @@ public static boolean uploadXmd(String userXmdFile, String datasetAlias, String
System.out.println("Found existing Dataset {"+_alias+"} version {"+datasetVersion+"}, created on {"+createdDateTime+"}, in folder {"+folderID+"}");
}else
{
System.out.println("Dataset {"+_alias+"} not found");
System.out.println("Dataset {"+datasetAlias+"} not found");
return false;
}

Expand Down
33 changes: 26 additions & 7 deletions src/main/webapp/js/finder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,26 @@ $(document).ready(function() {
var currentData = null;
var gettingHistory = false;

listDatasets();
var current = decodeURIComponent(urlParam('current'));

if (current == undefined || isEmpty(current) )
{
current = false;
}else
{
if(current == 'true')
current = true;
else
current = false;
}

listDatasets(current);

});


function listDatasets(){
$.getJSON('list?type=datasetAndApps&current=true',{},function(data){
function listDatasets(current){
$.getJSON('list?type=datasetAndApps&current='+current,{},function(data){
if (typeof data !== 'undefined' && data.length > 0) {
$("#header-count").text('Dataset Count: '+data.length);
printTable(data);
Expand Down Expand Up @@ -77,7 +90,7 @@ function deleteDataset(datasetAlias,datasetId){
<td> \
<span class=\"name\">"+$('<div/>').text(data[i]._createdBy.name).html()+"</span> \
</td> \
<td class=\"hidden-phone\">"+new Date(data[i].edgemartData._createdDateTime).toLocaleString()+"</td> \
<td class=\"hidden-phone\">"+new Date(data[i]._createdDateTime).toLocaleString()+"</td> \
<td class=\"hidden-phone\">"+lastAccessed+"</td> \
<td class=\"hidden-phone\"> \
<div class=\"btn-group\"> \
Expand Down Expand Up @@ -133,7 +146,7 @@ function loadDiv(selobj,url,nameattr,displayattr)
.attr('data-value',obj[nameattr])
.attr('data-selectable','')
.attr('class','option')
.html(obj[displayattr]));
.text(obj[displayattr]));
})
})
.fail(function(jqXHR, textStatus, errorThrown) {
Expand All @@ -146,6 +159,12 @@ function loadDiv(selobj,url,nameattr,displayattr)
});
}

function isEmpty(str) {
return (!str || 0 === str.length);
function urlParam(name){
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
if (results==null){
return null;
}
else{
return results[1] || 0;
}
}
4 changes: 2 additions & 2 deletions src/main/webapp/js/logsfunction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $(document).ready(function() {

var status1 = data[i].status;
if(data[i].params.SERVER_STATUS)
status1 = data[i].status + "&nbsp;|&nbsp;" + data[i].params.SERVER_STATUS;
status1 = data[i].status + " | " + data[i].params.SERVER_STATUS;

var tablerow = $('<tr/>');
if (data[i].status == "FAILED" || data[i].params.SERVER_STATUS == "ERROR")
Expand All @@ -93,7 +93,7 @@ $(document).ready(function() {
.append($('<td/>').text(data[i].name))
.append($('<td/>').text(data[i].startTimeFormatted))
.append($('<td/>').text(endTime))
.append($('<td/>').html(status1))
.append($('<td/>').text(status1))
.append($('<td/>').text(data[i].targetTotalRowCount.toLocaleString()))
.append($('<td/>').html(link))
.append($('<td/>').text(data[i].message))
Expand Down

0 comments on commit 2d15f14

Please sign in to comment.