From ed1cbdbea0c4cdb84b90e6fb355683622de8961a Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Wed, 2 Oct 2024 11:57:29 +0200 Subject: [PATCH 1/2] Remove aggregate functions dependency on frontend DataFusion is a SQL query engine and also a reusable library for building query engines. The core functionality should not depend on frontend related functionalities like `sqlparser` or `datafusion-sql`. --- datafusion-cli/Cargo.lock | 1 - datafusion/functions-aggregate/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index fbe7d5c04b9b..8bf62a53cc47 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -1402,7 +1402,6 @@ dependencies = [ "half", "log", "paste", - "sqlparser", ] [[package]] diff --git a/datafusion/functions-aggregate/Cargo.toml b/datafusion/functions-aggregate/Cargo.toml index d78f68a2604e..33a52afbe21a 100644 --- a/datafusion/functions-aggregate/Cargo.toml +++ b/datafusion/functions-aggregate/Cargo.toml @@ -50,7 +50,6 @@ datafusion-physical-expr-common = { workspace = true } half = { workspace = true } log = { workspace = true } paste = "1.0.14" -sqlparser = { workspace = true } [dev-dependencies] arrow = { workspace = true, features = ["test_utils"] } From 0e48b99709f1d181f7bae3468c6a29bb9929e421 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Wed, 2 Oct 2024 12:05:46 +0200 Subject: [PATCH 2/2] Remove duplicate license header --- datafusion/functions-aggregate/src/macros.rs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/datafusion/functions-aggregate/src/macros.rs b/datafusion/functions-aggregate/src/macros.rs index 573b9fd5bdb2..ffb5183278e6 100644 --- a/datafusion/functions-aggregate/src/macros.rs +++ b/datafusion/functions-aggregate/src/macros.rs @@ -15,23 +15,6 @@ // specific language governing permissions and limitations // under the License. -// 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. - macro_rules! make_udaf_expr { ($EXPR_FN:ident, $($arg:ident)*, $DOC:expr, $AGGREGATE_UDF_FN:ident) => { // "fluent expr_fn" style function