Skip to content

Commit

Permalink
fix: Revert named stores in expected topologies, disable naming store…
Browse files Browse the repository at this point in the history
…s 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 <[email protected]>, Almog Gavra <[email protected]>
  • Loading branch information
bbejeck authored Oct 11, 2019
1 parent 5315f1e commit 0b8ccc1
Show file tree
Hide file tree
Showing 33 changed files with 125 additions and 135 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [])
Expand Down
Loading

0 comments on commit 0b8ccc1

Please sign in to comment.