You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2022/10/18 02:13:39 UTC
[GitHub] [doris] xiaokang opened a new pull request, #13430: (feature)[inverted index]WIP inverted index api: SQL syntax and metadata
xiaokang opened a new pull request, #13430:
URL: https://github.com/apache/doris/pull/13430
# Proposed changes
Issue Number: Step1.1 of [DSIP-023: Add inverted index for full text search](https://cwiki.apache.org/confluence/display/DORIS/DSIP-023%3A+Add+inverted+index+for+full+text+search?src=contextnavpagetreemode)
## Problem summary
Introduce a SQL syntax for creating inverted index and related metadata changes.
```
-- create table with INVERTED index
CREATE TABLE httplogs (
ts datetime,
clientip varchar(20),
request string,
status smallint,
size int,
INDEX idx_size (size) USING INVERTED,
INDEX idx_status (status) USING INVERTED,
INDEX idx_clientip (clientip) USING INVERTED PROPERTIES("parser"="none")
)
DUPLICATE KEY(ts)
DISTRIBUTED BY RANDOM BUCKETS 10
-- add an INVERTED index to a table
CREATE INDEX idx_request ON httplogs(request) USING INVERTED PROPERTIES("parser"="english");
```
## Checklist(Required)
1. Does it affect the original behavior:
- [ ] Yes
- [ ] No
- [ ] I don't know
2. Has unit tests been added:
- [ ] Yes
- [ ] No
- [ ] No Need
3. Has document been added or modified:
- [ ] Yes
- [ ] No
- [ ] No Need
4. Does it need to update dependencies:
- [ ] Yes
- [ ] No
5. Are there any changes that cannot be rolled back:
- [ ] Yes (If Yes, please explain WHY)
- [ ] No
## Further comments
If this is a relatively large or complex change, kick off the discussion at [dev@doris.apache.org](mailto:dev@doris.apache.org) by explaining why you chose the solution you did and what alternatives you considered, etc...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
morningman commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1011927486
##########
gensrc/proto/olap_file.proto:
##########
@@ -201,6 +201,20 @@ message ColumnPB {
repeated string children_column_names = 18;
}
+enum IndexType {
+ BITMAP = 0;
+ INVERTED = 1;
+ BLOOMFILTER = 2;
+}
+
+message TabletIndexPB {
+ required int32 index_id = 1;
Review Comment:
do not use `required`, use `optional`
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/Index.java:
##########
@@ -30,36 +31,55 @@
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Internal representation of index, including index type, name, columns and comments.
* This class will used in olaptable
*/
public class Index implements Writable {
+ public static final int INDEX_ID_INIT_VALUE = -1;
+
+ @SerializedName(value = "indexId")
+ private int indexId;
Review Comment:
How to do the forward compatibility? that the old index does not has an ID.
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -40,6 +40,8 @@ public class TableIndexes implements Writable {
private List<Index> indexes;
@SerializedName(value = "properties")
private Map<String, String> properties;
+ @SerializedName(value = "maxIndexId")
+ private int maxIndexId = Index.INDEX_ID_INIT_VALUE;
Review Comment:
Why not using `Env.getNextId()`?
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ public int incAndGetMaxIndexUniqueId() {
+ this.maxIndexId++;
+ return this.maxIndexId;
+ }
+
+ public int getMaxIndexUniqueId() {
Review Comment:
```suggestion
private int getMaxIndexUniqueId() {
```
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ public int incAndGetMaxIndexUniqueId() {
Review Comment:
```suggestion
private int incAndGetMaxIndexUniqueId() {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1015131165
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/IndexDef.java:
##########
@@ -126,29 +153,37 @@ public boolean isSetIfNotExists() {
public enum IndexType {
BITMAP,
+ INVERTED,
+ }
+ public boolean isInvertedIndex() {
+ return (this.indexType == IndexType.INVERTED);
}
public void checkColumn(Column column, KeysType keysType) throws AnalysisException {
- if (indexType == IndexType.BITMAP) {
+ if (indexType == IndexType.BITMAP || indexType == IndexType.INVERTED) {
Review Comment:
added
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] hello-stephen commented on pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
hello-stephen commented on PR #13430:
URL: https://github.com/apache/doris/pull/13430#issuecomment-1297452931
TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 38.2 seconds
load time: 572 seconds
storage size: 17154644867 Bytes
https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/tmp/20221031174821_clickbench_pr_36671.html
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1015132859
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ private synchronized int incAndGetMaxIndexUniqueId() {
Review Comment:
change to Env.getCurrentEnv().getNextId()
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13430:
URL: https://github.com/apache/doris/pull/13430#issuecomment-1307330488
PR approved by at least one committer and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1015134047
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/IndexDef.java:
##########
@@ -48,12 +52,18 @@ public IndexDef(String indexName, boolean ifNotExists, List<String> columns, Ind
} else {
this.comment = comment;
}
+ if (properties == null) {
+ this.properties = new HashMap<>();
+ } else {
+ this.properties = properties;
+ }
}
public void analyze() throws AnalysisException {
- if (indexType == IndexDef.IndexType.BITMAP) {
+ if (indexType == IndexDef.IndexType.BITMAP
+ || indexType == IndexDef.IndexType.INVERTED) {
Review Comment:
added
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
morningman commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1014760552
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ private synchronized int incAndGetMaxIndexUniqueId() {
Review Comment:
Oh, there is still a problem to use `maxIndexId` inside `TableIndexes`.
For example, after `add index`, there will be an edit log, and after FE restart, it will replay that edit log, but it didn't update the `maxIndexId` in `TableIndexes`.
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/Index.java:
##########
@@ -84,6 +104,36 @@ public void setIndexType(IndexDef.IndexType indexType) {
this.indexType = indexType;
}
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ }
+
+ public String getPropertiesString() {
+ if (properties == null || properties.isEmpty()) {
Review Comment:
you can use `PrintableMap` to do this.
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/IndexDef.java:
##########
@@ -48,12 +52,18 @@ public IndexDef(String indexName, boolean ifNotExists, List<String> columns, Ind
} else {
this.comment = comment;
}
+ if (properties == null) {
+ this.properties = new HashMap<>();
+ } else {
+ this.properties = properties;
+ }
}
public void analyze() throws AnalysisException {
- if (indexType == IndexDef.IndexType.BITMAP) {
+ if (indexType == IndexDef.IndexType.BITMAP
+ || indexType == IndexDef.IndexType.INVERTED) {
Review Comment:
I think we can also add `BLOOM_FILTER` check this time, although it is not implemented yet.
##########
fe/fe-core/src/main/java/org/apache/doris/analysis/IndexDef.java:
##########
@@ -126,29 +153,37 @@ public boolean isSetIfNotExists() {
public enum IndexType {
BITMAP,
+ INVERTED,
+ }
+ public boolean isInvertedIndex() {
+ return (this.indexType == IndexType.INVERTED);
}
public void checkColumn(Column column, KeysType keysType) throws AnalysisException {
- if (indexType == IndexType.BITMAP) {
+ if (indexType == IndexType.BITMAP || indexType == IndexType.INVERTED) {
Review Comment:
I think we can also add `BLOOM_FILTER` check this time, although it is not implemented yet.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1012729460
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ public int incAndGetMaxIndexUniqueId() {
Review Comment:
changed
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -56,6 +58,26 @@ public TableIndexes(List<Index> indexes, Map<String, String> properties) {
this.properties = properties;
}
+ public int incAndGetMaxIndexUniqueId() {
+ this.maxIndexId++;
+ return this.maxIndexId;
+ }
+
+ public int getMaxIndexUniqueId() {
Review Comment:
changed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
morningman commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1002730595
##########
fe/fe-core/src/main/cup/sql_parser.cup:
##########
@@ -3173,6 +3174,10 @@ opt_index_type ::=
{:
RESULT = IndexDef.IndexType.BITMAP;
:}
+ | KW_USING KW_INVERTED
Review Comment:
missing BLOOM_FILTER?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1012728861
##########
gensrc/proto/olap_file.proto:
##########
@@ -201,6 +201,20 @@ message ColumnPB {
repeated string children_column_names = 18;
}
+enum IndexType {
+ BITMAP = 0;
+ INVERTED = 1;
+ BLOOMFILTER = 2;
+}
+
+message TabletIndexPB {
+ required int32 index_id = 1;
Review Comment:
changed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13430:
URL: https://github.com/apache/doris/pull/13430#issuecomment-1288142317
PR approved by at least one committer and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13430:
URL: https://github.com/apache/doris/pull/13430#issuecomment-1288142328
PR approved by anyone and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1012463090
##########
gensrc/proto/olap_file.proto:
##########
@@ -201,6 +201,20 @@ message ColumnPB {
repeated string children_column_names = 18;
}
+enum IndexType {
+ BITMAP = 0;
+ INVERTED = 1;
+ BLOOMFILTER = 2;
+}
+
+message TabletIndexPB {
+ required int32 index_id = 1;
Review Comment:
delete index_name
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morningman merged pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
morningman merged PR #13430:
URL: https://github.com/apache/doris/pull/13430
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13430:
URL: https://github.com/apache/doris/pull/13430#issuecomment-1288142325
PR approved by anyone and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1012729193
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/Index.java:
##########
@@ -30,36 +31,55 @@
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Internal representation of index, including index type, name, columns and comments.
* This class will used in olaptable
*/
public class Index implements Writable {
+ public static final int INDEX_ID_INIT_VALUE = -1;
+
+ @SerializedName(value = "indexId")
+ private int indexId;
Review Comment:
set default value to -1 for compatibility
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] xiaokang commented on a diff in pull request #13430: [feature](inverted index)WIP inverted index api: SQL syntax and metadata
Posted by GitBox <gi...@apache.org>.
xiaokang commented on code in PR #13430:
URL: https://github.com/apache/doris/pull/13430#discussion_r1012730070
##########
fe/fe-core/src/main/java/org/apache/doris/catalog/TableIndexes.java:
##########
@@ -40,6 +40,8 @@ public class TableIndexes implements Writable {
private List<Index> indexes;
@SerializedName(value = "properties")
private Map<String, String> properties;
+ @SerializedName(value = "maxIndexId")
+ private int maxIndexId = Index.INDEX_ID_INIT_VALUE;
Review Comment:
add synchrolized for protection
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org