From 41f86f864a120c6d4a029791ae37c624d2eadcab Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Mon, 28 Apr 2025 11:17:08 -0300 Subject: [PATCH 1/5] Rename json_object_agg --- .../com/datasqrl/flinkrunner/functions/json/JsonFunctions.java | 2 +- .../json/{jsonb_object_agg.java => json_object_agg.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/{jsonb_object_agg.java => json_object_agg.java} (98%) diff --git a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java index d4c3ccc6..99784499 100644 --- a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java +++ b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java @@ -33,7 +33,7 @@ public class JsonFunctions { public static final jsonb_query JSON_QUERY = new jsonb_query(); public static final jsonb_exists JSON_EXISTS = new jsonb_exists(); public static final jsonb_array_agg JSON_ARRAYAGG = new jsonb_array_agg(); - public static final jsonb_object_agg JSON_OBJECTAGG = new jsonb_object_agg(); + public static final json_object_agg JSON_OBJECTAGG = new json_object_agg(); public static final jsonb_concat JSON_CONCAT = new jsonb_concat(); public static ArgumentTypeStrategy createJsonArgumentTypeStrategy(DataTypeFactory typeFactory) { diff --git a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java similarity index 98% rename from types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java rename to types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java index 178d6d70..0a7f42b2 100644 --- a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java +++ b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java @@ -35,7 +35,7 @@ value = "RAW", bridgedTo = FlinkJsonType.class, rawSerializer = FlinkJsonTypeSerializer.class)) -public class jsonb_object_agg extends AggregateFunction { +public class json_object_agg extends AggregateFunction { private static final ObjectMapper mapper = JacksonMapperFactory.createObjectMapper(); From de89a61775ec26f8223e02640872e0b17ac00b38 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Mon, 28 Apr 2025 11:18:06 -0300 Subject: [PATCH 2/5] Change version to get sqrl build stable Signed-off-by: Marvin Froeder --- connectors/kafka-safe-connector/pom.xml | 2 +- connectors/pom.xml | 2 +- connectors/postgresql-connector/pom.xml | 2 +- flink-sql-runner/pom.xml | 8 ++++---- formats/flexible-csv-format/pom.xml | 2 +- formats/flexible-json-format/pom.xml | 2 +- formats/pom.xml | 2 +- functions/functions-common/pom.xml | 2 +- functions/math-functions/pom.xml | 2 +- functions/openai-functions/pom.xml | 2 +- functions/pom.xml | 2 +- functions/text-functions/pom.xml | 2 +- pom.xml | 2 +- testing/pom.xml | 2 +- testing/system-functions-sample/pom.xml | 2 +- testing/udf-sample/pom.xml | 2 +- types/json-type/pom.xml | 2 +- types/pom.xml | 2 +- types/vector-type/pom.xml | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/connectors/kafka-safe-connector/pom.xml b/connectors/kafka-safe-connector/pom.xml index f99f3886..1ab16922 100644 --- a/connectors/kafka-safe-connector/pom.xml +++ b/connectors/kafka-safe-connector/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner connectors - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT kafka-safe-connector diff --git a/connectors/pom.xml b/connectors/pom.xml index e8033761..8262619b 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT connectors diff --git a/connectors/postgresql-connector/pom.xml b/connectors/postgresql-connector/pom.xml index 970e1ef2..001c5fb8 100644 --- a/connectors/postgresql-connector/pom.xml +++ b/connectors/postgresql-connector/pom.xml @@ -21,7 +21,7 @@ com.datasqrl.flinkrunner connectors - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT postgresql-connector diff --git a/flink-sql-runner/pom.xml b/flink-sql-runner/pom.xml index 87a7cb8f..9aba6417 100644 --- a/flink-sql-runner/pom.xml +++ b/flink-sql-runner/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT flink-sql-runner @@ -173,19 +173,19 @@ com.datasqrl.flinkrunner functions-common - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT provided com.datasqrl.flinkrunner udf-sample - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT test com.datasqrl.flinkrunner system-functions-sample - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT test diff --git a/formats/flexible-csv-format/pom.xml b/formats/flexible-csv-format/pom.xml index 7141353b..8eacad7e 100644 --- a/formats/flexible-csv-format/pom.xml +++ b/formats/flexible-csv-format/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner formats - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT flexible-csv-format diff --git a/formats/flexible-json-format/pom.xml b/formats/flexible-json-format/pom.xml index ce2d2ea2..0a45eb8a 100644 --- a/formats/flexible-json-format/pom.xml +++ b/formats/flexible-json-format/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner formats - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT flexible-json-format diff --git a/formats/pom.xml b/formats/pom.xml index e6df5f66..882b9ce8 100644 --- a/formats/pom.xml +++ b/formats/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT formats diff --git a/functions/functions-common/pom.xml b/functions/functions-common/pom.xml index a0bb9ee6..72160454 100644 --- a/functions/functions-common/pom.xml +++ b/functions/functions-common/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner functions - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT functions-common diff --git a/functions/math-functions/pom.xml b/functions/math-functions/pom.xml index 7d71d615..1e571db4 100644 --- a/functions/math-functions/pom.xml +++ b/functions/math-functions/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner functions - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT math-functions diff --git a/functions/openai-functions/pom.xml b/functions/openai-functions/pom.xml index eb335fc4..540633f2 100644 --- a/functions/openai-functions/pom.xml +++ b/functions/openai-functions/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner functions - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT openai-functions diff --git a/functions/pom.xml b/functions/pom.xml index 675b56de..af3d315a 100644 --- a/functions/pom.xml +++ b/functions/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT functions diff --git a/functions/text-functions/pom.xml b/functions/text-functions/pom.xml index c0968460..21c42690 100644 --- a/functions/text-functions/pom.xml +++ b/functions/text-functions/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner functions - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT text-functions diff --git a/pom.xml b/pom.xml index a87505c5..72656eca 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT pom Flink SQL Runner: a tool for running Flink SQL scripts easily. https://github.com/DataSQRL/flink-sql-runner/ diff --git a/testing/pom.xml b/testing/pom.xml index 2cca4f23..1a1cde2d 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT testing diff --git a/testing/system-functions-sample/pom.xml b/testing/system-functions-sample/pom.xml index 1ae39189..a13c8948 100644 --- a/testing/system-functions-sample/pom.xml +++ b/testing/system-functions-sample/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner testing - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT system-functions-sample diff --git a/testing/udf-sample/pom.xml b/testing/udf-sample/pom.xml index 9438b29b..452da0d2 100644 --- a/testing/udf-sample/pom.xml +++ b/testing/udf-sample/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner testing - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT udf-sample diff --git a/types/json-type/pom.xml b/types/json-type/pom.xml index 05ebf698..d5914f34 100644 --- a/types/json-type/pom.xml +++ b/types/json-type/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner types - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT json-type diff --git a/types/pom.xml b/types/pom.xml index b2b72bc4..90052b97 100644 --- a/types/pom.xml +++ b/types/pom.xml @@ -23,7 +23,7 @@ com.datasqrl.flinkrunner flink-sql-runner-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT types diff --git a/types/vector-type/pom.xml b/types/vector-type/pom.xml index 74230383..e60a2e2a 100644 --- a/types/vector-type/pom.xml +++ b/types/vector-type/pom.xml @@ -22,7 +22,7 @@ com.datasqrl.flinkrunner types - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT vector-type From 2cdeb45f84f862e0f034d13ff71b5b3a23968cf8 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Mon, 28 Apr 2025 16:02:28 -0300 Subject: [PATCH 3/5] Rename jsonb_object_agg Signed-off-by: Marvin Froeder --- .../com/datasqrl/flinkrunner/functions/json/JsonFunctions.java | 2 +- .../json/{json_object_agg.java => jsonb_object_agg.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/{json_object_agg.java => jsonb_object_agg.java} (98%) diff --git a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java index 99784499..d4c3ccc6 100644 --- a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java +++ b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/JsonFunctions.java @@ -33,7 +33,7 @@ public class JsonFunctions { public static final jsonb_query JSON_QUERY = new jsonb_query(); public static final jsonb_exists JSON_EXISTS = new jsonb_exists(); public static final jsonb_array_agg JSON_ARRAYAGG = new jsonb_array_agg(); - public static final json_object_agg JSON_OBJECTAGG = new json_object_agg(); + public static final jsonb_object_agg JSON_OBJECTAGG = new jsonb_object_agg(); public static final jsonb_concat JSON_CONCAT = new jsonb_concat(); public static ArgumentTypeStrategy createJsonArgumentTypeStrategy(DataTypeFactory typeFactory) { diff --git a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java similarity index 98% rename from types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java rename to types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java index 0a7f42b2..178d6d70 100644 --- a/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/json_object_agg.java +++ b/types/json-type/src/main/java/com/datasqrl/flinkrunner/functions/json/jsonb_object_agg.java @@ -35,7 +35,7 @@ value = "RAW", bridgedTo = FlinkJsonType.class, rawSerializer = FlinkJsonTypeSerializer.class)) -public class json_object_agg extends AggregateFunction { +public class jsonb_object_agg extends AggregateFunction { private static final ObjectMapper mapper = JacksonMapperFactory.createObjectMapper(); From c9261421b3f1d6fa2d17af68db8a3ec30d9a154e Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Mon, 28 Apr 2025 19:36:35 -0300 Subject: [PATCH 4/5] Rename package for math functions Signed-off-by: Marvin Froeder --- flink-sql-runner/pom.xml | 20 +++++++++++++++++++ .../math}/binomial_distribution.java | 2 +- .../math/util => stdlib/math}/cbrt.java | 2 +- .../math/util => stdlib/math}/copy_sign.java | 2 +- .../math/util => stdlib/math}/expm1.java | 2 +- .../math}/exponential_distribution.java | 2 +- .../math/util => stdlib/math}/hypot.java | 2 +- .../math/util => stdlib/math}/log1p.java | 2 +- .../math/util => stdlib/math}/next_after.java | 2 +- .../math}/normal_distribution.java | 2 +- .../math}/poisson_distribution.java | 2 +- .../math/util => stdlib/math}/scalb.java | 2 +- .../math/util => stdlib/math}/ulp.java | 2 +- 13 files changed, 32 insertions(+), 12 deletions(-) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/distribution => stdlib/math}/binomial_distribution.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/cbrt.java (94%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/copy_sign.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/expm1.java (94%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/distribution => stdlib/math}/exponential_distribution.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/hypot.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/log1p.java (94%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/next_after.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/distribution => stdlib/math}/normal_distribution.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/distribution => stdlib/math}/poisson_distribution.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/scalb.java (95%) rename functions/math-functions/src/main/java/com/datasqrl/flinkrunner/{functions/math/util => stdlib/math}/ulp.java (94%) diff --git a/flink-sql-runner/pom.xml b/flink-sql-runner/pom.xml index 9aba6417..80231884 100644 --- a/flink-sql-runner/pom.xml +++ b/flink-sql-runner/pom.xml @@ -513,5 +513,25 @@ + + + m2e + + + m2e.version + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + true + + + + + diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/binomial_distribution.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/binomial_distribution.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/binomial_distribution.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/binomial_distribution.java index c6d327d5..c4ae54b0 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/binomial_distribution.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/binomial_distribution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.distribution; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.flink.table.functions.ScalarFunction; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/cbrt.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/cbrt.java similarity index 94% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/cbrt.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/cbrt.java index 06087d2a..e9ac76bc 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/cbrt.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/cbrt.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/copy_sign.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/copy_sign.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/copy_sign.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/copy_sign.java index 03c59c4c..a62d8e30 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/copy_sign.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/copy_sign.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/expm1.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/expm1.java similarity index 94% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/expm1.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/expm1.java index ba154c47..985a2a1f 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/expm1.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/expm1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/exponential_distribution.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/exponential_distribution.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/exponential_distribution.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/exponential_distribution.java index 7c492906..15272d77 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/exponential_distribution.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/exponential_distribution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.distribution; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.flink.table.functions.ScalarFunction; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/hypot.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/hypot.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/hypot.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/hypot.java index f6abef16..ca3ba806 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/hypot.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/hypot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/log1p.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/log1p.java similarity index 94% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/log1p.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/log1p.java index 306c83a1..51518403 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/log1p.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/log1p.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/next_after.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/next_after.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/next_after.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/next_after.java index 1f89b24a..0d419b1e 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/next_after.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/next_after.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/normal_distribution.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/normal_distribution.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/normal_distribution.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/normal_distribution.java index b3e7dddb..70e46c6b 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/normal_distribution.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/normal_distribution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.distribution; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.flink.table.functions.ScalarFunction; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/poisson_distribution.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/poisson_distribution.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/poisson_distribution.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/poisson_distribution.java index 38c31e2f..05d750f9 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/distribution/poisson_distribution.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/poisson_distribution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.distribution; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.flink.table.functions.ScalarFunction; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/scalb.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/scalb.java similarity index 95% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/scalb.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/scalb.java index e38b7fdf..44019572 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/scalb.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/scalb.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; diff --git a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/ulp.java b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/ulp.java similarity index 94% rename from functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/ulp.java rename to functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/ulp.java index 3cff0821..70859120 100644 --- a/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/functions/math/util/ulp.java +++ b/functions/math-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/math/ulp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.math.util; +package com.datasqrl.flinkrunner.stdlib.math; import com.google.auto.service.AutoService; import org.apache.commons.math3.util.FastMath; From 99a7c5046c1448f3a3dd60400b472696eba906ff Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Tue, 29 Apr 2025 07:17:53 -0300 Subject: [PATCH 5/5] Rename openai package Signed-off-by: Marvin Froeder --- .../{functions => stdlib}/openai/CompletionsRequest.java | 2 +- .../{functions => stdlib}/openai/FunctionExecutor.java | 4 ++-- .../{functions => stdlib}/openai/OpenAICompletions.java | 6 +++--- .../{functions => stdlib}/openai/OpenAIEmbeddings.java | 4 ++-- .../{functions => stdlib}/openai/OpenAIUtil.java | 2 +- .../{functions => stdlib}/openai/completions.java | 4 ++-- .../{functions => stdlib}/openai/extract_json.java | 2 +- .../openai/util/FunctionMetricTracker.java | 2 +- .../openai/util/P99LatencyTracker.java | 2 +- .../{functions => stdlib}/openai/vector_embedd.java | 4 ++-- .../flinkrunner/functions/openai/CompletionsTest.java | 4 +++- .../flinkrunner/functions/openai/ExtractJsonTest.java | 4 +++- .../flinkrunner/functions/openai/VectorEmbeddTest.java | 4 +++- .../functions/openai/util/P99LatencyTrackerTest.java | 1 + 14 files changed, 26 insertions(+), 19 deletions(-) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/CompletionsRequest.java (94%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/FunctionExecutor.java (94%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/OpenAICompletions.java (96%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/OpenAIEmbeddings.java (96%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/OpenAIUtil.java (94%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/completions.java (95%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/extract_json.java (98%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/util/FunctionMetricTracker.java (97%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/util/P99LatencyTracker.java (96%) rename functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/{functions => stdlib}/openai/vector_embedd.java (93%) diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/CompletionsRequest.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/CompletionsRequest.java similarity index 94% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/CompletionsRequest.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/CompletionsRequest.java index 21d0e351..aaf442ad 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/CompletionsRequest.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/CompletionsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; import lombok.Builder; import lombok.Getter; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/FunctionExecutor.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/FunctionExecutor.java similarity index 94% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/FunctionExecutor.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/FunctionExecutor.java index a6da593d..6e628dbd 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/FunctionExecutor.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/FunctionExecutor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; -import com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker; +import com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAICompletions.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAICompletions.java similarity index 96% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAICompletions.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAICompletions.java index 1e7a722d..7e0f47ae 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAICompletions.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAICompletions.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; -import static com.datasqrl.flinkrunner.functions.openai.OpenAIUtil.API_KEY; -import static com.datasqrl.flinkrunner.functions.openai.OpenAIUtil.COMPLETIONS_API; +import static com.datasqrl.flinkrunner.stdlib.openai.OpenAIUtil.API_KEY; +import static com.datasqrl.flinkrunner.stdlib.openai.OpenAIUtil.COMPLETIONS_API; import java.io.IOException; import java.net.URI; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIEmbeddings.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIEmbeddings.java similarity index 96% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIEmbeddings.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIEmbeddings.java index 22d83837..44f6076d 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIEmbeddings.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIEmbeddings.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; -import static com.datasqrl.flinkrunner.functions.openai.OpenAIUtil.*; +import static com.datasqrl.flinkrunner.stdlib.openai.OpenAIUtil.*; import java.io.IOException; import java.net.URI; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIUtil.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIUtil.java similarity index 94% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIUtil.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIUtil.java index f065027f..0e4832ad 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/OpenAIUtil.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/OpenAIUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; public class OpenAIUtil { public static final String API_KEY = "OPENAI_API_KEY"; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/completions.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/completions.java similarity index 95% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/completions.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/completions.java index 96883436..9020ac82 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/completions.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/completions.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; -import com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker; +import com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker; import com.google.auto.service.AutoService; import java.util.concurrent.CompletableFuture; import org.apache.flink.table.functions.AsyncScalarFunction; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/extract_json.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/extract_json.java similarity index 98% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/extract_json.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/extract_json.java index 1739975f..18257934 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/extract_json.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/extract_json.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; import com.google.auto.service.AutoService; import java.util.concurrent.CompletableFuture; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/FunctionMetricTracker.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/FunctionMetricTracker.java similarity index 97% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/FunctionMetricTracker.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/FunctionMetricTracker.java index 9c3da779..72369e09 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/FunctionMetricTracker.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/FunctionMetricTracker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai.util; +package com.datasqrl.flinkrunner.stdlib.openai.util; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTracker.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/P99LatencyTracker.java similarity index 96% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTracker.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/P99LatencyTracker.java index 740789aa..061babb1 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTracker.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/util/P99LatencyTracker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai.util; +package com.datasqrl.flinkrunner.stdlib.openai.util; import java.util.ArrayList; import java.util.Collections; diff --git a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/vector_embedd.java b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/vector_embedd.java similarity index 93% rename from functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/vector_embedd.java rename to functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/vector_embedd.java index d9497ed6..cffc068b 100644 --- a/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/functions/openai/vector_embedd.java +++ b/functions/openai-functions/src/main/java/com/datasqrl/flinkrunner/stdlib/openai/vector_embedd.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datasqrl.flinkrunner.functions.openai; +package com.datasqrl.flinkrunner.stdlib.openai; -import com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker; +import com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker; import com.google.auto.service.AutoService; import java.util.concurrent.CompletableFuture; import org.apache.flink.table.functions.AsyncScalarFunction; diff --git a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/CompletionsTest.java b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/CompletionsTest.java index f4449f66..2ceef891 100644 --- a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/CompletionsTest.java +++ b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/CompletionsTest.java @@ -15,12 +15,14 @@ */ package com.datasqrl.flinkrunner.functions.openai; -import static com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker.*; +import static com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker.*; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import com.datasqrl.flinkrunner.stdlib.openai.OpenAICompletions; +import com.datasqrl.flinkrunner.stdlib.openai.completions; import java.io.IOException; import java.net.http.HttpClient; import java.net.http.HttpRequest; diff --git a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/ExtractJsonTest.java b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/ExtractJsonTest.java index a5e42b20..769b4010 100644 --- a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/ExtractJsonTest.java +++ b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/ExtractJsonTest.java @@ -15,11 +15,13 @@ */ package com.datasqrl.flinkrunner.functions.openai; -import static com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker.*; +import static com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker.*; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; +import com.datasqrl.flinkrunner.stdlib.openai.OpenAICompletions; +import com.datasqrl.flinkrunner.stdlib.openai.extract_json; import java.io.IOException; import java.net.http.HttpClient; import java.net.http.HttpRequest; diff --git a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/VectorEmbeddTest.java b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/VectorEmbeddTest.java index 49441cf8..5fbaa7e5 100644 --- a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/VectorEmbeddTest.java +++ b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/VectorEmbeddTest.java @@ -15,11 +15,13 @@ */ package com.datasqrl.flinkrunner.functions.openai; -import static com.datasqrl.flinkrunner.functions.openai.util.FunctionMetricTracker.*; +import static com.datasqrl.flinkrunner.stdlib.openai.util.FunctionMetricTracker.*; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; +import com.datasqrl.flinkrunner.stdlib.openai.OpenAIEmbeddings; +import com.datasqrl.flinkrunner.stdlib.openai.vector_embedd; import java.io.IOException; import java.net.http.HttpClient; import java.net.http.HttpRequest; diff --git a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTrackerTest.java b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTrackerTest.java index 71d81777..646076ce 100644 --- a/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTrackerTest.java +++ b/functions/openai-functions/src/test/java/com/datasqrl/flinkrunner/functions/openai/util/P99LatencyTrackerTest.java @@ -17,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import com.datasqrl.flinkrunner.stdlib.openai.util.P99LatencyTracker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;