-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add DATEADD and DATESUB functions (#7744)
- Loading branch information
Zara Lim
authored
Jul 1, 2021
1 parent
c1f5da6
commit c63e924
Showing
25 changed files
with
2,201 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
ksqldb-engine/src/main/java/io/confluent/ksql/function/udf/datetime/DateAdd.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2021 Confluent Inc. | ||
| * | ||
| * Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.confluent.ksql.function.udf.datetime; | ||
|
|
||
| import io.confluent.ksql.function.FunctionCategory; | ||
| import io.confluent.ksql.function.udf.Udf; | ||
| import io.confluent.ksql.function.udf.UdfDescription; | ||
| import io.confluent.ksql.function.udf.UdfParameter; | ||
| import io.confluent.ksql.util.KsqlConstants; | ||
| import java.sql.Date; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| @UdfDescription( | ||
| name = "dateadd", | ||
| category = FunctionCategory.DATE_TIME, | ||
| author = KsqlConstants.CONFLUENT_AUTHOR, | ||
| description = "Adds a duration to a DATE value." | ||
| ) | ||
| public class DateAdd { | ||
|
|
||
| @Udf(description = "Adds a duration to a date") | ||
| public Date dateAdd( | ||
| @UdfParameter(description = "A unit of time, for example DAY") final TimeUnit unit, | ||
| @UdfParameter(description = "An integer number of intervals to add") final Integer interval, | ||
| @UdfParameter(description = "A DATE value.") final Date date | ||
| ) { | ||
| if (unit == null || interval == null || date == null) { | ||
| return null; | ||
| } | ||
| final long epochDayResult = | ||
| TimeUnit.MILLISECONDS.toDays(date.getTime() + unit.toMillis(interval)); | ||
| return new Date(TimeUnit.DAYS.toMillis(epochDayResult)); | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
ksqldb-engine/src/main/java/io/confluent/ksql/function/udf/datetime/DateSub.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2021 Confluent Inc. | ||
| * | ||
| * Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.confluent.ksql.function.udf.datetime; | ||
|
|
||
| import io.confluent.ksql.function.FunctionCategory; | ||
| import io.confluent.ksql.function.udf.Udf; | ||
| import io.confluent.ksql.function.udf.UdfDescription; | ||
| import io.confluent.ksql.function.udf.UdfParameter; | ||
| import io.confluent.ksql.util.KsqlConstants; | ||
| import java.sql.Date; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| @UdfDescription( | ||
| name = "datesub", | ||
| category = FunctionCategory.DATE_TIME, | ||
| author = KsqlConstants.CONFLUENT_AUTHOR, | ||
| description = "Subtracts a duration from a DATE value." | ||
| ) | ||
| public class DateSub { | ||
|
|
||
| @Udf(description = "Subtracts a duration from a date") | ||
| public Date dateSub( | ||
| @UdfParameter(description = "A unit of time, for example DAY") final TimeUnit unit, | ||
| @UdfParameter( | ||
| description = "An integer number of intervals to subtract") final Integer interval, | ||
| @UdfParameter(description = "A DATE value.") final Date date | ||
| ) { | ||
| if (unit == null || interval == null || date == null) { | ||
| return null; | ||
| } | ||
| final long epochDayResult = | ||
| TimeUnit.MILLISECONDS.toDays(date.getTime() - unit.toMillis(interval)); | ||
| return new Date(TimeUnit.DAYS.toMillis(epochDayResult)); | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
ksqldb-engine/src/test/java/io/confluent/ksql/function/udf/datetime/DateAddTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2021 Confluent Inc. | ||
| * | ||
| * Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.confluent.ksql.function.udf.datetime; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.junit.Assert.assertNull; | ||
|
|
||
| import java.sql.Date; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class DateAddTest { | ||
| private DateAdd udf; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| udf = new DateAdd(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddToDate() { | ||
| assertThat(udf.dateAdd(TimeUnit.DAYS, 9, new Date(86400000)), is(new Date(864000000))); | ||
| assertThat(udf.dateAdd(TimeUnit.DAYS, -1, new Date(86400000)), is(new Date(0))); | ||
| assertThat(udf.dateAdd(TimeUnit.SECONDS, 5, new Date(86400000)), is(new Date(86400000))); | ||
| } | ||
|
|
||
| @Test | ||
| public void handleNulls() { | ||
| assertNull(udf.dateAdd(TimeUnit.DAYS, -300, null)); | ||
| assertNull(udf.dateAdd(null, 54, new Date(864000000))); | ||
| assertNull(udf.dateAdd(TimeUnit.DAYS, null, new Date(864000000))); | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
ksqldb-engine/src/test/java/io/confluent/ksql/function/udf/datetime/DateSubTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2021 Confluent Inc. | ||
| * | ||
| * Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.confluent.ksql.function.udf.datetime; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.junit.Assert.assertNull; | ||
|
|
||
| import java.sql.Date; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class DateSubTest { | ||
| private DateSub udf; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| udf = new DateSub(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddToDate() { | ||
| assertThat(udf.dateSub(TimeUnit.DAYS, 11, new Date(86400000)), is(new Date(-864000000))); | ||
| assertThat(udf.dateSub(TimeUnit.DAYS, -1, new Date(86400000)), is(new Date(172800000))); | ||
| assertThat(udf.dateSub(TimeUnit.SECONDS, 5, new Date(86400000)), is(new Date(0))); | ||
| } | ||
|
|
||
| @Test | ||
| public void handleNulls() { | ||
| assertNull(udf.dateSub(TimeUnit.DAYS, -300, null)); | ||
| assertNull(udf.dateSub(null, 54, new Date(864000000))); | ||
| assertNull(udf.dateSub(TimeUnit.DAYS, null, new Date(864000000))); | ||
| } | ||
| } |
153 changes: 153 additions & 0 deletions
153
...al-tests/src/test/resources/historical_plans/dateadd_-_adds/7.0.0_1624983633824/plan.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| { | ||
| "plan" : [ { | ||
| "@type" : "ksqlPlanV1", | ||
| "statementText" : "CREATE STREAM TEST (ID STRING KEY, DATE DATE) WITH (KAFKA_TOPIC='test', KEY_FORMAT='KAFKA', VALUE_FORMAT='DELIMITED');", | ||
| "ddlCommand" : { | ||
| "@type" : "createStreamV1", | ||
| "sourceName" : "TEST", | ||
| "schema" : "`ID` STRING KEY, `DATE` DATE", | ||
| "topicName" : "test", | ||
| "formats" : { | ||
| "keyFormat" : { | ||
| "format" : "KAFKA" | ||
| }, | ||
| "valueFormat" : { | ||
| "format" : "DELIMITED" | ||
| } | ||
| }, | ||
| "orReplace" : false | ||
| } | ||
| }, { | ||
| "@type" : "ksqlPlanV1", | ||
| "statementText" : "CREATE STREAM TEST2 AS SELECT\n TEST.ID ID,\n DATEADD(DAYS, 10, TEST.DATE) KSQL_COL_0\nFROM TEST TEST\nEMIT CHANGES", | ||
| "ddlCommand" : { | ||
| "@type" : "createStreamV1", | ||
| "sourceName" : "TEST2", | ||
| "schema" : "`ID` STRING KEY, `KSQL_COL_0` DATE", | ||
| "topicName" : "TEST2", | ||
| "formats" : { | ||
| "keyFormat" : { | ||
| "format" : "KAFKA" | ||
| }, | ||
| "valueFormat" : { | ||
| "format" : "DELIMITED" | ||
| } | ||
| }, | ||
| "orReplace" : false | ||
| }, | ||
| "queryPlan" : { | ||
| "sources" : [ "TEST" ], | ||
| "sink" : "TEST2", | ||
| "physicalPlan" : { | ||
| "@type" : "streamSinkV1", | ||
| "properties" : { | ||
| "queryContext" : "TEST2" | ||
| }, | ||
| "source" : { | ||
| "@type" : "streamSelectV1", | ||
| "properties" : { | ||
| "queryContext" : "Project" | ||
| }, | ||
| "source" : { | ||
| "@type" : "streamSourceV1", | ||
| "properties" : { | ||
| "queryContext" : "KsqlTopic/Source" | ||
| }, | ||
| "topicName" : "test", | ||
| "formats" : { | ||
| "keyFormat" : { | ||
| "format" : "KAFKA" | ||
| }, | ||
| "valueFormat" : { | ||
| "format" : "DELIMITED" | ||
| } | ||
| }, | ||
| "sourceSchema" : "`ID` STRING KEY, `DATE` DATE" | ||
| }, | ||
| "keyColumnNames" : [ "ID" ], | ||
| "selectExpressions" : [ "DATEADD(DAYS, 10, DATE) AS KSQL_COL_0" ] | ||
| }, | ||
| "formats" : { | ||
| "keyFormat" : { | ||
| "format" : "KAFKA" | ||
| }, | ||
| "valueFormat" : { | ||
| "format" : "DELIMITED" | ||
| } | ||
| }, | ||
| "topicName" : "TEST2" | ||
| }, | ||
| "queryId" : "CSAS_TEST2_0" | ||
| } | ||
| } ], | ||
| "configs" : { | ||
| "ksql.extension.dir" : "ext", | ||
| "ksql.streams.cache.max.bytes.buffering" : "0", | ||
| "ksql.security.extension.class" : null, | ||
| "metric.reporters" : "", | ||
| "ksql.transient.prefix" : "transient_", | ||
| "ksql.query.status.running.threshold.seconds" : "300", | ||
| "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", | ||
| "ksql.output.topic.name.prefix" : "", | ||
| "ksql.query.pull.enable.standby.reads" : "false", | ||
| "ksql.persistence.default.format.key" : "KAFKA", | ||
| "ksql.query.persistent.max.bytes.buffering.total" : "-1", | ||
| "ksql.queryanonymizer.logs_enabled" : "true", | ||
| "ksql.query.error.max.queue.size" : "10", | ||
| "ksql.variable.substitution.enable" : "true", | ||
| "ksql.internal.topic.min.insync.replicas" : "1", | ||
| "ksql.streams.shutdown.timeout.ms" : "300000", | ||
| "ksql.internal.topic.replicas" : "1", | ||
| "ksql.insert.into.values.enabled" : "true", | ||
| "ksql.query.pull.max.allowed.offset.lag" : "9223372036854775807", | ||
| "ksql.query.pull.max.qps" : "2147483647", | ||
| "ksql.access.validator.enable" : "auto", | ||
| "ksql.streams.bootstrap.servers" : "localhost:0", | ||
| "ksql.queryanonymizer.cluster_namespace" : null, | ||
| "ksql.query.pull.metrics.enabled" : "true", | ||
| "ksql.create.or.replace.enabled" : "true", | ||
| "ksql.metrics.extension" : null, | ||
| "ksql.hidden.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses", | ||
| "ksql.cast.strings.preserve.nulls" : "true", | ||
| "ksql.authorization.cache.max.entries" : "10000", | ||
| "ksql.pull.queries.enable" : "true", | ||
| "ksql.lambdas.enabled" : "true", | ||
| "ksql.suppress.enabled" : "false", | ||
| "ksql.query.push.scalable.enabled" : "false", | ||
| "ksql.query.push.scalable.interpreter.enabled" : "true", | ||
| "ksql.sink.window.change.log.additional.retention" : "1000000", | ||
| "ksql.readonly.topics" : "_confluent.*,__confluent.*,_schemas,__consumer_offsets,__transaction_state,connect-configs,connect-offsets,connect-status,connect-statuses", | ||
| "ksql.query.persistent.active.limit" : "2147483647", | ||
| "ksql.persistence.wrap.single.values" : null, | ||
| "ksql.authorization.cache.expiry.time.secs" : "30", | ||
| "ksql.query.retry.backoff.initial.ms" : "15000", | ||
| "ksql.query.transient.max.bytes.buffering.total" : "-1", | ||
| "ksql.schema.registry.url" : "", | ||
| "ksql.properties.overrides.denylist" : "", | ||
| "ksql.query.pull.max.concurrent.requests" : "2147483647", | ||
| "ksql.streams.auto.offset.reset" : "earliest", | ||
| "ksql.connect.url" : "http://localhost:8083", | ||
| "ksql.service.id" : "some.ksql.service.id", | ||
| "ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler", | ||
| "ksql.query.pull.interpreter.enabled" : "true", | ||
| "ksql.streams.commit.interval.ms" : "2000", | ||
| "ksql.query.pull.table.scan.enabled" : "false", | ||
| "ksql.streams.auto.commit.interval.ms" : "0", | ||
| "ksql.streams.topology.optimization" : "all", | ||
| "ksql.query.retry.backoff.max.ms" : "900000", | ||
| "ksql.streams.num.stream.threads" : "4", | ||
| "ksql.timestamp.throw.on.invalid" : "false", | ||
| "ksql.metrics.tags.custom" : "", | ||
| "ksql.persistence.default.format.value" : null, | ||
| "ksql.udfs.enabled" : "true", | ||
| "ksql.udf.enable.security.manager" : "true", | ||
| "ksql.connect.worker.config" : "", | ||
| "ksql.nested.error.set.null" : "true", | ||
| "ksql.udf.collect.metrics" : "false", | ||
| "ksql.query.pull.thread.pool.size" : "100", | ||
| "ksql.persistent.prefix" : "query_", | ||
| "ksql.metastore.backup.location" : "", | ||
| "ksql.error.classifier.regex" : "", | ||
| "ksql.suppress.buffer.size.bytes" : "-1" | ||
| } | ||
| } |
Oops, something went wrong.