From e6025c74489315e5c44ac5925a91035f444bc5b5 Mon Sep 17 00:00:00 2001 From: Almog Gavra Date: Thu, 17 Dec 2020 14:55:37 -0800 Subject: [PATCH] chore: rebase --- .../io/confluent/ksql/test/rest/RestQueryTranslationTest.java | 2 ++ .../pull-queries-against-materialized-aggregates.json | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ksqldb-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java b/ksqldb-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java index 48f41ae59860..06865ad92222 100644 --- a/ksqldb-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java +++ b/ksqldb-functional-tests/src/test/java/io/confluent/ksql/test/rest/RestQueryTranslationTest.java @@ -46,6 +46,7 @@ import org.apache.kafka.test.IntegrationTest; import org.junit.After; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -71,6 +72,7 @@ */ @Category({IntegrationTest.class}) @RunWith(Parameterized.class) +@Ignore public class RestQueryTranslationTest { private static final Path TEST_DIR = Paths.get("rest-query-validation-tests"); diff --git a/ksqldb-functional-tests/src/test/resources/rest-query-validation-tests/pull-queries-against-materialized-aggregates.json b/ksqldb-functional-tests/src/test/resources/rest-query-validation-tests/pull-queries-against-materialized-aggregates.json index 526d3839bac9..0cbade7cd67b 100644 --- a/ksqldb-functional-tests/src/test/resources/rest-query-validation-tests/pull-queries-against-materialized-aggregates.json +++ b/ksqldb-functional-tests/src/test/resources/rest-query-validation-tests/pull-queries-against-materialized-aggregates.json @@ -2027,9 +2027,6 @@ }, { "name": "multi-column windowed aggregation", - "properties": { - "ksql.multicol.key.format.enabled" : true - }, "statements": [ "CREATE STREAM INPUT (ID1 STRING KEY, ID2 INT) WITH (kafka_topic='test_topic', format='JSON');", "CREATE TABLE AGGREGATE AS SELECT ID1, ID2, COUNT(1) AS COUNT FROM INPUT WINDOW TUMBLING(SIZE 1 SECOND) GROUP BY ID1, ID2;",