Skip to content

Commit 90c8fb5

Browse files
grieve54706grieve54706
committed
Modify catalog to wrenai
1 parent 88d527b commit 90c8fb5

23 files changed

+70
-70
lines changed

‎wren-base/src/test/resources/tpch_mdl.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"catalog": "canner-cml",
2+
"catalog": "wrenai",
33
"schema": "tpch_tiny",
44
"models": [
55
{
66
"name": "Orders",
7-
"refSql": "select * from \"canner-cml\".tpch_tiny.orders",
7+
"refSql": "select * from wrenai.tpch_tiny.orders",
88
"columns": [
99
{
1010
"name": "orderkey",
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"name": "Customer",
49-
"refSql": "select * from \"canner-cml\".tpch_tiny.customer",
49+
"refSql": "select * from wrenai.tpch_tiny.customer",
5050
"columns": [
5151
{
5252
"name": "custkey",
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"name": "Lineitem",
81-
"refSql": "select * from \"canner-cml\".tpch_tiny.lineitem",
81+
"refSql": "select * from wrenai.tpch_tiny.lineitem",
8282
"columns": [
8383
{
8484
"name": "orderkey",
@@ -130,7 +130,7 @@
130130
},
131131
{
132132
"name": "Part",
133-
"refSql": "select * from \"canner-cml\".tpch_tiny.part",
133+
"refSql": "select * from wrenai.tpch_tiny.part",
134134
"columns": [
135135
{
136136
"name": "partkey",
@@ -147,7 +147,7 @@
147147
},
148148
{
149149
"name": "Nation",
150-
"refSql": "select * from \"canner-cml\".tpch_tiny.nation",
150+
"refSql": "select * from wrenai.tpch_tiny.nation",
151151
"columns": [
152152
{
153153
"name": "nationkey",
@@ -189,7 +189,7 @@
189189
},
190190
{
191191
"name": "Region",
192-
"refSql": "select * from \"canner-cml\".tpch_tiny.region",
192+
"refSql": "select * from wrenai.tpch_tiny.region",
193193
"columns": [
194194
{
195195
"name": "regionkey",

‎wren-tests/src/test/java/io/wren/testing/TestMDLResource.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ public class TestMDLResource
4646
private Path wrenMDLFilePath;
4747
private Path mdlDir;
4848
private Manifest initial = Manifest.builder()
49-
.setCatalog("canner-cml")
49+
.setCatalog("wrenai")
5050
.setSchema("tpch_tiny")
5151
.setModels(List.of(
52-
model("Orders", "SELECT * FROM \"canner-cml\".tpch_tiny.orders", List.of(column("orderkey", "integer", null, false, "o_orderkey")))))
52+
model("Orders", "SELECT * FROM wrenai.tpch_tiny.orders", List.of(column("orderkey", "integer", null, false, "o_orderkey")))))
5353
.build();
5454

5555
private Manifest updated = Manifest.builder()
56-
.setCatalog("canner-cml")
56+
.setCatalog("wrenai")
5757
.setSchema("tpch_tiny")
5858
.setModels(List.of(
59-
model("Orders", "SELECT * FROM \"canner-cml\".tpch_tiny.orders",
59+
model("Orders", "SELECT * FROM wrenai.tpch_tiny.orders",
6060
List.of(column("orderkey", "integer", null, false, "o_orderkey"),
6161
column("custkey", "integer", null, false, "o_custkey")))))
6262
.build();
@@ -114,10 +114,10 @@ public void testDeploy()
114114
public void testPreview()
115115
{
116116
Manifest previewManifest = Manifest.builder()
117-
.setCatalog("canner-cml")
117+
.setCatalog("wrenai")
118118
.setSchema("tpch_tiny")
119119
.setModels(List.of(
120-
model("Customer", "SELECT * FROM \"canner-cml\".tpch_tiny.customer",
120+
model("Customer", "SELECT * FROM wrenai.tpch_tiny.customer",
121121
List.of(column("custkey", "integer", null, false, "c_custkey")))))
122122
.build();
123123

‎wren-tests/src/test/java/io/wren/testing/TestMetadataQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class TestMetadataQuery
4646
@Override
4747
protected String getDefaultCatalog()
4848
{
49-
return "canner-cml";
49+
return "wrenai";
5050
}
5151

5252
@Override

‎wren-tests/src/test/java/io/wren/testing/bigquery/AbstractCacheTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected ImmutableMap.Builder<String, String> getProperties()
9999

100100
protected Optional<CacheInfoPair> getDefaultCacheInfoPair(String name)
101101
{
102-
return Optional.ofNullable(cachedTableMapping.get().getCacheInfoPair("canner-cml", "tpch_tiny", name));
102+
return Optional.ofNullable(cachedTableMapping.get().getCacheInfoPair("wrenai", "tpch_tiny", name));
103103
}
104104

105105
protected List<Object[]> queryDuckdb(String statement)

‎wren-tests/src/test/java/io/wren/testing/bigquery/AbstractWireProtocolTestWithBigQuery.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public abstract class AbstractWireProtocolTestWithBigQuery
3737
extends AbstractWireProtocolTest
3838
{
3939
protected static final Manifest DEFAULT_MANIFEST = Manifest.builder()
40-
.setCatalog("canner-cml")
40+
.setCatalog("wrenai")
4141
.setSchema("tpch_tiny")
4242
.build();
4343
private static final Logger LOG = Logger.get(AbstractWireProtocolTestWithBigQuery.class);
@@ -81,7 +81,7 @@ protected Optional<String> getWrenMDLPath()
8181
@Override
8282
protected String getDefaultCatalog()
8383
{
84-
return "canner-cml";
84+
return "wrenai";
8585
}
8686

8787
@Override

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestBigQueryCache.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ protected Properties getDefaultProperties()
6161
}
6262

6363
/*
64-
* CREATE TABLE `canner-cml.cml_temp.cache_bigquery_type`(
64+
* CREATE TABLE `wrenai.cml_temp.cache_bigquery_type`(
6565
* c_string STRING, c_bytes BYTES, c_integer INT64, c_float FLOAT64, c_numeric NUMERIC,
6666
* c_bignumeric BIGNUMERIC, c_boolean BOOL, c_timestamp TIMESTAMP, c_date DATE, c_datetime DATETIME,
6767
* c_time TIME, c_geography GEOGRAPHY, c_json JSON, c_interval INTERVAL, c_struct STRUCT<s1 INT64, s2 STRING>,
6868
* c_array_string ARRAY<STRING>);
6969
*
70-
* INSERT INTO `canner-cml.cml_temp.cache_bigquery_type`(
70+
* INSERT INTO `wrenai.cml_temp.cache_bigquery_type`(
7171
* c_string, c_bytes, c_integer, c_float, c_numeric,
7272
* c_bignumeric, c_boolean, c_timestamp, c_date, c_datetime,
7373
* c_time, c_geography, c_json, c_interval,
@@ -82,7 +82,7 @@ protected Properties getDefaultProperties()
8282
public void testType()
8383
throws SQLException
8484
{
85-
String mappingName = cachedTableMapping.get().getCacheInfoPair("canner-cml", "cml_temp", "PrintBigQueryType").getRequiredTableName();
85+
String mappingName = cachedTableMapping.get().getCacheInfoPair("wrenai", "cml_temp", "PrintBigQueryType").getRequiredTableName();
8686
List<Object[]> tables = queryDuckdb("show tables");
8787

8888
Set<String> tableNames = tables.stream().map(table -> table[0].toString()).collect(toImmutableSet());
@@ -153,7 +153,7 @@ public static Object[][] typesInPredicateProvider()
153153
public void testTypesInPredicate(String columnName, Object value)
154154
throws SQLException
155155
{
156-
String mappingName = cachedTableMapping.get().getCacheInfoPair("canner-cml", "cml_temp", "PrintBigQueryType").getRequiredTableName();
156+
String mappingName = cachedTableMapping.get().getCacheInfoPair("wrenai", "cml_temp", "PrintBigQueryType").getRequiredTableName();
157157
List<Object[]> tables = queryDuckdb("show tables");
158158

159159
Set<String> tableNames = tables.stream().map(table -> table[0].toString()).collect(toImmutableSet());
@@ -191,7 +191,7 @@ public static Object[][] typesInPredicateWithPreparedStatementProvider()
191191
public void testTypesInPredicateWithPreparedStatement(String columnName, Object value)
192192
throws SQLException
193193
{
194-
String mappingName = cachedTableMapping.get().getCacheInfoPair("canner-cml", "cml_temp", "PrintBigQueryType").getRequiredTableName();
194+
String mappingName = cachedTableMapping.get().getCacheInfoPair("wrenai", "cml_temp", "PrintBigQueryType").getRequiredTableName();
195195
List<Object[]> tables = queryDuckdb("show tables");
196196

197197
Set<String> tableNames = tables.stream().map(table -> table[0].toString()).collect(toImmutableSet());

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestBigQueryCacheService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class TestBigQueryCacheService
4646
" (\n" +
4747
" SELECT *\n" +
4848
" FROM\n" +
49-
" canner-cml.tpch_tiny.orders\n" +
49+
" wrenai.tpch_tiny.orders\n" +
5050
" ) \n" +
5151
") \n" +
5252
", Revenue AS (\n" +

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestBigQuerySqlConverter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class TestBigQuerySqlConverter
4343
extends AbstractSqlConverterTest
4444
{
4545
private static final SessionContext DEFAULT_SESSION_CONTEXT = SessionContext.builder()
46-
.setCatalog("canner-cml")
46+
.setCatalog("wrenai")
4747
.setSchema("tpch_tiny")
4848
.build();
4949
private BigQuerySqlConverter bigQuerySqlConverter;
@@ -70,8 +70,8 @@ public void createBigQueryClient()
7070

7171
BigQueryMetadata bigQueryMetadata = new BigQueryMetadata(configManager);
7272
WrenMetastore wrenMetastore = new WrenMetastore();
73-
wrenMetastore.setWrenMDL(WrenMDL.fromManifest(Manifest.builder().setCatalog("canner-cml").setSchema("tpch_tiny")
74-
.setModels(List.of(model("Orders", "select * from \"canner-cml\".\"tpch_tiny\".\"orders\"",
73+
wrenMetastore.setWrenMDL(WrenMDL.fromManifest(Manifest.builder().setCatalog("wrenai").setSchema("tpch_tiny")
74+
.setModels(List.of(model("Orders", "select * from wrenai.\"tpch_tiny\".\"orders\"",
7575
List.of(column("custkey", "integer", null, true, "o_custkey"))))).build()), null);
7676
bigQuerySqlConverter = new BigQuerySqlConverter(bigQueryMetadata, wrenMetastore);
7777
}

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestCache.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class TestCache
5252
private static final Function<String, String> dropTableStatement = (tableName) -> format("BEGIN TRANSACTION;DROP TABLE IF EXISTS %s;COMMIT;", tableName);
5353
private final Supplier<WrenMDL> wrenMDL = () -> getInstance(Key.get(WrenMetastore.class)).getAnalyzedMDL().getWrenMDL();
5454
private final SessionContext defaultSessionContext = SessionContext.builder()
55-
.setCatalog("canner-cml")
55+
.setCatalog("wrenai")
5656
.setSchema("tpch_tiny")
5757
.build();
5858

@@ -75,7 +75,7 @@ public void testCache()
7575
" , sum(o_totalprice) revenue\n" +
7676
" FROM\n" +
7777
" `%s.%s.%s`\n" +
78-
" GROUP BY o_custkey", "canner-cml", "tpch_tiny", "orders"));
78+
" GROUP BY o_custkey", "wrenai", "tpch_tiny", "orders"));
7979
assertThat(duckdbResult.size()).isEqualTo(bqResult.size());
8080
assertThat(Arrays.deepEquals(duckdbResult.toArray(), bqResult.toArray())).isTrue();
8181

@@ -203,7 +203,7 @@ public void testModelCache()
203203
" , o_orderstatus orderstatus\n" +
204204
" , o_totalprice totalprice\n" +
205205
" , o_orderdate orderdate" +
206-
" from `canner-cml`.tpch_tiny.orders");
206+
" from `wrenai`.tpch_tiny.orders");
207207
assertThat(duckdbResult.size()).isEqualTo(bqResult.size());
208208
assertThat(Arrays.deepEquals(duckdbResult.toArray(), bqResult.toArray())).isTrue();
209209
}

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestCacheTaskManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class TestCacheTaskManager
5959
.setModels(List.of(
6060
Model.model(
6161
"Orders",
62-
"select * from \"canner-cml\".tpch_tiny.orders",
62+
"select * from wrenai.tpch_tiny.orders",
6363
List.of(
6464
Column.column("orderkey", WrenTypes.VARCHAR, null, false, "o_orderkey"),
6565
Column.column("custkey", WrenTypes.VARCHAR, null, false, "o_custkey")),

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestDuckdbRetryCacheTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class TestDuckdbRetryCacheTask
4141
.setModels(List.of(
4242
Model.model(
4343
"Orders",
44-
"select * from \"canner-cml\".tpch_tiny.orders",
44+
"select * from wrenai.tpch_tiny.orders",
4545
List.of(
4646
Column.column("orderkey", WrenTypes.VARCHAR, null, false, "o_orderkey"),
4747
Column.column("custkey", WrenTypes.VARCHAR, null, false, "o_custkey")),

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestReloadCache.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ public void testReloadCache()
6868
throws IOException, ExecutionException, InterruptedException, TimeoutException
6969
{
7070
String beforeName = "Revenue";
71-
CatalogSchemaTableName beforeCatalogSchemaTableName = new CatalogSchemaTableName("canner-cml", "tpch_tiny", beforeName);
71+
CatalogSchemaTableName beforeCatalogSchemaTableName = new CatalogSchemaTableName("wrenai", "tpch_tiny", beforeName);
7272
Optional<CacheInfoPair> cacheInfoPairOptional = getDefaultCacheInfoPair(beforeName);
7373
assertThat(cacheInfoPairOptional).isPresent();
7474
String beforeMappingName = cacheInfoPairOptional.get().getRequiredTableName();
7575
assertCache(beforeName);
7676

7777
deployMDL("cache/cache_reload_2_mdl.json");
7878
waitUntilReady();
79-
waitUntilFinished(catalogSchemaTableName("canner-cml", "tpch_tiny", "Revenue_After"));
79+
waitUntilFinished(catalogSchemaTableName("wrenai", "tpch_tiny", "Revenue_After"));
8080
assertCache("Revenue_After");
8181

8282
List<Object[]> tables = queryDuckdb("show tables");
@@ -87,13 +87,13 @@ public void testReloadCache()
8787

8888
deployMDL("cache/cache_reload_1_mdl.json");
8989
waitUntilReady();
90-
waitUntilFinished(catalogSchemaTableName("canner-cml", "tpch_tiny", "Revenue"));
90+
waitUntilFinished(catalogSchemaTableName("wrenai", "tpch_tiny", "Revenue"));
9191

92-
List<TaskInfo> taskInfos = getTaskInfo("canner-cml", "tpch_tiny");
92+
List<TaskInfo> taskInfos = getTaskInfo("wrenai", "tpch_tiny");
9393
assertThat(taskInfos.size()).isEqualTo(1);
9494
TaskInfo taskInfo = taskInfos.get(0);
9595
assertCache("Revenue");
96-
assertThat(taskInfo.getCatalogName()).isEqualTo("canner-cml");
96+
assertThat(taskInfo.getCatalogName()).isEqualTo("wrenai");
9797
assertThat(taskInfo.getSchemaName()).isEqualTo("tpch_tiny");
9898
assertThat(taskInfo.getTaskStatus()).isEqualTo(DONE);
9999
assertThat(taskInfo.getStartTime()).isNotNull();
@@ -108,7 +108,7 @@ public void testReloadCache()
108108

109109
deployMDL("cache/cache_reload_3_mdl.json");
110110
waitUntilReady();
111-
taskInfo = waitUntilFinished(catalogSchemaTableName("canner-cml", "tpch_tiny", "Revenue_Fake"));
111+
taskInfo = waitUntilFinished(catalogSchemaTableName("wrenai", "tpch_tiny", "Revenue_Fake"));
112112
cachedTable = taskInfo.getCachedTable();
113113
assertThat(cachedTable.getErrorMessage()).isPresent();
114114
assertThat(taskInfo.getEndTime()).isAfter(taskInfo.getStartTime());
@@ -127,7 +127,7 @@ private void deployMDL(String resourcePath)
127127

128128
private void assertCache(String name)
129129
{
130-
CatalogSchemaTableName mapping = new CatalogSchemaTableName("canner-cml", "tpch_tiny", name);
130+
CatalogSchemaTableName mapping = new CatalogSchemaTableName("wrenai", "tpch_tiny", name);
131131
Optional<CacheInfoPair> cacheInfoPairOptional = getDefaultCacheInfoPair(name);
132132
assertThat(cacheInfoPairOptional).isPresent();
133133
String mappingName = cacheInfoPairOptional.get().getRequiredTableName();

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestResultSetMetadata.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public class TestResultSetMetadata
4646
extends AbstractWireProtocolTestWithBigQuery
4747
{
48-
private static final String TEST_CATALOG = "canner-cml";
48+
private static final String TEST_CATALOG = "wrenai";
4949

5050
@Override
5151
protected Optional<String> getWrenMDLPath()
@@ -127,7 +127,7 @@ public void testGetUrl()
127127
throws Exception
128128
{
129129
HostAndPort hostAndPort = server().getPgHostAndPort();
130-
String url = format("jdbc:postgresql://%s:%s/%s", hostAndPort.getHost(), hostAndPort.getPort(), "canner-cml");
130+
String url = format("jdbc:postgresql://%s:%s/%s", hostAndPort.getHost(), hostAndPort.getPort(), "wrenai");
131131
try (Connection connection = this.createConnection()) {
132132
DatabaseMetaData metaData = connection.getMetaData();
133133
assertEquals(metaData.getURL(), url);
@@ -153,7 +153,7 @@ public void testGetCatalogs()
153153
{
154154
try (Connection connection = this.createConnection()) {
155155
ResultSet rs = connection.getMetaData().getCatalogs();
156-
assertThat(readRows(rs)).isEqualTo(List.of(List.of("canner-cml")));
156+
assertThat(readRows(rs)).isEqualTo(List.of(List.of("wrenai")));
157157
ResultSetMetaData metadata = rs.getMetaData();
158158
assertEquals(metadata.getColumnCount(), 1);
159159
assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");

‎wren-tests/src/test/java/io/wren/testing/bigquery/TestWireProtocolTypeWithBigQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void cleanup()
118118
@Override
119119
protected String getDefaultCatalog()
120120
{
121-
return "canner-cml";
121+
return "wrenai";
122122
}
123123

124124
@Override

‎wren-tests/src/test/resources/bigquery/TestResultSetMetadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"catalog": "canner-cml",
2+
"catalog": "wrenai",
33
"schema": "tpch_tiny",
44
"models": [
55
{
66
"name": "Nation",
7-
"refSql": "select * from \"canner-cml\".tpch_tiny.nation",
7+
"refSql": "select * from wrenai.tpch_tiny.nation",
88
"columns": [
99
{
1010
"name": "nationkey",

‎wren-tests/src/test/resources/bigquery/TestWireProtocolWithBigquery.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"catalog": "canner-cml",
2+
"catalog": "wrenai",
33
"schema": "tpch_tiny",
44
"relationships": [
55
{
@@ -25,7 +25,7 @@
2525
{
2626
"name": "Orders",
2727
"tableReference": {
28-
"catalog": "canner-cml",
28+
"catalog": "wrenai",
2929
"schema": "tpch_tiny",
3030
"table": "orders"
3131
},
@@ -65,7 +65,7 @@
6565
},
6666
{
6767
"name": "Lineitem",
68-
"refSql": "select * from \"canner-cml\".tpch_tiny.lineitem",
68+
"refSql": "select * from wrenai.tpch_tiny.lineitem",
6969
"columns": [
7070
{
7171
"name": "orderkey",
@@ -112,7 +112,7 @@
112112
},
113113
{
114114
"name": "Table",
115-
"refSql": "select * from \"canner-cml\".tpch_tiny.customer",
115+
"refSql": "select * from wrenai.tpch_tiny.customer",
116116
"columns": [
117117
{
118118
"name": "select",
@@ -140,7 +140,7 @@
140140
},
141141
{
142142
"name": "Order",
143-
"refSql": "select * from \"canner-cml\".tpch_tiny.orders",
143+
"refSql": "select * from wrenai.tpch_tiny.orders",
144144
"columns": [
145145
{
146146
"name": "alter",

0 commit comments

Comments
 (0)