Skip to content

Commit dc66585

Browse files
committed
reorder table column in planner test
1 parent 7521b88 commit dc66585

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

src/frontend/planner_test/tests/testdata/input/vector_search.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
- explain_output
6060
- id: create_table_and_index
6161
sql: |
62-
create table items (id int primary key, name string, unindexed timestamptz, embedding vector(3)) append only;
62+
create table items (id int primary key, unindexed timestamptz, name string, embedding vector(3)) append only;
6363
create index vector_index on items using flat (embedding) include (name) with (distance_type = 'inner_product');
6464
expected_outputs: []
6565
- before:

src/frontend/planner_test/tests/testdata/output/vector_search.yaml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
└─StreamTableScan { table: items, columns: [name, embedding, id] }
141141
- id: create_table_and_index
142142
sql: |
143-
create table items (id int primary key, name string, unindexed timestamptz, embedding vector(3)) append only;
143+
create table items (id int primary key, unindexed timestamptz, name string, embedding vector(3)) append only;
144144
create index vector_index on items using flat (embedding) include (name) with (distance_type = 'inner_product');
145145
- before:
146146
- create_table_and_index
@@ -150,7 +150,7 @@
150150
LogicalProject { exprs: [items.id, items.name] }
151151
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
152152
└─LogicalProject { exprs: [items.id, items.name, Neg(InnerProduct(items.embedding, '[1,2,3]':Vector(3))) as $expr1] }
153-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
153+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
154154
optimized_logical_plan_for_batch: |-
155155
LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $2, right: '[1,2,3]':Vector(3), output_columns: [items.id:Int32, items.name:Varchar] }
156156
└─LogicalScan { table: items, columns: [items.id, items.name, items.embedding] }
@@ -172,7 +172,7 @@
172172
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
173173
└─LogicalProject { exprs: [items.id, items.name, Neg(InnerProduct(items.embedding, '[1,2,3]':Vector(3))) as $expr1] }
174174
└─LogicalFilter { predicate: (items.id > 0:Int32) }
175-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
175+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
176176
optimized_logical_plan_for_batch: |-
177177
LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $2, right: '[1,2,3]':Vector(3), output_columns: [items.id:Int32, items.name:Varchar] }
178178
└─LogicalScan { table: items, columns: [items.id, items.name, items.embedding], predicate: (items.id > 0:Int32) }
@@ -191,7 +191,7 @@
191191
LogicalProject { exprs: [items.id, items.name] }
192192
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
193193
└─LogicalProject { exprs: [items.id, items.name, Neg(InnerProduct(items.embedding, OpenaiEmbedding('{"model": "model"}':Jsonb, 'hello':Varchar)::Vector(3))) as $expr1] }
194-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
194+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
195195
optimized_logical_plan_for_batch: |-
196196
LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $2, right: OpenaiEmbedding('{"model": "model"}':Jsonb, 'hello':Varchar)::Vector(3), output_columns: [items.id:Int32, items.name:Varchar] }
197197
└─LogicalScan { table: items, columns: [items.id, items.name, items.embedding] }
@@ -214,7 +214,7 @@
214214
└─LogicalProject { exprs: [$expr1] }
215215
└─LogicalTopN { order: [$expr2 ASC], limit: 5, offset: 0 }
216216
└─LogicalProject { exprs: [(items.id + 1:Int32) as $expr1, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr2] }
217-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
217+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
218218
optimized_logical_plan_for_batch: |-
219219
LogicalProject { exprs: [count, $expr1] }
220220
└─LogicalAgg { group_key: [$expr1], aggs: [count] }
@@ -238,7 +238,7 @@
238238
LogicalProject { exprs: [items.id, items.name, items.embedding] }
239239
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
240240
└─LogicalProject { exprs: [items.id, items.name, items.embedding, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr1] }
241-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
241+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
242242
optimized_logical_plan_for_batch: |-
243243
LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $2, right: '[3,1,2]':Vector(3), output_columns: [items.id:Int32, items.name:Varchar, items.embedding:Vector(3)] }
244244
└─LogicalScan { table: items, columns: [items.id, items.name, items.embedding] }
@@ -257,17 +257,19 @@
257257
LogicalProject { exprs: [items.id, items.name, items.unindexed] }
258258
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
259259
└─LogicalProject { exprs: [items.id, items.name, items.unindexed, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr1] }
260-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
260+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
261261
optimized_logical_plan_for_batch: |-
262-
LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $3, right: '[3,1,2]':Vector(3), output_columns: [items.id:Int32, items.name:Varchar, items.unindexed:Timestamptz] }
263-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding] }
262+
LogicalProject { exprs: [items.id, items.name, items.unindexed, vector_distance] }
263+
└─LogicalVectorSearch { distance_type: InnerProduct, top_n: 5, left: $3, right: '[3,1,2]':Vector(3), output_columns: [items.id:Int32, items.unindexed:Timestamptz, items.name:Varchar] }
264+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding] }
264265
batch_plan: |-
265266
BatchProject { exprs: [items.id, items.name, items.unindexed] }
266-
└─BatchTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
267-
└─BatchExchange { order: [], dist: Single }
268-
└─BatchTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
269-
└─BatchProject { exprs: [items.id, items.name, items.unindexed, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr1] }
270-
└─BatchScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding], distribution: UpstreamHashShard(items.id) }
267+
└─BatchProject { exprs: [items.id, items.name, items.unindexed, $expr1] }
268+
└─BatchTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
269+
└─BatchExchange { order: [], dist: Single }
270+
└─BatchTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
271+
└─BatchProject { exprs: [items.id, items.unindexed, items.name, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr1] }
272+
└─BatchScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding], distribution: UpstreamHashShard(items.id) }
271273
- before:
272274
- create_table_and_index
273275
sql: |
@@ -281,7 +283,7 @@
281283
└─LogicalTopN { order: [$expr1 ASC], limit: 5, offset: 0 }
282284
└─LogicalProject { exprs: [items.embedding, items.id, $expr1] }
283285
└─LogicalProject { exprs: [items.id, Neg(InnerProduct(items.embedding, '[3,1,2]':Vector(3))) as $expr1, items.embedding] }
284-
└─LogicalScan { table: items, columns: [items.id, items.name, items.unindexed, items.embedding, items._rw_timestamp] }
286+
└─LogicalScan { table: items, columns: [items.id, items.unindexed, items.name, items.embedding, items._rw_timestamp] }
285287
optimized_logical_plan_for_batch: |-
286288
LogicalProject { exprs: [count, items.id] }
287289
└─LogicalAgg { group_key: [items.id], aggs: [count] }

0 commit comments

Comments
 (0)