You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/04/16 16:12:04 UTC
svn commit: r765645 - in
/incubator/pivot/trunk/demos/src/pivot/demos/million: LargeData.java
large_data.wtkx
Author: gbrown
Date: Thu Apr 16 14:12:04 2009
New Revision: 765645
URL: http://svn.apache.org/viewvc?rev=765645&view=rev
Log:
Update 'millon record challenge' demo to use CSVSerializer.StreamIterator.
Modified:
incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java
incubator/pivot/trunk/demos/src/pivot/demos/million/large_data.wtkx
Modified: incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java?rev=765645&r1=765644&r2=765645&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java Thu Apr 16 14:12:04 2009
@@ -16,14 +16,16 @@
*/
package pivot.demos.million;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
+import pivot.collections.ArrayList;
import pivot.collections.Dictionary;
import pivot.collections.List;
import pivot.serialization.CSVSerializer;
-import pivot.util.concurrent.Task;
-import pivot.util.concurrent.TaskListener;
-import pivot.web.GetQuery;
+import pivot.serialization.SerializationException;
import pivot.wtk.Application;
import pivot.wtk.ApplicationContext;
import pivot.wtk.Button;
@@ -34,25 +36,117 @@
import pivot.wtk.PushButton;
import pivot.wtk.TableView;
import pivot.wtk.TableViewHeader;
-import pivot.wtk.TaskAdapter;
import pivot.wtk.Window;
import pivot.wtkx.WTKXSerializer;
public class LargeData implements Application {
+ private class LoadDataCallback implements Runnable {
+ private class AddRowsCallback implements Runnable {
+ private ArrayList<Object> page;
+
+ public AddRowsCallback(ArrayList<Object> page) {
+ this.page = page;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void run() {
+ List<Object> tableData = (List<Object>)tableView.getTableData();
+ for (Object item : page) {
+ tableData.add(item);
+ }
+ }
+ }
+
+ private URL fileURL;
+
+ public LoadDataCallback(URL fileURL) {
+ this.fileURL = fileURL;
+ }
+
+ public void run() {
+ Exception fault = null;
+
+ long t0 = System.currentTimeMillis();
+
+ int i = 0;
+ try {
+ InputStream inputStream = null;
+
+ try {
+ inputStream = fileURL.openStream();
+
+ CSVSerializer csvSerializer = new CSVSerializer("ISO-8859-1");
+ csvSerializer.getKeys().add("c0");
+ csvSerializer.getKeys().add("c1");
+ csvSerializer.getKeys().add("c2");
+ csvSerializer.getKeys().add("c3");
+
+ CSVSerializer.StreamIterator streamIterator = csvSerializer.getStreamIterator(inputStream);
+
+ ArrayList<Object> page = new ArrayList<Object>(PAGE_SIZE);
+ while (streamIterator.hasNext()
+ && !abort) {
+ Object item = streamIterator.next();
+ if (item != null) {
+ page.add(item);
+ }
+ i++;
+
+ if (!streamIterator.hasNext()
+ || page.getLength() == PAGE_SIZE) {
+ ApplicationContext.queueCallback(new AddRowsCallback(page));
+ page = new ArrayList<Object>(PAGE_SIZE);
+ }
+ }
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ } catch(IOException exception) {
+ fault = exception;
+ } catch(SerializationException exception) {
+ fault = exception;
+ }
+
+ long t1 = System.currentTimeMillis();
+
+ final String status;
+ if (abort) {
+ status = "Aborted";
+ } else if (fault != null) {
+ status = fault.getMessage();
+ } else {
+ status = "Read " + i + " rows in " + (t1 - t0) + "ms";
+ }
+
+ ApplicationContext.queueCallback(new Runnable() {
+ public void run() {
+ statusLabel.setText(status);
+ loadDataButton.setEnabled(true);
+ cancelButton.setEnabled(false);
+ }
+ });
+ }
+ }
+
private String basePath = null;
private Window window = null;
private ListButton fileListButton = null;
private PushButton loadDataButton = null;
+ private PushButton cancelButton = null;
private Label statusLabel = null;
private TableView tableView = null;
private TableViewHeader tableViewHeader = null;
- private GetQuery getQuery = null;
private CSVSerializer csvSerializer;
+ private volatile boolean abort = false;
+
private static final String BASE_PATH_KEY = "basePath";
+ private static final int PAGE_SIZE = 100;
public LargeData() {
csvSerializer = new CSVSerializer("ISO-8859-1");
@@ -77,11 +171,23 @@
loadDataButton = (PushButton)wtkxSerializer.getObjectByName("loadDataButton");
loadDataButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
- button.setEnabled(false);
+ loadDataButton.setEnabled(false);
+ cancelButton.setEnabled(true);
+
loadData();
}
});
+ cancelButton = (PushButton)wtkxSerializer.getObjectByName("cancelButton");
+ cancelButton.getButtonPressListeners().add(new ButtonPressListener() {
+ public void buttonPressed(Button button) {
+ abort = true;
+
+ loadDataButton.setEnabled(true);
+ cancelButton.setEnabled(false);
+ }
+ });
+
statusLabel = (Label)wtkxSerializer.getObjectByName("statusLabel");
tableView = (TableView)wtkxSerializer.getObjectByName("tableView");
@@ -113,40 +219,28 @@
}
private void loadData() {
+ abort = false;
+ tableView.getTableData().clear();
+
String fileName = (String)fileListButton.getSelectedItem();
URL origin = ApplicationContext.getOrigin();
- System.out.println(origin);
-
- getQuery = new GetQuery(origin.getHost(), origin.getPort(), basePath + fileName, false);
- String location = getQuery.getLocation().toString();
- statusLabel.setText("Loading data from " + location);
- System.out.println(location);
-
- getQuery.setSerializer(csvSerializer);
- final long startTime = System.currentTimeMillis();
-
- getQuery.execute(new TaskAdapter<Object>(new TaskListener<Object>() {
- public void taskExecuted(Task<Object> task) {
- if (task == getQuery) {
- long endTime = System.currentTimeMillis();
- statusLabel.setText("Data loaded in " + (endTime - startTime) + " ms.");
-
- tableView.setTableData((List<?>)task.getResult());
-
- getQuery = null;
- loadDataButton.setEnabled(true);
- }
- }
-
- public void executeFailed(Task<Object> task) {
- if (task == getQuery) {
- statusLabel.setText(task.getFault().getMessage());
- getQuery = null;
- loadDataButton.setEnabled(true);
- }
- }
- }));
+ URL fileURL = null;
+ try {
+ fileURL = new URL(origin, basePath + "/" + fileName);
+ } catch(MalformedURLException exception) {
+ System.err.println(exception.getMessage());
+ }
+
+ if (fileURL != null) {
+ statusLabel.setText("Loading " + fileURL);
+
+ LoadDataCallback callback = new LoadDataCallback(fileURL);
+ Thread thread = new Thread(callback);
+ thread.setDaemon(true);
+ thread.setPriority(Thread.MIN_PRIORITY);
+ thread.start();
+ }
}
}
Modified: incubator/pivot/trunk/demos/src/pivot/demos/million/large_data.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/million/large_data.wtkx?rev=765645&r1=765644&r2=765645&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/million/large_data.wtkx (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/million/large_data.wtkx Thu Apr 16 14:12:04 2009
@@ -30,8 +30,9 @@
<FlowPane orientation="vertical" styles="{horizontalAlignment:'justify'}">
<FlowPane>
<ListButton wtkx:id="fileListButton"
- listData="['10_thousand.csv', '100_thousand.csv']" selectedIndex="0"/>
- <PushButton wtkx:id="loadDataButton" buttonData="Load Data" styles="{preferredAspectRatio:2.5}"/>
+ listData="['10e0.csv', '10e1.csv', '10e2.csv', '10e3.csv', '10e4.csv', '10e5.csv']" selectedIndex="0"/>
+ <PushButton wtkx:id="loadDataButton" buttonData="Load Data" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="cancelButton" buttonData="Cancel" enabled="false" styles="{preferredAspectRatio:3}"/>
</FlowPane>
<Label wtkx:id="statusLabel"/>
<Separator/>