fix tests

lmangani · Nov 14, 2023 · b8bae16 · b8bae16
1 parent f4c0e30
commit b8bae16
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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'