From 0b8ccc1de3d7a5e105bf084a942aeacec838fdc4 Mon Sep 17 00:00:00 2001 From: Bill Bejeck Date: Fri, 11 Oct 2019 12:54:48 -0400 Subject: [PATCH] fix: Revert named stores in expected topologies, disable naming stores from StreamJoined, re-enable join tests. (#3550) This PR disables the naming of stores in join operations and reverts the named stores in the expected topologies files. Note that in the future KSQL can easily re-enable the naming of state stores for joins. After this PR is merged, we should be able to close #3364 Reviewers: Andy Coates , Almog Gavra --- ...custom-timestamp_-_stream_stream_inner_join_with_ts | 8 ++++---- ...ream_stream_inner_join_with_ts_extractor_both_sides | 8 ++++---- .../5_2_0/joins_-_stream_stream_inner_join | 8 ++++---- ...stream_stream_inner_join_all_left_fields_some_right | 8 ++++---- ...stream_stream_inner_join_all_right_fields_some_left | 8 ++++---- ..._inner_join_with_different_before_and_after_windows | 8 ++++---- ...stream_stream_inner_join_with_out_of_order_messages | 8 ++++---- .../5_2_0/joins_-_stream_stream_left_join | 8 ++++---- .../5_2_0/joins_-_stream_stream_outer_join | 8 ++++---- .../5_3_0/identifiers_-_aliased_join_source | 8 ++++---- .../5_3_0/identifiers_-_aliased_join_source_with_AS | 8 ++++---- .../5_3_0/identifiers_-_aliased_left_unaliased_right | 8 ++++---- .../5_3_0/identifiers_-_unaliased_left_aliased_right | 8 ++++---- ...custom-timestamp_-_stream_stream_inner_join_with_ts | 8 ++++---- ...ream_stream_inner_join_with_ts_extractor_both_sides | 8 ++++---- ...he_criteria_-_new_key_fields_-_no_source_key_fields | 8 ++++---- .../5_3_0/joins_-_stream_stream_inner_join | 8 ++++---- ...ream_stream_inner_join_-_join_key_not_in_projection | 8 ++++---- ...am_stream_inner_join_-_right_join_key_in_projection | 8 ++++---- .../5_3_0/joins_-_stream_stream_inner_join_all_fields | 8 ++++---- ...stream_stream_inner_join_all_left_fields_some_right | 8 ++++---- ...stream_stream_inner_join_all_right_fields_some_left | 8 ++++---- ..._inner_join_with_different_before_and_after_windows | 8 ++++---- ...stream_stream_inner_join_with_out_of_order_messages | 8 ++++---- .../5_3_0/joins_-_stream_stream_left_join | 8 ++++---- ...eam_stream_left_join_-_both_join_keys_in_projection | 8 ++++---- ...tream_stream_left_join_-_join_key_not_in_projection | 8 ++++---- .../5_3_0/joins_-_stream_stream_left_join_-_rekey | 8 ++++---- ...eam_stream_left_join_-_right_join_key_in_projection | 8 ++++---- .../5_3_0/joins_-_stream_stream_outer_join | 8 ++++---- ...am_stream_outer_join_-_right_join_key_in_projection | 8 ++++---- .../test/resources/query-validation-tests/joins.json | 10 ---------- .../ksql/execution/streams/StreamJoinedFactory.java | 2 +- 33 files changed, 125 insertions(+), 135 deletions(-) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts index ffd3b313fc01..d926de44990a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides index 829952d2156f..d6ff908b152c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join index 576ded34dd31..d4ac8f8a331d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_left_fields_some_right b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_left_fields_some_right index 16855f073e0e..8ca737493e63 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_left_fields_some_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_left_fields_some_right @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_right_fields_some_left b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_right_fields_some_left index 1d74eb83cd7e..13771c5cfc3a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_right_fields_some_left +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_all_right_fields_some_left @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows index c20d99cfa10b..a4c5492e29f3 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_out_of_order_messages b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_out_of_order_messages index ae174fbb5c15..3cf25cfc89b2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_out_of_order_messages +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_inner_join_with_out_of_order_messages @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_left_join b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_left_join index c5afaa77e8c6..3c06a054b66d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_left_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_left_join @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_outer_join b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_outer_join index e5a278518859..b9f9d9b52e1c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_outer_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_2_0/joins_-_stream_stream_outer_join @@ -48,16 +48,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-outer-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-outer-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-outer-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-outer-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-outer-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source index fb5d469ede22..2c20447b391f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source_with_AS b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source_with_AS index fb5d469ede22..2c20447b391f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source_with_AS +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_join_source_with_AS @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_left_unaliased_right b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_left_unaliased_right index 6e79f08ac364..6c18e23e7e6c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_left_unaliased_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_aliased_left_unaliased_right @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_unaliased_left_aliased_right b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_unaliased_left_aliased_right index 69ef27cee1cc..42ad3013d5db 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_unaliased_left_aliased_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/identifiers_-_unaliased_left_aliased_right @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts index 93ae576e67ae..88c2d2296cdb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides index c3c1e5aa6024..26a2cc33f549 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_join_using_ROWKEY_in_the_criteria_-_new_key_fields_-_no_source_key_fields b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_join_using_ROWKEY_in_the_criteria_-_new_key_fields_-_no_source_key_fields index b26b97775762..ef0e914eed5c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_join_using_ROWKEY_in_the_criteria_-_new_key_fields_-_no_source_key_fields +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_join_using_ROWKEY_in_the_criteria_-_new_key_fields_-_no_source_key_fields @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join index 033ca817b1c1..c782f2fb1eec 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_join_key_not_in_projection index 7fb0f7ec2166..b070848f34cc 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_join_key_not_in_projection @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_right_join_key_in_projection index c320296547e5..f74e4d29ffc2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_-_right_join_key_in_projection @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_fields b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_fields index d5e26f7823f0..706130d3d490 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_fields +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_fields @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_left_fields_some_right b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_left_fields_some_right index ea5661429d92..d5b3000d1650 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_left_fields_some_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_left_fields_some_right @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_right_fields_some_left b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_right_fields_some_left index b198aee42320..f2f0c79d49fa 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_right_fields_some_left +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_all_right_fields_some_left @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows index 033ca817b1c1..c782f2fb1eec 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_different_before_and_after_windows @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_out_of_order_messages b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_out_of_order_messages index 033ca817b1c1..c782f2fb1eec 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_out_of_order_messages +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_inner_join_with_out_of_order_messages @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-other-join (stores: [Join-this-join-store]) + Processor: Join-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-JOINOTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join index b26b97775762..ef0e914eed5c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_both_join_keys_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_both_join_keys_in_projection index 6a8167b93b64..7595fa61a159 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_both_join_keys_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_both_join_keys_in_projection @@ -92,16 +92,16 @@ Topologies: --> Join-this-windowed Source: KSTREAM-SOURCE-0000000017 (topics: [Join-right-repartition]) --> Join-other-windowed - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-outer-other-join <-- KSTREAM-SOURCE-0000000017 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-this-join <-- KSTREAM-SOURCE-0000000014 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_join_key_not_in_projection index d2b209134d6b..6192844cbecd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_join_key_not_in_projection @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_rekey b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_rekey index 7a5231b5d815..6d907d35b72a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_rekey +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_rekey @@ -92,16 +92,16 @@ Topologies: --> Join-this-windowed Source: KSTREAM-SOURCE-0000000017 (topics: [Join-right-repartition]) --> Join-other-windowed - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-outer-other-join <-- KSTREAM-SOURCE-0000000017 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-this-join <-- KSTREAM-SOURCE-0000000014 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_right_join_key_in_projection index 655716c0668b..bbafb48a9fd8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_left_join_-_right_join_key_in_projection @@ -92,16 +92,16 @@ Topologies: --> Join-this-windowed Source: KSTREAM-SOURCE-0000000017 (topics: [Join-right-repartition]) --> Join-other-windowed - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-outer-other-join <-- KSTREAM-SOURCE-0000000017 - Processor: Join-this-windowed (stores: [Join-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-this-join <-- KSTREAM-SOURCE-0000000014 - Processor: Join-outer-other-join (stores: [Join-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-JOINTHIS-0000000020-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-this-join (stores: [KSTREAM-OUTEROTHER-0000000021-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join index 9251dcfe3c8b..605d80ace232 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-outer-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-outer-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-outer-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-outer-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-outer-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join_-_right_join_key_in_projection index 7b59fe29365b..6ccb32d68b79 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/5_3_0/joins_-_stream_stream_outer_join_-_right_join_key_in_projection @@ -56,16 +56,16 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000005 (stores: []) --> Join-other-windowed <-- KSTREAM-MAPVALUES-0000000004 - Processor: Join-other-windowed (stores: [Join-outer-other-join-store]) + Processor: Join-other-windowed (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-outer-other-join <-- KSTREAM-TRANSFORMVALUES-0000000005 - Processor: Join-this-windowed (stores: [Join-outer-this-join-store]) + Processor: Join-this-windowed (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-outer-this-join <-- KSTREAM-TRANSFORMVALUES-0000000002 - Processor: Join-outer-other-join (stores: [Join-outer-this-join-store]) + Processor: Join-outer-other-join (stores: [KSTREAM-OUTERTHIS-0000000008-store]) --> Join-merge <-- Join-other-windowed - Processor: Join-outer-this-join (stores: [Join-outer-other-join-store]) + Processor: Join-outer-this-join (stores: [KSTREAM-OUTEROTHER-0000000009-store]) --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) diff --git a/ksql-functional-tests/src/test/resources/query-validation-tests/joins.json b/ksql-functional-tests/src/test/resources/query-validation-tests/joins.json index a0f31f7a15e6..293dacf6dc7e 100644 --- a/ksql-functional-tests/src/test/resources/query-validation-tests/joins.json +++ b/ksql-functional-tests/src/test/resources/query-validation-tests/joins.json @@ -1,8 +1,6 @@ { "tests": [ { - "comment": "re-enable after KIP-479 is merged", - "enabled": false, "name": "stream stream left join", "format": ["AVRO", "JSON"], "statements": [ @@ -85,8 +83,6 @@ } }, { - "comment": "re-enable after KIP-479 is merged", - "enabled": false, "name": "stream stream left join - rekey", "format": ["AVRO", "JSON"], "statements": [ @@ -264,8 +260,6 @@ } }, { - "comment": "re-enable after KIP-479 is merged", - "enabled": false, "name": "stream stream inner join", "format": ["AVRO", "JSON"], "statements": [ @@ -324,8 +318,6 @@ } }, { - "comment": "re-enable after KIP-479 is merged", - "enabled": false, "name": "stream stream inner join all left fields some right", "format": ["AVRO", "JSON"], "statements": [ @@ -382,8 +374,6 @@ } }, { - "comment": "re-enable after KIP-479 is merged", - "enabled": false, "name": "stream stream inner join all fields", "format": ["AVRO", "JSON"], "statements": [ diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamJoinedFactory.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamJoinedFactory.java index 3832711fa42d..02883ff7c1f6 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamJoinedFactory.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamJoinedFactory.java @@ -39,7 +39,7 @@ public StreamJoined create( final String name, final String storeName) { return StreamJoined.with(keySerde, leftSerde, rightSerde) - .withName(name).withStoreName(storeName); + .withName(name); } }; }