Skip to content

Commit

Permalink
Merge branch '5.2.x' into 5.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcrfxia
vcrfxia committed Feb 14, 2020
2 parents 0d6eeaf + 92afbda commit cf9c6b9
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 108 deletions.
23 changes: 11 additions & 12 deletions ksql-engine/src/test/java/io/confluent/ksql/util/ItemDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

package io.confluent.ksql.util;

import com.google.common.collect.ImmutableMap;
import io.confluent.ksql.GenericRow;
import io.confluent.ksql.schema.ksql.KsqlSchema;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.connect.data.SchemaBuilder;

Expand All @@ -45,17 +45,16 @@ public ItemDataProvider() {

private static Map<String, GenericRow> buildData() {

final Map<String, GenericRow> dataMap = new HashMap<>();
dataMap.put("ITEM_1", new GenericRow(Arrays.asList("ITEM_1", "home cinema")));
dataMap.put("ITEM_2", new GenericRow(Arrays.asList("ITEM_2", "clock radio")));
dataMap.put("ITEM_3", new GenericRow(Arrays.asList("ITEM_3", "road bike")));
dataMap.put("ITEM_4", new GenericRow(Arrays.asList("ITEM_4", "mountain bike")));
dataMap.put("ITEM_5", new GenericRow(Arrays.asList("ITEM_5", "snowboard")));
dataMap.put("ITEM_6", new GenericRow(Arrays.asList("ITEM_6", "iphone 10")));
dataMap.put("ITEM_7", new GenericRow(Arrays.asList("ITEM_7", "gopro")));
dataMap.put("ITEM_8", new GenericRow(Arrays.asList("ITEM_8", "cat")));

return dataMap;
return ImmutableMap.<String, GenericRow>builder()
.put("ITEM_1", new GenericRow(Arrays.asList("ITEM_1", "home cinema")))
.put("ITEM_2", new GenericRow(Arrays.asList("ITEM_2", "clock radio")))
.put("ITEM_3", new GenericRow(Arrays.asList("ITEM_3", "road bike")))
.put("ITEM_4", new GenericRow(Arrays.asList("ITEM_4", "mountain bike")))
.put("ITEM_5", new GenericRow(Arrays.asList("ITEM_5", "snowboard")))
.put("ITEM_6", new GenericRow(Arrays.asList("ITEM_6", "iphone 10")))
.put("ITEM_7", new GenericRow(Arrays.asList("ITEM_7", "gopro")))
.put("ITEM_8", new GenericRow(Arrays.asList("ITEM_8", "cat")))
.build();
}

}
140 changes: 67 additions & 73 deletions ksql-engine/src/test/java/io/confluent/ksql/util/OrderDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package io.confluent.ksql.util;

import com.google.common.collect.ImmutableMap;
import io.confluent.ksql.GenericRow;
import io.confluent.ksql.schema.ksql.KsqlSchema;
import java.util.Arrays;
Expand Down Expand Up @@ -63,79 +64,72 @@ private static Map<String, GenericRow> buildData() {
mapField.put("key2", 2.0);
mapField.put("key3", 3.0);

final Map<String, GenericRow> dataMap = new HashMap<>();
dataMap.put("1", new GenericRow(Arrays.asList(
1L,
"ORDER_1",
"ITEM_1",
10.0,
"2018-01-01",
Arrays.asList(100.0, 110.99, 90.0 ),
mapField)));
dataMap.put("2", new GenericRow(Arrays.asList(
2L,
"ORDER_2",
"ITEM_2",
20.0,
"2018-01-02",
Arrays.asList(10.0, 10.99, 9.0),
mapField)));

dataMap.put("3", new GenericRow(Arrays.asList(
3L,
"ORDER_3",
"ITEM_3",
30.0,
"2018-01-03",
Arrays.asList(10.0, 10.99, 91.0),
mapField)));

dataMap.put("4", new GenericRow(Arrays.asList(
4L,
"ORDER_4",
"ITEM_4",
40.0,
"2018-01-04",
Arrays.asList(10.0, 140.99, 94.0),
mapField)));

dataMap.put("5", new GenericRow(Arrays.asList(
5L,
"ORDER_5",
"ITEM_5",
50.0,
"2018-01-05",
Arrays.asList(160.0, 160.99, 98.0),
mapField)));

dataMap.put("6", new GenericRow(Arrays.asList(
6L,
"ORDER_6",
"ITEM_6",
60.0,
"2018-01-06",
Arrays.asList(1000.0, 1100.99, 900.0),
mapField)));

dataMap.put("7", new GenericRow(Arrays.asList(
7L,
"ORDER_6",
"ITEM_7",
70.0,
"2018-01-07",
Arrays.asList(1100.0, 1110.99, 190.0),
mapField)));

dataMap.put("8", new GenericRow(Arrays.asList(
8L,
"ORDER_6",
"ITEM_8",
80.0,
"2018-01-08",
Arrays.asList(1100.0, 1110.99, 970.0),
mapField)));

return dataMap;
return ImmutableMap.<String, GenericRow>builder()
.put("1", new GenericRow(Arrays.asList(
1L,
"ORDER_1",
"ITEM_1",
10.0,
"2018-01-01",
Arrays.asList(100.0, 110.99, 90.0 ),
mapField)))
.put("2", new GenericRow(Arrays.asList(
2L,
"ORDER_2",
"ITEM_2",
20.0,
"2018-01-02",
Arrays.asList(10.0, 10.99, 9.0),
mapField)))
.put("3", new GenericRow(Arrays.asList(
3L,
"ORDER_3",
"ITEM_3",
30.0,
"2018-01-03",
Arrays.asList(10.0, 10.99, 91.0),
mapField)))
.put("4", new GenericRow(Arrays.asList(
4L,
"ORDER_4",
"ITEM_4",
40.0,
"2018-01-04",
Arrays.asList(10.0, 140.99, 94.0),
mapField)))
.put("5", new GenericRow(Arrays.asList(
5L,
"ORDER_5",
"ITEM_5",
50.0,
"2018-01-05",
Arrays.asList(160.0, 160.99, 98.0),
mapField)))
.put("6", new GenericRow(Arrays.asList(
6L,
"ORDER_6",
"ITEM_6",
60.0,
"2018-01-06",
Arrays.asList(1000.0, 1100.99, 900.0),
mapField)))
.put("7", new GenericRow(Arrays.asList(
7L,
"ORDER_6",
"ITEM_7",
70.0,
"2018-01-07",
Arrays.asList(1100.0, 1110.99, 190.0),
mapField)))
.put("8", new GenericRow(Arrays.asList(
8L,
"ORDER_6",
"ITEM_8",
80.0,
"2018-01-08",
Arrays.asList(1100.0, 1110.99, 970.0),
mapField)))
.build();
}

}
25 changes: 11 additions & 14 deletions ksql-engine/src/test/java/io/confluent/ksql/util/PageViewDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
*/
package io.confluent.ksql.util;

import com.google.common.collect.ImmutableMap;
import io.confluent.ksql.GenericRow;
import io.confluent.ksql.schema.ksql.KsqlSchema;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.connect.data.SchemaBuilder;

Expand All @@ -43,22 +43,19 @@ public PageViewDataProvider() {
}

private static Map<String, GenericRow> buildData() {
final Map<String, GenericRow> dataMap = new HashMap<>();

// Create page view records with:
// key = page_id
// value = (view time, user_id, page_id)
dataMap.put("1", new GenericRow(Arrays.asList(1L, "USER_1", "PAGE_1")));
dataMap.put("2", new GenericRow(Arrays.asList(2L, "USER_2", "PAGE_2")));
dataMap.put("3", new GenericRow(Arrays.asList(3L, "USER_4", "PAGE_3")));
dataMap.put("4", new GenericRow(Arrays.asList(4L, "USER_3", "PAGE_4")));
dataMap.put("5", new GenericRow(Arrays.asList(5L, "USER_0", "PAGE_5")));

// Duplicate page views from different users.
dataMap.put("6", new GenericRow(Arrays.asList(6L, "USER_2", "PAGE_5")));
dataMap.put("7", new GenericRow(Arrays.asList(7L, "USER_3", "PAGE_5")));

return dataMap;
return ImmutableMap.<String, GenericRow>builder()
.put("1", new GenericRow(Arrays.asList(1L, "USER_1", "PAGE_1")))
.put("2", new GenericRow(Arrays.asList(2L, "USER_2", "PAGE_2")))
.put("3", new GenericRow(Arrays.asList(3L, "USER_4", "PAGE_3")))
.put("4", new GenericRow(Arrays.asList(4L, "USER_3", "PAGE_4")))
.put("5", new GenericRow(Arrays.asList(5L, "USER_0", "PAGE_5")))
// Duplicate page views from different users.
.put("6", new GenericRow(Arrays.asList(6L, "USER_2", "PAGE_5")))
.put("7", new GenericRow(Arrays.asList(7L, "USER_3", "PAGE_5")))
.build();
}

}
17 changes: 8 additions & 9 deletions ksql-engine/src/test/java/io/confluent/ksql/util/UserDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
*/
package io.confluent.ksql.util;

import com.google.common.collect.ImmutableMap;
import io.confluent.ksql.GenericRow;
import io.confluent.ksql.schema.ksql.KsqlSchema;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.connect.data.SchemaBuilder;

Expand All @@ -42,17 +42,16 @@ public UserDataProvider() {
}

private static Map<String, GenericRow> buildData() {
final Map<String, GenericRow> dataMap = new HashMap<>();
// create a records with:
// key == user_id
// value = (creation_time, gender, region, user_id)
dataMap.put("USER_0", new GenericRow(Arrays.asList(0L, "FEMALE", "REGION_0", "USER_0")));
dataMap.put("USER_1", new GenericRow(Arrays.asList(1L, "MALE", "REGION_1", "USER_1")));
dataMap.put("USER_2", new GenericRow(Arrays.asList(2L, "FEMALE", "REGION_1", "USER_2")));
dataMap.put("USER_3", new GenericRow(Arrays.asList(3L, "MALE", "REGION_0", "USER_3")));
dataMap.put("USER_4", new GenericRow(Arrays.asList(4L, "MALE", "REGION_4", "USER_4")));

return dataMap;
return ImmutableMap.<String, GenericRow>builder()
.put("USER_0", new GenericRow(Arrays.asList(0L, "FEMALE", "REGION_0", "USER_0")))
.put("USER_1", new GenericRow(Arrays.asList(1L, "MALE", "REGION_1", "USER_1")))
.put("USER_2", new GenericRow(Arrays.asList(2L, "FEMALE", "REGION_1", "USER_2")))
.put("USER_3", new GenericRow(Arrays.asList(3L, "MALE", "REGION_0", "USER_3")))
.put("USER_4", new GenericRow(Arrays.asList(4L, "MALE", "REGION_4", "USER_4")))
.build();
}


Expand Down

0 comments on commit cf9c6b9

Please sign in to comment.