Skip to content

Commit

Permalink
Minor tweaks to support the demo
Browse files Browse the repository at this point in the history
  • Loading branch information
geoffxy committed Jan 27, 2025
1 parent 00cc7bc commit b8855fd
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 18 deletions.
39 changes: 34 additions & 5 deletions config/vdbe_demo/imdb_editable_vdbes.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"schema_name": "imdb_extended_editable_100g",
"schema_name": "imdb_extended",
"engines": [
{
"internal_id": 1,
"name": "Ticketing",
"max_staleness_ms": 0,
"p90_latency_slo_ms": 30,
"interface": "postgresql",
"interface": "common",
"tables": [
{
"name": "theatres",
Expand All @@ -29,14 +29,15 @@
"writable": true
}
],
"mapped_to": "aurora"
"mapped_to": "aurora",
"endpoint": null
},
{
"internal_id": 2,
"name": "Analytics",
"max_staleness_ms": 3600000,
"p90_latency_slo_ms": 30000,
"interface": "postgresql",
"interface": "common",
"tables": [
{
"name": "homes",
Expand Down Expand Up @@ -139,7 +140,35 @@
"writable": false
}
],
"mapped_to": "redshift"
"mapped_to": "redshift",
"endpoint": null
},
{
"internal_id": 3,
"name": "Explore",
"max_staleness_ms": 3600000,
"p90_latency_slo_ms": 30000,
"interface": "common",
"tables": [
{
"name": "title",
"writable": false
},
{
"name": "movie_info",
"writable": false
},
{
"name": "company_name",
"writable": false
},
{
"name": "aka_title",
"writable": false
}
],
"mapped_to": "athena",
"endpoint": null
}
],
"tables": [
Expand Down
4 changes: 2 additions & 2 deletions config/vdbe_demo/imdb_extended_vdbes.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "Ticketing",
"max_staleness_ms": 0,
"p90_latency_slo_ms": 30,
"interface": "postgresql",
"interface": "common",
"tables": [
{
"name": "theatres",
Expand Down Expand Up @@ -36,7 +36,7 @@
"name": "Analytics",
"max_staleness_ms": 3600000,
"p90_latency_slo_ms": 30000,
"interface": "postgresql",
"interface": "common",
"tables": [
{
"name": "homes",
Expand Down
23 changes: 18 additions & 5 deletions tools/serialize_vdbes.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,40 @@ def to_serialize(schema: Dict[str, Any]) -> VirtualInfrastructure:
]
]
a_tables = [VirtualTable(name=name, writable=False) for name in all_table_names]
e_tables = [
VirtualTable(name=name, writable=False)
for name in ["title", "movie_info", "company_name", "aka_title"]
]
t_engine = VirtualEngine(
internal_id=1,
name="VDBE (T)",
name="Ticketing",
max_staleness_ms=0,
p90_latency_slo_ms=30,
interface=QueryInterface.PostgreSQL,
interface=QueryInterface.Common,
tables=t_tables,
mapped_to=Engine.Aurora,
)
a_engine = VirtualEngine(
internal_id=2,
name="VDBE (A)",
name="Analytics",
max_staleness_ms=60 * 60 * 1000, # 1 hour
p90_latency_slo_ms=30 * 1000,
interface=QueryInterface.PostgreSQL,
interface=QueryInterface.Common,
tables=a_tables,
mapped_to=Engine.Redshift,
)
e_engine = VirtualEngine(
internal_id=3,
name="Explore",
max_staleness_ms=60 * 60 * 1000, # 1 hour
p90_latency_slo_ms=30 * 1000,
interface=QueryInterface.Common,
tables=e_tables,
mapped_to=Engine.Athena,
)
return VirtualInfrastructure(
schema_name=schema["schema_name"],
engines=[t_engine, a_engine],
engines=[t_engine, a_engine, e_engine],
tables=[SchemaTable(name=name) for name in all_table_names],
)

Expand Down
4 changes: 1 addition & 3 deletions ui/src/components/CreateEditVdbeForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,7 @@ function CreateEditFormFields({ vdbe, setVdbe, allTables, validEngines }) {
setVdbe({ ...vdbe, interface: event.target.value })
}
>
<MenuItem value="common">Common SQL</MenuItem>
<MenuItem value="postgresql">PostgreSQL SQL</MenuItem>
<MenuItem value="athena">Athena SQL</MenuItem>
<MenuItem value="common">Common SQL (SQL-99)</MenuItem>
</Select>
<TableSelector
selectedTables={vdbe.tables.map(({ name }) => name)}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/VdbeView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function VdbeView({
)}
<div class="vdbe-view-props">
<ul>
<li>🌿: {freshness != null ? freshness : "-----"}</li>
<li>🌿: {freshness != null ? `${freshness} (SI)` : "-----"}</li>
<li>
⏱️:{" "}
{peakLatency != null
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/styles/PhysDbView.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
}

.dim .physdb-view {
opacity: 0.5;
opacity: 0.4;
}
2 changes: 1 addition & 1 deletion ui/src/components/styles/VdbeView.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.dim .vdbe-view {
opacity: 0.5;
opacity: 0.4;
}

.vdbe-view-props {
Expand Down

0 comments on commit b8855fd

Please sign in to comment.