Merge pull request #11 from jpmorganchase/arrow-input

Initial support for loading Apache Arrow data
finos · Jan 26, 2018 · 2e4640f · 2e4640f
2 parents 3530e45 + 7abd9f0
commit 2e4640f
Show file tree

Hide file tree

Showing 14 changed files with 456 additions and 47 deletions.
diff --git a/packages/perspective-common/common.config.js b/packages/perspective-common/common.config.js
@@ -6,6 +6,7 @@ const plugins = []
 if (!process.env.PSP_NO_MINIFY) {
     plugins.push(new UglifyJSPlugin({
         sourceMap: true,
+        mangle: false,
         output: {
             ascii_only: true
         }
@@ -46,9 +47,15 @@ module.exports = function() {
                     before: ';var window = window || {};exports.load_perspective = function(Module) {',
                     after: ';return Module;}'
                 }
+            }, {
+                test: /\.(arrow)$/,
+                use: {
+                    loader: "arraybuffer-loader",
+                    options: {}
+                }
             }, {
                 test: /\.js$/,
-                exclude: /node_modules|psp\.js/,
+                exclude: /node_modules\/(?!\@apache-arrow)|psp\.js/,
                 loader: "babel-loader",
                 options: {
                     presets: ['env'],
@@ -59,4 +66,4 @@ module.exports = function() {
             }]
         }
     };
-}
+}
diff --git a/packages/perspective-examples/src/csv/superstore.arrow b/packages/perspective-examples/src/csv/superstore.arrow
diff --git a/packages/perspective-examples/src/html/superstore-arrow.html b/packages/perspective-examples/src/html/superstore-arrow.html
@@ -0,0 +1,52 @@
+<!--
+   
+   Copyright (c) 2017, the Perspective Authors.
+   
+   This file is part of the Perspective library, distributed under the terms of
+   the Apache License 2.0.  The full license can be found in the LICENSE file.
+
+-->
+
+<!DOCTYPE html>
+<html>
+    <head>
+
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+
+        <script src="mobile_fix.js"></script>
+        <script src='https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.24/webcomponents.min.js'></script>
+        <script src="perspective.view.js"></script>
+        <script src="hypergrid.plugin.js"></script>
+        <script src="highcharts.plugin.js"></script>
+
+        <link rel='stylesheet' href="demo.css">
+
+    </head>
+    <body>
+
+        <perspective-viewer
+            view="vertical"
+            row-pivots='["Category","Region","Segment"]'
+            column-pivots='["Sub-Category"]'
+            columns='["Sales"]'
+         >
+
+        </perspective-viewer>
+
+        <script>
+
+            window.addEventListener('WebComponentsReady', function () {
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', 'superstore.arrow', true);
+                xhr.responseType = "arraybuffer"
+                xhr.onload = function () { 
+                    var el = document.getElementsByTagName('perspective-viewer')[0];
+                    el.load(xhr.response); 
+                }
+                xhr.send(null);
+            });
+
+        </script>
+
+    </body>
+</html>
diff --git a/packages/perspective/CMakeLists.txt b/packages/perspective/CMakeLists.txt
@@ -21,6 +21,7 @@ set(EXTENDED_FLAGS " \
 	--memory-init-file 1 \
 	-s NO_EXIT_RUNTIME=1 \
 	-s NO_FILESYSTEM=1 \
+        -s NO_DYNAMIC_EXECUTION=1 \
 	-s EXPORTED_FUNCTIONS=\"['_main']\" \
 ")
 

diff --git a/packages/perspective/package.json b/packages/perspective/package.json
@@ -44,10 +44,12 @@
     "d3-array": "^1.2.1",
     "moment": "^2.19.1",
     "papaparse": "^4.3.6",
-    "underscore": "^1.8.3"
+    "underscore": "^1.8.3",
+    "@apache-arrow/es5-esm": "^0.2.0"
   },
   "devDependencies": {
     "@jpmorganchase/perspective-common": "^0.0.2",
+    "arraybuffer-loader": "^1.0.2",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-async-to-bluebird": "^1.1.1",

diff --git a/packages/perspective/src/config/perspective.asmjs.config.js b/packages/perspective/src/config/perspective.asmjs.config.js
@@ -2,8 +2,7 @@ const path = require('path');
 const common = require('@jpmorganchase/perspective-common/common.config.js');
 
 module.exports = Object.assign({}, common(), {
-    entry: './src/js/perspective.asmjs.js',
-    plugins: [],
+    entry: ["babel-polyfill", './src/js/perspective.asmjs.js'],
     output: {
         filename: 'perspective.js',
         path: path.resolve(__dirname, '../../build/asmjs')

diff --git a/packages/perspective/src/config/perspective.node.config.js b/packages/perspective/src/config/perspective.node.config.js
@@ -3,7 +3,6 @@ const common = require('@jpmorganchase/perspective-common/common.config.js');
 
 module.exports = Object.assign({}, common(), {
     entry: './src/js/perspective.node.js',
-    plugins: [],
     target: "node",
     node: {},
     output: {

diff --git a/packages/perspective/src/config/perspective.parallel.config.js b/packages/perspective/src/config/perspective.parallel.config.js
@@ -3,7 +3,6 @@ const common = require('@jpmorganchase/perspective-common/common.config.js');
 
 module.exports = Object.assign({}, common(), {
     entry: './src/js/perspective.parallel.js',
-    plugins: [],
     output: {
         filename: 'perspective.js',
         library: "perspective",