feat: replace std Instant with wasm-compatible wrapper

benchmarks/src/clickbench.rs

@@ -16,13 +16,14 @@
 // under the License.
 
 use std::path::Path;
-use std::{path::PathBuf, time::Instant};
+use std::path::PathBuf;
 
 use datafusion::{
     error::{DataFusionError, Result},
     prelude::SessionContext,
 };
 use datafusion_common::exec_datafusion_err;
+use datafusion_common::instant::Instant;
 use structopt::StructOpt;
 
 use crate::{BenchmarkRun, CommonOpt};

benchmarks/src/parquet_filter.rs

@@ -24,8 +24,8 @@ use datafusion::logical_expr::{lit, or, Expr};
 use datafusion::physical_plan::collect;
 use datafusion::prelude::{col, SessionContext};
 use datafusion::test_util::parquet::{ParquetScanOptions, TestParquetFile};
+use datafusion_common::instant::Instant;
 use std::path::PathBuf;
-use std::time::Instant;
 use structopt::StructOpt;
 
 /// Test performance of parquet filter pushdown

benchmarks/src/sort.rs

@@ -25,9 +25,9 @@ use datafusion::physical_plan::collect;
 use datafusion::physical_plan::sorts::sort::SortExec;
 use datafusion::prelude::{SessionConfig, SessionContext};
 use datafusion::test_util::parquet::TestParquetFile;
+use datafusion_common::instant::Instant;
 use std::path::PathBuf;
 use std::sync::Arc;
-use std::time::Instant;
 use structopt::StructOpt;
 
 /// Test performance of sorting large datasets

benchmarks/src/tpch/convert.rs

@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use datafusion_common::instant::Instant;
 use std::fs;
 use std::path::{Path, PathBuf};
-use std::time::Instant;
 
 use datafusion::common::not_impl_err;
 use datafusion::error::DataFusionError;

benchmarks/src/tpch/run.rs

@@ -31,9 +31,9 @@ use datafusion::physical_plan::{collect, displayable};
 use datafusion_common::{DEFAULT_CSV_EXTENSION, DEFAULT_PARQUET_EXTENSION};
 use log::info;
 
+use datafusion_common::instant::Instant;
 use std::path::PathBuf;
 use std::sync::Arc;
-use std::time::Instant;
 
 use datafusion::error::Result;
 use datafusion::prelude::*;

clippy.toml

@@ -2,3 +2,7 @@ disallowed-methods = [
     { path = "tokio::task::spawn", reason = "To provide cancel-safety, use `SpawnedTask::spawn` instead (https://github.com/apache/arrow-datafusion/issues/6513)" },
     { path = "tokio::task::spawn_blocking", reason = "To provide cancel-safety, use `SpawnedTask::spawn` instead (https://github.com/apache/arrow-datafusion/issues/6513)" },
 ]
+
+disallowed-types = [
+    { path = "std::time::Instant", reason = "Use `datafusion_common::instant::Instant` instead for WASM compatibility" },
+]

datafusion-cli/src/command.rs

@@ -28,11 +28,11 @@ use datafusion::arrow::record_batch::RecordBatch;
 use datafusion::common::exec_err;
 use datafusion::error::{DataFusionError, Result};
 use datafusion::prelude::SessionContext;
+use datafusion_common::instant::Instant;
 use std::fs::File;
 use std::io::BufReader;
 use std::str::FromStr;
 use std::sync::Arc;
-use std::time::Instant;
 
 /// Command
 #[derive(Debug)]

datafusion-cli/src/exec.rs

@@ -17,11 +17,11 @@
 
 //! Execution functions
 
+use datafusion_common::instant::Instant;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::*;
 use std::io::BufReader;
-use std::time::Instant;
 
 use crate::print_format::PrintFormat;
 use crate::{

datafusion-cli/src/print_options.rs

@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use datafusion_common::instant::Instant;
 use std::fmt::{Display, Formatter};
 use std::io::Write;
 use std::pin::Pin;
 use std::str::FromStr;
-use std::time::Instant;
 
 use crate::print_format::PrintFormat;
 

datafusion/common/Cargo.toml

@@ -60,5 +60,8 @@ parquet = { workspace = true, optional = true, default-features = true }
 pyo3 = { version = "0.20.0", optional = true }
 sqlparser = { workspace = true }
 
+[target.'cfg(target_family = "wasm")'.dependencies]
+instant = { version = "0.1", features = ["wasm-bindgen"] }
+
 [dev-dependencies]
 rand = "0.8.4"

datafusion/common/src/instant.rs

@@ -0,0 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//! WASM-compatible `Instant` warpper.
+
+#[cfg(target_family = "wasm")]
+/// DataFusion wrapper around [`std::time::Instant`]. Uses [`instant::Instant`]
+/// under `wasm` feature gate. It provides the same API as [`std::time::Instant`].
+pub type Instant = instant::Instant;
+
+#[allow(clippy::disallowed_types)]
+#[cfg(not(target_family = "wasm"))]
+/// DataFusion wrapper around [`std::time::Instant`]. This is only a type alias.
+pub type Instant = std::time::Instant;

datafusion/common/src/lib.rs

@@ -34,6 +34,7 @@ pub mod display;
 pub mod file_options;
 pub mod format;
 pub mod hash_utils;
+pub mod instant;
 pub mod parsers;
 pub mod rounding;
 pub mod scalar;

datafusion/core/Cargo.toml

@@ -141,6 +141,7 @@ test-utils = { path = "../../test-utils" }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot", "fs"] }
 tokio-postgres = "0.7.7"
+
 [target.'cfg(not(target_os = "windows"))'.dev-dependencies]
 nix = { version = "0.28.0", features = ["fs"] }
 

datafusion/core/benches/parquet_query_sql.rs

@@ -25,6 +25,7 @@ use arrow::datatypes::{
 use arrow::record_batch::RecordBatch;
 use criterion::{criterion_group, criterion_main, Criterion};
 use datafusion::prelude::{SessionConfig, SessionContext};
+use datafusion_common::instant::Instant;
 use futures::stream::StreamExt;
 use parquet::arrow::ArrowWriter;
 use parquet::file::properties::{WriterProperties, WriterVersion};
@@ -36,7 +37,6 @@ use std::io::Read;
 use std::ops::Range;
 use std::path::Path;
 use std::sync::Arc;
-use std::time::Instant;
 use tempfile::NamedTempFile;
 
 /// The number of batches to write

datafusion/core/src/datasource/physical_plan/file_stream.rs

@@ -25,7 +25,6 @@ use std::collections::VecDeque;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::time::Instant;
 
 use crate::datasource::listing::PartitionedFile;
 use crate::datasource::physical_plan::{
@@ -40,6 +39,7 @@ use crate::physical_plan::RecordBatchStream;
 use arrow::datatypes::SchemaRef;
 use arrow::error::ArrowError;
 use arrow::record_batch::RecordBatch;
+use datafusion_common::instant::Instant;
 use datafusion_common::ScalarValue;
 
 use futures::future::BoxFuture;

datafusion/core/tests/fifo.rs

@@ -20,13 +20,14 @@
 #[cfg(target_family = "unix")]
 #[cfg(test)]
 mod unix_test {
+    use datafusion_common::instant::Instant;
     use std::fs::{File, OpenOptions};
     use std::io::Write;
     use std::path::PathBuf;
     use std::sync::atomic::{AtomicBool, Ordering};
     use std::sync::Arc;
     use std::thread;
-    use std::time::{Duration, Instant};
+    use std::time::Duration;
 
     use arrow::array::Array;
     use arrow::csv::ReaderBuilder;

datafusion/core/tests/parquet/filter_pushdown.rs

@@ -26,14 +26,13 @@
 //! select * from data limit 10;
 //! ```
 
-use std::time::Instant;
-
 use arrow::compute::concat_batches;
 use arrow::record_batch::RecordBatch;
 use datafusion::physical_plan::collect;
 use datafusion::physical_plan::metrics::MetricsSet;
 use datafusion::prelude::{col, lit, lit_timestamp_nano, Expr, SessionContext};
 use datafusion::test_util::parquet::{ParquetScanOptions, TestParquetFile};
+use datafusion_common::instant::Instant;
 use datafusion_expr::utils::{conjunction, disjunction, split_conjunction};
 use itertools::Itertools;
 use parquet::file::properties::WriterProperties;

datafusion/optimizer/src/analyzer/mod.rs

@@ -28,6 +28,7 @@ use crate::analyzer::subquery::check_subquery_expr;
 use crate::analyzer::type_coercion::TypeCoercion;
 use crate::utils::log_plan;
 use datafusion_common::config::ConfigOptions;
+use datafusion_common::instant::Instant;
 use datafusion_common::tree_node::{TreeNode, VisitRecursion};
 use datafusion_common::{DataFusionError, Result};
 use datafusion_expr::expr::Exists;
@@ -36,7 +37,6 @@ use datafusion_expr::utils::inspect_expr_pre;
 use datafusion_expr::{Expr, LogicalPlan};
 use log::debug;
 use std::sync::Arc;
-use std::time::Instant;
 
 use self::rewrite_expr::OperatorToFunction;
 

datafusion/optimizer/src/optimizer.rs

@@ -19,7 +19,6 @@
 
 use std::collections::HashSet;
 use std::sync::Arc;
-use std::time::Instant;
 
 use crate::common_subexpr_eliminate::CommonSubexprEliminate;
 use crate::decorrelate_predicate_subquery::DecorrelatePredicateSubquery;
@@ -48,6 +47,7 @@ use crate::utils::log_plan;
 
 use datafusion_common::alias::AliasGenerator;
 use datafusion_common::config::ConfigOptions;
+use datafusion_common::instant::Instant;
 use datafusion_common::{DataFusionError, Result};
 use datafusion_expr::logical_plan::LogicalPlan;
 

datafusion/physical-plan/src/analyze.rs

@@ -17,8 +17,8 @@
 
 //! Defines the ANALYZE operator
 
+use std::any::Any;
 use std::sync::Arc;
-use std::{any::Any, time::Instant};
 
 use super::expressions::PhysicalSortExpr;
 use super::stream::{RecordBatchReceiverStream, RecordBatchStreamAdapter};
@@ -28,6 +28,7 @@ use crate::display::DisplayableExecutionPlan;
 use crate::{DisplayFormatType, ExecutionPlan, Partitioning};
 
 use arrow::{array::StringBuilder, datatypes::SchemaRef, record_batch::RecordBatch};
+use datafusion_common::instant::Instant;
 use datafusion_common::{internal_err, DataFusionError, Result};
 use datafusion_execution::TaskContext;
 

datafusion/physical-plan/src/metrics/value.rs

@@ -24,12 +24,12 @@ use std::{
         atomic::{AtomicUsize, Ordering},
         Arc,
     },
-    time::{Duration, Instant},
+    time::Duration,
 };
 
-use parking_lot::Mutex;
-
 use chrono::{DateTime, Utc};
+use datafusion_common::instant::Instant;
+use parking_lot::Mutex;
 
 /// A counter to record things such as number of input or output rows
 ///

datafusion/wasmtest/Cargo.toml

@@ -31,6 +31,8 @@ rust-version = { workspace = true }
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+# chrono must be compiled with wasmbind feature
+chrono = { version = "0.4", features = ["wasmbind"] }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
@@ -49,5 +51,10 @@ datafusion-sql = { workspace = true }
 
 # getrandom must be compiled with js feature
 getrandom = { version = "0.2.8", features = ["js"] }
+
 parquet = { workspace = true }
 wasm-bindgen = "0.2.87"
+wasm-bindgen-futures = "0.4.40"
+
+[dev-dependencies]
+wasm-bindgen-test = "0.3"

datafusion/wasmtest/README.md

@@ -36,7 +36,7 @@ First, [install wasm-pack](https://rustwasm.github.io/wasm-pack/installer/)
 
 Then use wasm-pack to compile the crate from within this directory
 
-```
+```shell
 wasm-pack build
 ```
 
@@ -46,14 +46,34 @@ The `datafusion-wasm-app` directory contains a simple app (created with [`create
 
 From within the `datafusion/wasmtest/datafusion-wasm-app` directory:
 
-```
+```shell
 npm install
 npm run start
 ```
 
 Then open http://localhost:8080/ in a web browser and check the console to see the results of using various DataFusion crates.
 
-**Note:** In GitHub Actions we test the compilation with `wasm-build`, but we don't currently invoke `datafusion-wasm-app`. In the future we may want to test the behavior of the WASM build using [`wasm-pack test`](https://rustwasm.github.io/wasm-pack/book/tutorials/npm-browser-packages/testing-your-project.html).
+## Test
+
+This crate uses `wasm-pack test` to run tests. Try it out with one of the following commands depending on your browser of choice:
+
+```shell
+wasm-pack test --firefox
+wasm-pack test --chrome
+wasm-pack test --safari
+```
+
+To run the tests in headless mode, add the `--headless` flag:
+
+```shell
+wasm-pack test --headless --firefox
+wasm-pack test --headless --chrome
+wasm-pack test --headless --safari
+```
+
+**Note:** In GitHub Actions we test the compilation with `wasm-build`, but we don't currently invoke `wasm-pack test`. This is because the headless mode is not yet working. Document of adding a GitHub Action job: https://rustwasm.github.io/docs/wasm-bindgen/wasm-bindgen-test/continuous-integration.html#github-actions.
+
+To tweak timeout setting, use `WASM_BINDGEN_TEST_TIMEOUT` environment variable. E.g., `WASM_BINDGEN_TEST_TIMEOUT=300 wasm-pack test --firefox --headless`.
 
 ## Compatibility
 

datafusion/wasmtest/datafusion-wasm-app/index.js

@@ -17,4 +17,5 @@
 
 import * as wasm from "datafusion-wasmtest";
 
-wasm.try_datafusion();
+wasm.basic_exprs();
+wasm.basic_parse();