Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

table 修复selcet部分字段查询bug #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

table 修复selcet部分字段查询bug #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions src/main/java/top/guoziyang/mydb/backend/tbm/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public int update(long xid, Update update) throws Exception {
entry.put(fd.fieldName, value);
raw = entry2Raw(entry);
long uuid = ((TableManagerImpl)tbm).vm.insert(xid, raw);

count ++;

for (Field field : fields) {
Expand All @@ -157,7 +157,7 @@ public String read(long xid, Select read) throws Exception {
byte[] raw = ((TableManagerImpl)tbm).vm.read(xid, uid);
if(raw == null) continue;
Map<String, Object> entry = parseEntry(raw);
sb.append(printEntry(entry)).append("\n");
sb.append(printEntry(entry, read)).append("\n");
}
return sb.toString();
}
Expand Down Expand Up @@ -261,12 +261,31 @@ private CalWhereRes calWhere(Field fd, Where where) throws Exception {
return res;
}

private String printEntry(Map<String, Object> entry) {
private String printEntry(Map<String, Object> entry, Select select) {
StringBuilder sb = new StringBuilder("[");
for (int i = 0; i < fields.size(); i++) {
Field field = fields.get(i);
sb.append(field.printValue(entry.get(field.fieldName)));
if(i == fields.size()-1) {

//获取select中需要的字段
int selectFieldsLen = select.fields.length;
List<Field> printField = new ArrayList<>();
if(selectFieldsLen > 0 && select.fields[0].equals("*")) {
printField = fields;
} else {
for (int i = 0; i < selectFieldsLen; i++) {
for(Field field : fields) {
if(field.fieldName.equals(select.fields[i])) {
printField.add(field);
break;
}
}
}
}

//向sb中添加需要字段的value
int len = printField.size();
for (int i = 0; i < len; i++) {
Field fd = printField.get(i);
sb.append(fd.printValue(entry.get(fd.fieldName)));
if(i == len-1) {
sb.append("]");
} else {
sb.append(", ");
Expand Down