From 7e9d2a173e2b983e7bec7219698feedfc5ce143c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Pe=C3=B1a?= Date: Tue, 24 Aug 2021 12:57:10 -0500 Subject: [PATCH] chore: revert call to ofTimeAndGracePeriod() (#8047) --- .../7.0.0_1623947957608/plan.json | 229 ------------ .../7.0.0_1623947957608/spec.json | 353 ------------------ .../7.0.0_1623947957608/topology | 39 -- .../7.0.0_1623947957938/plan.json | 229 ------------ .../7.0.0_1623947957938/spec.json | 249 ------------ .../7.0.0_1623947957938/topology | 39 -- .../7.0.0_1623947955663/plan.json | 229 ------------ .../7.0.0_1623947955663/spec.json | 311 --------------- .../7.0.0_1623947955663/topology | 39 -- .../7.0.0_1623947956115/plan.json | 229 ------------ .../7.0.0_1623947956115/spec.json | 215 ----------- .../7.0.0_1623947956115/topology | 39 -- .../7.0.0_1623947956455/plan.json | 229 ------------ .../7.0.0_1623947956455/spec.json | 224 ----------- .../7.0.0_1623947956455/topology | 39 -- .../7.0.0_1623947956837/plan.json | 229 ------------ .../7.0.0_1623947956837/spec.json | 327 ---------------- .../7.0.0_1623947956837/topology | 39 -- .../7.0.0_1623947957230/plan.json | 229 ------------ .../7.0.0_1623947957230/spec.json | 231 ------------ .../7.0.0_1623947957230/topology | 39 -- .../streams/StreamStreamJoinBuilder.java | 16 +- .../streams/StreamStreamJoinBuilderTest.java | 60 --- 23 files changed, 2 insertions(+), 3860 deletions(-) delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/topology delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/plan.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/spec.json delete mode 100644 ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/topology diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/plan.json deleted file mode 100644 index affc3c9e412f..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM OUTER_JOIN AS SELECT\n ROWKEY ID,\n T.ID T_ID,\n TT.ID TT_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nFULL OUTER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "OUTER_JOIN", - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "topicName" : "OUTER_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "OUTER_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "OUTER_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "OUTER", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "ROWKEY" - }, - "keyColumnNames" : [ "ID" ], - "selectExpressions" : [ "T_ID AS T_ID", "TT_ID AS TT_ID", "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "topicName" : "OUTER_JOIN" - }, - "queryId" : "CSAS_OUTER_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/spec.json deleted file mode 100644 index 343cd64fe1e9..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/spec.json +++ /dev/null @@ -1,353 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947957608, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_OUTER_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_OUTER_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_OUTER_JOIN_0.OUTER_JOIN" : { - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_OUTER_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_OUTER_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_OUTER_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - } - }, - "testCase" : { - "name" : "stream stream full outer join with out of order and custom grace period - AVRO", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 1, - "value" : { - "L2" : "b" - }, - "timestamp" : 330000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "OUTER_JOIN", - "key" : 0, - "value" : { - "T_ID" : 0, - "TT_ID" : 0, - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "OUTER_JOIN", - "key" : 2, - "value" : { - "T_ID" : null, - "TT_ID" : 2, - "L1" : null, - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "OUTER_JOIN", - "key" : 2, - "value" : { - "T_ID" : 2, - "TT_ID" : 2, - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "OUTER_JOIN", - "key" : 3, - "value" : { - "T_ID" : null, - "TT_ID" : 3, - "L1" : null, - "L2" : "d" - }, - "timestamp" : 60000 - }, { - "topic" : "OUTER_JOIN", - "key" : 3, - "value" : { - "T_ID" : 3, - "TT_ID" : null, - "L1" : "D", - "L2" : null - }, - "timestamp" : 60000 - } ], - "topics" : [ { - "name" : "OUTER_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "right_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='AVRO');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='AVRO');", "CREATE STREAM OUTER_JOIN as SELECT ROWKEY as ID, t.id, tt.id, l1, l2 FROM LEFT_STREAM t full outer join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "OUTER_JOIN", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_OUTER_JOIN_0-KSTREAM-OUTEROTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "TT_L2", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "TT_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "TT_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - }, { - "name" : "OUTER_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "T_ID", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "TT_ID", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ] - } - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_OUTER_JOIN_0-KSTREAM-OUTERTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "T_L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "T_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "T_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/topology deleted file mode 100644 index 9b574cbfc15e..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947957608/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-outer-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-OUTERTHIS-0000000008-store]) - --> Join-outer-this-join - <-- PrependAliasLeft - Processor: Join-outer-other-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTERTHIS-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-outer-this-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-outer-this-join, Join-outer-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: OUTER_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/plan.json deleted file mode 100644 index 7398c03e3e92..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM OUTER_JOIN AS SELECT\n ROWKEY ID,\n T.ID T_ID,\n TT.ID TT_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nFULL OUTER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "OUTER_JOIN", - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "topicName" : "OUTER_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "OUTER_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "OUTER_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "OUTER", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "ROWKEY" - }, - "keyColumnNames" : [ "ID" ], - "selectExpressions" : [ "T_ID AS T_ID", "TT_ID AS TT_ID", "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "topicName" : "OUTER_JOIN" - }, - "queryId" : "CSAS_OUTER_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/spec.json deleted file mode 100644 index a225797c2877..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/spec.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947957938, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_OUTER_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_OUTER_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_OUTER_JOIN_0.OUTER_JOIN" : { - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_OUTER_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_OUTER_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_OUTER_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - } - }, - "testCase" : { - "name" : "stream stream full outer join with out of order and custom grace period - JSON", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 1, - "value" : { - "L2" : "b" - }, - "timestamp" : 330000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "OUTER_JOIN", - "key" : 0, - "value" : { - "T_ID" : 0, - "TT_ID" : 0, - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "OUTER_JOIN", - "key" : 2, - "value" : { - "T_ID" : null, - "TT_ID" : 2, - "L1" : null, - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "OUTER_JOIN", - "key" : 2, - "value" : { - "T_ID" : 2, - "TT_ID" : 2, - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "OUTER_JOIN", - "key" : 3, - "value" : { - "T_ID" : null, - "TT_ID" : 3, - "L1" : null, - "L2" : "d" - }, - "timestamp" : 60000 - }, { - "topic" : "OUTER_JOIN", - "key" : 3, - "value" : { - "T_ID" : 3, - "TT_ID" : null, - "L1" : "D", - "L2" : null - }, - "timestamp" : 60000 - } ], - "topics" : [ { - "name" : "OUTER_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "right_topic", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='JSON');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='JSON');", "CREATE STREAM OUTER_JOIN as SELECT ROWKEY as ID, t.id, tt.id, l1, l2 FROM LEFT_STREAM t full outer join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "OUTER_JOIN", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `T_ID` BIGINT, `TT_ID` BIGINT, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_OUTER_JOIN_0-KSTREAM-OUTEROTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, { - "name" : "OUTER_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_OUTER_JOIN_0-KSTREAM-OUTERTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/topology deleted file mode 100644 index 9b574cbfc15e..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_full_outer_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957938/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-outer-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-OUTERTHIS-0000000008-store]) - --> Join-outer-this-join - <-- PrependAliasLeft - Processor: Join-outer-other-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTERTHIS-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-outer-this-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-outer-this-join, Join-outer-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: OUTER_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/plan.json deleted file mode 100644 index e1a59f5c87a8..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM INNER_JOIN AS SELECT\n T.ID T_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nINNER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "INNER_JOIN", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "topicName" : "INNER_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "INNER_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "INNER_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "INNER", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "T_ID" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "topicName" : "INNER_JOIN" - }, - "queryId" : "CSAS_INNER_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/spec.json deleted file mode 100644 index b84f6fb3244f..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/spec.json +++ /dev/null @@ -1,311 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947955663, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_INNER_JOIN_0.INNER_JOIN" : { - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_INNER_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_INNER_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_INNER_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - } - }, - "testCase" : { - "name" : "stream stream inner join with out of order and custom grace period - AVRO", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 1, - "value" : { - "L1" : "B" - }, - "timestamp" : 330000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "INNER_JOIN", - "key" : 0, - "value" : { - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "INNER_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - } ], - "topics" : [ { - "name" : "right_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "INNER_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='AVRO');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='AVRO');", "CREATE STREAM INNER_JOIN as SELECT t.id, l1, l2 FROM LEFT_STREAM t join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "INNER_JOIN", - "type" : "STREAM", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "T_L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "T_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "T_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - }, { - "name" : "INNER_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ] - } - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINOTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "TT_L2", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "TT_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "TT_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/topology deleted file mode 100644 index 942a8e59aba7..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947955663/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-this-join - <-- PrependAliasLeft - Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-this-join, Join-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: INNER_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/plan.json deleted file mode 100644 index 88887285e19c..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM INNER_JOIN AS SELECT\n T.ID T_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nINNER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "INNER_JOIN", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "topicName" : "INNER_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "INNER_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "INNER_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "INNER", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "T_ID" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "topicName" : "INNER_JOIN" - }, - "queryId" : "CSAS_INNER_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/spec.json deleted file mode 100644 index e5b40bd45a7c..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/spec.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947956115, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_INNER_JOIN_0.INNER_JOIN" : { - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_INNER_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_INNER_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_INNER_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - } - }, - "testCase" : { - "name" : "stream stream inner join with out of order and custom grace period - JSON", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 1, - "value" : { - "L1" : "B" - }, - "timestamp" : 330000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "INNER_JOIN", - "key" : 0, - "value" : { - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "INNER_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - } ], - "topics" : [ { - "name" : "right_topic", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "INNER_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='JSON');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='JSON');", "CREATE STREAM INNER_JOIN as SELECT t.id, l1, l2 FROM LEFT_STREAM t join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "INNER_JOIN", - "type" : "STREAM", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, { - "name" : "INNER_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINOTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/topology deleted file mode 100644 index 942a8e59aba7..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947956115/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-this-join - <-- PrependAliasLeft - Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-this-join, Join-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: INNER_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/plan.json deleted file mode 100644 index 65bb69d28eea..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='PROTOBUF');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='PROTOBUF');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM INNER_JOIN AS SELECT\n T.ID T_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nINNER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "INNER_JOIN", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "topicName" : "INNER_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "INNER_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "INNER_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "INNER", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "T_ID" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "topicName" : "INNER_JOIN" - }, - "queryId" : "CSAS_INNER_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/spec.json deleted file mode 100644 index e33af283d21f..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/spec.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947956455, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_INNER_JOIN_0.INNER_JOIN" : { - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "CSAS_INNER_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "CSAS_INNER_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_INNER_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - } - }, - "CSAS_INNER_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "PROTOBUF" - } - } - }, - "testCase" : { - "name" : "stream stream inner join with out of order and custom grace period - PROTOBUF", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 1, - "value" : { - "L1" : "B" - }, - "timestamp" : 330000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "INNER_JOIN", - "key" : 0, - "value" : { - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "INNER_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - } ], - "topics" : [ { - "name" : "right_topic", - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string L2 = 1;\n}\n", - "valueFormat" : "PROTOBUF", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "INNER_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string L1 = 1;\n}\n", - "valueFormat" : "PROTOBUF", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='PROTOBUF');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='PROTOBUF');", "CREATE STREAM INNER_JOIN as SELECT t.id, l1, l2 FROM LEFT_STREAM t join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "INNER_JOIN", - "type" : "STREAM", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "PROTOBUF", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "PROTOBUF", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "PROTOBUF", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - }, - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string T_L1 = 1;\n int64 T_ROWTIME = 2;\n int64 T_ID = 3;\n}\n" - }, { - "name" : "INNER_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - }, - "partitions" : 4, - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string L1 = 1;\n string L2 = 2;\n}\n" - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_INNER_JOIN_0-KSTREAM-JOINOTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - }, - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string TT_L2 = 1;\n int64 TT_ROWTIME = 2;\n int64 TT_ID = 3;\n}\n" - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - }, - "partitions" : 4, - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string L1 = 1;\n}\n" - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "PROTOBUF" - }, - "partitions" : 4, - "valueSchema" : "syntax = \"proto3\";\n\nmessage ConnectDefault1 {\n string L2 = 1;\n}\n" - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/topology deleted file mode 100644 index 942a8e59aba7..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_inner_join_with_out_of_order_and_custom_grace_period_-_PROTOBUF/7.0.0_1623947956455/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-this-join - <-- PrependAliasLeft - Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-this-join, Join-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: INNER_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/plan.json deleted file mode 100644 index 1da5b3624239..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='AVRO');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_JOIN AS SELECT\n T.ID T_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nLEFT OUTER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_JOIN", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "topicName" : "LEFT_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "LEFT_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "LEFT_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "LEFT", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "T_ID" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "topicName" : "LEFT_JOIN" - }, - "queryId" : "CSAS_LEFT_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/spec.json deleted file mode 100644 index 45cff6fdcf09..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/spec.json +++ /dev/null @@ -1,327 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947956837, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_LEFT_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_LEFT_JOIN_0.LEFT_JOIN" : { - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_LEFT_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_LEFT_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_LEFT_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "AVRO" - } - }, - "CSAS_LEFT_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - } - } - }, - "testCase" : { - "name" : "stream stream left join with out of order and custom grace period - AVRO", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 1, - "value" : { - "L1" : "B" - }, - "timestamp" : 330000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "LEFT_JOIN", - "key" : 0, - "value" : { - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "LEFT_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : null - }, - "timestamp" : 90000 - }, { - "topic" : "LEFT_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "LEFT_JOIN", - "key" : 3, - "value" : { - "L1" : "D", - "L2" : null - }, - "timestamp" : 60000 - } ], - "topics" : [ { - "name" : "right_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "LEFT_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - }, - "valueFormat" : "AVRO", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='AVRO');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='AVRO');", "CREATE STREAM LEFT_JOIN as SELECT t.id, l1, l2 FROM LEFT_STREAM t left join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "LEFT_JOIN", - "type" : "STREAM", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "AVRO", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_LEFT_JOIN_0-KSTREAM-JOINTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "T_L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "T_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "T_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - }, { - "name" : "LEFT_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ] - } - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L1", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "partitions" : 4, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "L2", - "type" : [ "null", "string" ], - "default" : null - } ], - "connect.name" : "io.confluent.ksql.avro_schemas.KsqlDataSourceSchema" - } - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_LEFT_JOIN_0-KSTREAM-OUTEROTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "AVRO" - }, - "valueSchema" : { - "type" : "record", - "name" : "KsqlDataSourceSchema", - "namespace" : "io.confluent.ksql.avro_schemas", - "fields" : [ { - "name" : "TT_L2", - "type" : [ "null", "string" ], - "default" : null - }, { - "name" : "TT_ROWTIME", - "type" : [ "null", "long" ], - "default" : null - }, { - "name" : "TT_ID", - "type" : [ "null", "long" ], - "default" : null - } ] - } - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/topology deleted file mode 100644 index 1e8b9197f17d..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_AVRO/7.0.0_1623947956837/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-outer-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-this-join - <-- PrependAliasLeft - Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store, KSTREAM-OUTERSHARED-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-this-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-this-join, Join-outer-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: LEFT_JOIN) - <-- Project - diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/plan.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/plan.json deleted file mode 100644 index b7da1e8f6756..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/plan.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "plan" : [ { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 STRING) WITH (KAFKA_TOPIC='left_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 STRING) WITH (KAFKA_TOPIC='right_topic', KEY_FORMAT='KAFKA', VALUE_FORMAT='JSON');", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "RIGHT_STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - } - }, { - "@type" : "ksqlPlanV1", - "statementText" : "CREATE STREAM LEFT_JOIN AS SELECT\n T.ID T_ID,\n T.L1 L1,\n TT.L2 L2\nFROM LEFT_STREAM T\nLEFT OUTER JOIN RIGHT_STREAM TT WITHIN 1 MINUTES GRACE PERIOD 1 MINUTES ON ((T.ID = TT.ID))\nEMIT CHANGES", - "ddlCommand" : { - "@type" : "createStreamV1", - "sourceName" : "LEFT_JOIN", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "topicName" : "LEFT_JOIN", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "orReplace" : false - }, - "queryPlan" : { - "sources" : [ "LEFT_STREAM", "RIGHT_STREAM" ], - "sink" : "LEFT_JOIN", - "physicalPlan" : { - "@type" : "streamSinkV1", - "properties" : { - "queryContext" : "LEFT_JOIN" - }, - "source" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "Project" - }, - "source" : { - "@type" : "streamStreamJoinV1", - "properties" : { - "queryContext" : "Join" - }, - "joinType" : "LEFT", - "leftInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "rightInternalFormats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "leftSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasLeft" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Left/Source" - }, - "topicName" : "left_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L1` STRING" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "L1 AS T_L1", "ROWTIME AS T_ROWTIME", "ID AS T_ID" ] - }, - "rightSource" : { - "@type" : "streamSelectV1", - "properties" : { - "queryContext" : "PrependAliasRight" - }, - "source" : { - "@type" : "streamSourceV1", - "properties" : { - "queryContext" : "KafkaTopic_Right/Source" - }, - "topicName" : "right_topic", - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "sourceSchema" : "`ID` BIGINT KEY, `L2` STRING" - }, - "keyColumnNames" : [ "TT_ID" ], - "selectExpressions" : [ "L2 AS TT_L2", "ROWTIME AS TT_ROWTIME", "ID AS TT_ID" ] - }, - "beforeMillis" : 60.000000000, - "afterMillis" : 60.000000000, - "graceMillis" : 60.000000000, - "keyColName" : "T_ID" - }, - "keyColumnNames" : [ "T_ID" ], - "selectExpressions" : [ "T_L1 AS L1", "TT_L2 AS L2" ] - }, - "formats" : { - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "topicName" : "LEFT_JOIN" - }, - "queryId" : "CSAS_LEFT_JOIN_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.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" - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/spec.json b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/spec.json deleted file mode 100644 index d8cc4a7e4086..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/spec.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "version" : "7.0.0", - "timestamp" : 1623947957230, - "path" : "query-validation-tests/joins.json", - "schemas" : { - "CSAS_LEFT_JOIN_0.Join" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "keyFormat" : { - "format" : "KAFKA" - } - }, - "CSAS_LEFT_JOIN_0.LEFT_JOIN" : { - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_LEFT_JOIN_0.KafkaTopic_Left.Source" : { - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_LEFT_JOIN_0.Join.Left" : { - "schema" : "`T_ID` BIGINT KEY, `T_L1` STRING, `T_ROWTIME` BIGINT, `T_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_LEFT_JOIN_0.Join.Right" : { - "schema" : "`TT_ID` BIGINT KEY, `TT_L2` STRING, `TT_ROWTIME` BIGINT, `TT_ID` BIGINT", - "valueFormat" : { - "format" : "JSON" - } - }, - "CSAS_LEFT_JOIN_0.KafkaTopic_Right.Source" : { - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - } - }, - "testCase" : { - "name" : "stream stream left join with out of order and custom grace period - JSON", - "inputs" : [ { - "topic" : "left_topic", - "key" : 0, - "value" : { - "L1" : "A" - }, - "timestamp" : 0 - }, { - "topic" : "right_topic", - "key" : 0, - "value" : { - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "left_topic", - "key" : 1, - "value" : { - "L1" : "B" - }, - "timestamp" : 330000 - }, { - "topic" : "left_topic", - "key" : 2, - "value" : { - "L1" : "C" - }, - "timestamp" : 90000 - }, { - "topic" : "right_topic", - "key" : 2, - "value" : { - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "left_topic", - "key" : 3, - "value" : { - "L1" : "D" - }, - "timestamp" : 60000 - }, { - "topic" : "right_topic", - "key" : 3, - "value" : { - "L2" : "d" - }, - "timestamp" : 60000 - } ], - "outputs" : [ { - "topic" : "LEFT_JOIN", - "key" : 0, - "value" : { - "L1" : "A", - "L2" : "a" - }, - "timestamp" : 60000 - }, { - "topic" : "LEFT_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : null - }, - "timestamp" : 90000 - }, { - "topic" : "LEFT_JOIN", - "key" : 2, - "value" : { - "L1" : "C", - "L2" : "c" - }, - "timestamp" : 90000 - }, { - "topic" : "LEFT_JOIN", - "key" : 3, - "value" : { - "L1" : "D", - "L2" : null - }, - "timestamp" : 60000 - } ], - "topics" : [ { - "name" : "right_topic", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "LEFT_JOIN", - "replicas" : 1, - "numPartitions" : 4 - }, { - "name" : "left_topic", - "replicas" : 1, - "numPartitions" : 4 - } ], - "statements" : [ "CREATE STREAM LEFT_STREAM (ID BIGINT KEY, L1 varchar) WITH (kafka_topic='left_topic', value_format='JSON');", "CREATE STREAM RIGHT_STREAM (ID BIGINT KEY, L2 varchar) WITH (kafka_topic='right_topic', value_format='JSON');", "CREATE STREAM LEFT_JOIN as SELECT t.id, l1, l2 FROM LEFT_STREAM t left join RIGHT_STREAM tt WITHIN 1 minute GRACE PERIOD 1 minute on t.id = tt.id;" ], - "post" : { - "sources" : [ { - "name" : "LEFT_JOIN", - "type" : "STREAM", - "schema" : "`T_ID` BIGINT KEY, `L1` STRING, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "LEFT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L1` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - }, { - "name" : "RIGHT_STREAM", - "type" : "STREAM", - "schema" : "`ID` BIGINT KEY, `L2` STRING", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : "JSON", - "keyFeatures" : [ ], - "valueFeatures" : [ ] - } ], - "topics" : { - "topics" : [ { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_LEFT_JOIN_0-KSTREAM-JOINTHIS-0000000008-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - }, { - "name" : "LEFT_JOIN", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "left_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "right_topic", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - }, - "partitions" : 4 - }, { - "name" : "_confluent-ksql-some.ksql.service.idquery_CSAS_LEFT_JOIN_0-KSTREAM-OUTEROTHER-0000000009-store-changelog", - "keyFormat" : { - "format" : "KAFKA" - }, - "valueFormat" : { - "format" : "JSON" - } - } ] - } - } - } -} \ No newline at end of file diff --git a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/topology b/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/topology deleted file mode 100644 index 1e8b9197f17d..000000000000 --- a/ksqldb-functional-tests/src/test/resources/historical_plans/joins_-_stream_stream_left_join_with_out_of_order_and_custom_grace_period_-_JSON/7.0.0_1623947957230/topology +++ /dev/null @@ -1,39 +0,0 @@ -Topologies: - Sub-topology: 0 - Source: KSTREAM-SOURCE-0000000000 (topics: [left_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000001 - Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) - --> KSTREAM-TRANSFORMVALUES-0000000004 - Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PrependAliasLeft - <-- KSTREAM-SOURCE-0000000000 - Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) - --> PrependAliasRight - <-- KSTREAM-SOURCE-0000000003 - Processor: PrependAliasLeft (stores: []) - --> Join-this-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: PrependAliasRight (stores: []) - --> Join-other-windowed - <-- KSTREAM-TRANSFORMVALUES-0000000004 - Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-outer-other-join - <-- PrependAliasRight - Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) - --> Join-this-join - <-- PrependAliasLeft - Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store, KSTREAM-OUTERSHARED-0000000008-store]) - --> Join-merge - <-- Join-other-windowed - Processor: Join-this-join (stores: [KSTREAM-OUTERSHARED-0000000008-store, KSTREAM-OUTEROTHER-0000000009-store]) - --> Join-merge - <-- Join-this-windowed - Processor: Join-merge (stores: []) - --> Project - <-- Join-this-join, Join-outer-other-join - Processor: Project (stores: []) - --> KSTREAM-SINK-0000000012 - <-- Join-merge - Sink: KSTREAM-SINK-0000000012 (topic: LEFT_JOIN) - <-- Project - diff --git a/ksqldb-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java b/ksqldb-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java index 36bd1d0d9221..7ec2254b4725 100644 --- a/ksqldb-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java +++ b/ksqldb-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java @@ -88,20 +88,8 @@ public static KStreamHolder build( final JoinParams joinParams = JoinParamsFactory .create(join.getKeyColName(), leftSchema, rightSchema); - JoinWindows joinWindows; - - // Grace, as optional, helps to identify if a user specified the GRACE PERIOD syntax in the - // join window. If specified, then we'll call the new KStreams API ofTimeDifferenceAndGrace() - // which enables the "spurious" results bugfix with left/outer joins (see KAFKA-10847). - if (join.getGraceMillis().isPresent()) { - joinWindows = JoinWindows.ofTimeDifferenceAndGrace( - join.getBeforeMillis(), - join.getGraceMillis().get()); - } else { - joinWindows = JoinWindows.of(join.getBeforeMillis()); - } - - joinWindows = joinWindows.after(join.getAfterMillis()); + final JoinWindows joinWindows = JoinWindows.of(join.getBeforeMillis()) + .after(join.getAfterMillis()); final KStream result; switch (join.getJoinType()) { diff --git a/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java b/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java index 3e91758925f6..6b010c8b0a92 100644 --- a/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java +++ b/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java @@ -222,26 +222,6 @@ public void shouldDoLeftJoinWithSyntheticKey() { assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); } - @Test - public void shouldDoLeftJoinWithGrace() { - // Given: - givenLeftJoin(L_KEY, Optional.of(GRACE)); - - // When: - final KStreamHolder result = join.build(planBuilder, planInfo); - - // Then: - verify(leftKStream).leftJoin( - same(rightKStream), - eq(new KsqlValueJoiner(LEFT_SCHEMA.value().size(), RIGHT_SCHEMA.value().size(), 0)), - eq(WINDOWS_WITH_GRACE), - same(joined) - ); - verifyNoMoreInteractions(leftKStream, rightKStream, resultKStream); - assertThat(result.getStream(), is(resultKStream)); - assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); - } - @Test public void shouldDoOuterJoin() { // Given: @@ -262,26 +242,6 @@ public void shouldDoOuterJoin() { assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); } - @Test - public void shouldDoOuterJoinWithGrace() { - // Given: - givenOuterJoin(Optional.of(GRACE)); - - // When: - final KStreamHolder result = join.build(planBuilder, planInfo); - - // Then: - verify(leftKStream).outerJoin( - same(rightKStream), - eq(new KsqlValueJoiner(LEFT_SCHEMA.value().size(), RIGHT_SCHEMA.value().size(), 1)), - eq(WINDOWS_WITH_GRACE), - same(joined) - ); - verifyNoMoreInteractions(leftKStream, rightKStream, resultKStream); - assertThat(result.getStream(), is(resultKStream)); - assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); - } - @Test public void shouldDoInnerJoin() { // Given: @@ -322,26 +282,6 @@ public void shouldDoInnerJoinWithSyntheticKey() { assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); } - @Test - public void shouldDoInnerJoinWithGrace() { - // Given: - givenInnerJoin(L_KEY, Optional.of(GRACE)); - - // When: - final KStreamHolder result = join.build(planBuilder, planInfo); - - // Then: - verify(leftKStream).join( - same(rightKStream), - eq(new KsqlValueJoiner(LEFT_SCHEMA.value().size(), RIGHT_SCHEMA.value().size(), 0)), - eq(WINDOWS_WITH_GRACE), - same(joined) - ); - verifyNoMoreInteractions(leftKStream, rightKStream, resultKStream); - assertThat(result.getStream(), is(resultKStream)); - assertThat(result.getExecutionKeyFactory(), is(executionKeyFactory)); - } - @Test public void shouldReturnCorrectSchema() { // Given: