Skip to content

Commit a791ec2

Browse files
committed
chore: uncheck for decode tuple primary key when query
1 parent a955c99 commit a791ec2

5 files changed

Lines changed: 17 additions & 27 deletions

File tree

src/execution/ddl/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@ where
124124
if batch_len == 0 {
125125
break;
126126
}
127-
last_pk = batch
128-
.get(batch_len - 1)
129-
.and_then(|tuple| tuple.pk.clone());
127+
last_pk = batch.get(batch_len - 1).and_then(|tuple| tuple.pk.clone());
130128

131129
for tuple in batch.iter().take(batch_len) {
132130
visit(tuple)?;
@@ -174,9 +172,7 @@ where
174172
if batch_len == 0 {
175173
break;
176174
}
177-
last_pk = batch
178-
.get(batch_len - 1)
179-
.and_then(|tuple| tuple.pk.clone());
175+
last_pk = batch.get(batch_len - 1).and_then(|tuple| tuple.pk.clone());
180176

181177
for tuple in batch.iter_mut().take(batch_len) {
182178
rewrite(tuple)?;

src/execution/mod.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,8 @@ impl<'a, T: Transaction + 'a> ExecArena<'a, T> {
261261
ExecNode::DropColumn(mut exec) => {
262262
(exec.next_tuple(self, id), ExecNode::DropColumn(exec))
263263
}
264-
ExecNode::DropIndex(mut exec) => {
265-
(exec.next_tuple(self, id), ExecNode::DropIndex(exec))
266-
}
267-
ExecNode::DropTable(mut exec) => {
268-
(exec.next_tuple(self, id), ExecNode::DropTable(exec))
269-
}
264+
ExecNode::DropIndex(mut exec) => (exec.next_tuple(self, id), ExecNode::DropIndex(exec)),
265+
ExecNode::DropTable(mut exec) => (exec.next_tuple(self, id), ExecNode::DropTable(exec)),
270266
ExecNode::DropView(mut exec) => (exec.next_tuple(self, id), ExecNode::DropView(exec)),
271267
ExecNode::Dummy(mut exec) => (exec.next_tuple(self, id), ExecNode::Dummy(exec)),
272268
ExecNode::Except(mut exec) => (exec.next_tuple(self, id), ExecNode::Except(exec)),
@@ -293,12 +289,8 @@ impl<'a, T: Transaction + 'a> ExecArena<'a, T> {
293289
ExecNode::ShowTables(mut exec) => {
294290
(exec.next_tuple(self, id), ExecNode::ShowTables(exec))
295291
}
296-
ExecNode::ShowViews(mut exec) => {
297-
(exec.next_tuple(self, id), ExecNode::ShowViews(exec))
298-
}
299-
ExecNode::SimpleAgg(mut exec) => {
300-
(exec.next_tuple(self, id), ExecNode::SimpleAgg(exec))
301-
}
292+
ExecNode::ShowViews(mut exec) => (exec.next_tuple(self, id), ExecNode::ShowViews(exec)),
293+
ExecNode::SimpleAgg(mut exec) => (exec.next_tuple(self, id), ExecNode::SimpleAgg(exec)),
302294
ExecNode::Sort(mut exec) => (exec.next_tuple(self), ExecNode::Sort(exec)),
303295
ExecNode::StreamDistinct(mut exec) => {
304296
(exec.next_tuple(self, id), ExecNode::StreamDistinct(exec))

src/python.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,7 @@ impl PythonDatabase {
208208

209209
pub fn execute(&self, sql: &str) -> PyResult<()> {
210210
let mut iter = self.inner.run(sql).map_err(to_py_err)?;
211-
while iter.next_tuple().map_err(to_py_err)?.is_some() {
212-
}
211+
while iter.next_tuple().map_err(to_py_err)?.is_some() {}
213212
iter.done().map_err(to_py_err)?;
214213

215214
Ok(())

src/storage/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,11 +1423,15 @@ impl<T: Transaction> IndexImpl<T> for PrimaryKeyIndexImpl {
14231423
_: bool,
14241424
out: &mut Bytes,
14251425
) -> Result<(), DatabaseError> {
1426-
unsafe { &*params.table_codec() }.with_tuple_key_unchecked(params.table_name, value, |key| {
1427-
out.clear();
1428-
out.extend_from_slice(key);
1429-
Ok(())
1430-
})
1426+
unsafe { &*params.table_codec() }.with_tuple_key_unchecked(
1427+
params.table_name,
1428+
value,
1429+
|key| {
1430+
out.clear();
1431+
out.extend_from_slice(key);
1432+
Ok(())
1433+
},
1434+
)
14311435
}
14321436
}
14331437

src/wasm.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ impl WasmDatabase {
8686

8787
pub fn execute(&self, sql: &str) -> Result<(), JsValue> {
8888
let mut iter = self.inner.run(sql).map_err(to_js_err)?;
89-
while iter.next_borrowed_tuple().map_err(to_js_err)?.is_some() {
90-
}
89+
while iter.next_borrowed_tuple().map_err(to_js_err)?.is_some() {}
9190
Ok(())
9291
}
9392
}

0 commit comments

Comments
 (0)