From b8bae16f2055f6f601c5687ee257695d6dab1dcd Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Nov 2023 03:26:08 +0100 Subject: [PATCH] fix tests --- queries/groupby-local.databend.sql | 8 -------- queries/groupby.databend.sql | 5 ----- queries/groupby.datafusion.sql | 5 ----- 3 files changed, 18 deletions(-) diff --git a/queries/groupby-local.databend.sql b/queries/groupby-local.databend.sql index cb437c0..ad6a523 100644 --- a/queries/groupby-local.databend.sql +++ b/queries/groupby-local.databend.sql @@ -1,16 +1,8 @@ -<<<<<<< HEAD -SELECT arrow_typeof(tpep_pickup_datetime::date) as day, - "PULocationID" as location, - count(*) as trips, - sum(fare_amount) + sum(mta_tax) + sum(tolls_amount) + sum(tip_amount) as revenue -FROM 'yellow_tripdata_2023-01.parquet' -======= SELECT TO_DATE(tpep_pickup_datetime::date) as day, PULocationID as location, count(*) as trips, sum(fare_amount) + sum(mta_tax) + sum(tolls_amount) + sum(tip_amount) as revenue FROM 'https://d37ci6vzurychx.cloudfront.net/trip-data/yellow_tripdata_2023-01.parquet' ->>>>>>> 669ad86a96dfcc208bb27d08e44dfe51ee4c7fb9 WHERE trip_distance > 5 GROUP BY tpep_pickup_datetime, location ORDER BY day diff --git a/queries/groupby.databend.sql b/queries/groupby.databend.sql index 5044a18..ad6a523 100644 --- a/queries/groupby.databend.sql +++ b/queries/groupby.databend.sql @@ -1,10 +1,5 @@ -<<<<<<< HEAD -SELECT arrow_typeof(tpep_pickup_datetime::date) as day, - "PULocationID" as location, -======= SELECT TO_DATE(tpep_pickup_datetime::date) as day, PULocationID as location, ->>>>>>> 669ad86a96dfcc208bb27d08e44dfe51ee4c7fb9 count(*) as trips, sum(fare_amount) + sum(mta_tax) + sum(tolls_amount) + sum(tip_amount) as revenue FROM 'https://d37ci6vzurychx.cloudfront.net/trip-data/yellow_tripdata_2023-01.parquet' diff --git a/queries/groupby.datafusion.sql b/queries/groupby.datafusion.sql index 5044a18..ad6a523 100644 --- a/queries/groupby.datafusion.sql +++ b/queries/groupby.datafusion.sql @@ -1,10 +1,5 @@ -<<<<<<< HEAD -SELECT arrow_typeof(tpep_pickup_datetime::date) as day, - "PULocationID" as location, -======= SELECT TO_DATE(tpep_pickup_datetime::date) as day, PULocationID as location, ->>>>>>> 669ad86a96dfcc208bb27d08e44dfe51ee4c7fb9 count(*) as trips, sum(fare_amount) + sum(mta_tax) + sum(tolls_amount) + sum(tip_amount) as revenue FROM 'https://d37ci6vzurychx.cloudfront.net/trip-data/yellow_tripdata_2023-01.parquet'