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

[Feat] Support full text index #217

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

[Feat] Support full text index #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ecf8cc6
Optimize SQL for refreshing table location information
maochongxin Sep 19, 2024
a82d5d0
partical refresh
maochongxin Sep 24, 2024
6874323
Fix infinite loop caused by removed reference
maochongxin Oct 10, 2024
1d46a86
fix lsop retry fail
maochongxin Oct 14, 2024
8d60c55
Remove unnecessary comments and format code
maochongxin Oct 15, 2024
22eeb36
Fix frequent refresh lock failures due to short refresh interval
maochongxin Oct 18, 2024
73ef9aa
Fix frequent refresh lock failures due to short refresh interval
maochongxin Oct 18, 2024
a46e2b0
add result code -4723
maochongxin Oct 18, 2024
fb03d26
fix review
maochongxin Oct 23, 2024
e5762f4
add -4138
maochongxin Oct 23, 2024
4c630ee
fix review: add ut for byteutil
maochongxin Oct 25, 2024
64926a4
fix lsop refresh location
maochongxin Oct 25, 2024
e5e8687
Merge pull request #204 from oceanbase/retry_batchops_merge_master
maochongxin Oct 25, 2024
c8e655a
fix: correct reverse-scan results affected by retry logic
maochongxin Oct 28, 2024
bec5329
Merge pull request #208 from oceanbase/fix-rescan-result-error
maochongxin Oct 28, 2024
c762c85
add fulltext index dml case
GroundWu Oct 31, 2024
a53ba60
feature: Optimize partial refresh and add retry for executeMutation/q…
maochongxin Nov 4, 2024
0caee1b
adapt fts query request
GroundWu Nov 5, 2024
f56010d
opt for errorMsg when execute batch in the scene of table not exist
GroundWu Nov 5, 2024
6d00f65
fix ls batch errMsg
GroundWu Nov 5, 2024
af579af
update pom.xml
WeiXinChan Nov 5, 2024
9f96bbf
remove some unused dependencies in pom.xml
WeiXinChan Nov 5, 2024
07c37aa
fix 3.x null exception (#214)
miyuan-ljr Nov 5, 2024
e053056
Merge pull request #216 from WeiXinChan/pom
GroundWu Nov 5, 2024
56869c4
adapt fulltext query
GroundWu Nov 5, 2024
201d046
Merge remote-tracking branch 'ob/master' into support_full_text_indx
GroundWu Nov 5, 2024
8c0e50a
fix compile error
GroundWu Nov 6, 2024
ad33e89
fix compile error
GroundWu Nov 6, 2024
649675a
add fts query limit/offset case
GroundWu Nov 11, 2024
c8635a6
fix case fail
GroundWu Nov 11, 2024
1691202
adapt fts query
GroundWu Nov 25, 2024
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
79 changes: 49 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,24 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.15.3</version>
<type>pom</type>
<scope>import</scope>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
<version>1.3.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -67,7 +80,6 @@
<dependency>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
<version>1.3.12</version>
</dependency>

<dependency>
Expand All @@ -91,21 +103,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.2.25.RELEASE</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.2.25.RELEASE</version>
<scope>test</scope>
</dependency>

<dependency>
Expand All @@ -129,13 +126,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

Expand All @@ -144,6 +139,12 @@
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.9</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>objenesis</artifactId>
<groupId>org.objenesis</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -153,17 +154,17 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
<scope>test</scope>
<version>1.15.3</version>
<exclusions>
<exclusion>
<groupId>org.rnorth.visible-assertions</groupId>
<artifactId>visible-assertions</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down Expand Up @@ -361,6 +362,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-dependency-convergence</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<DependencyConvergence/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/alipay/oceanbase/rpc/ObClusterTableQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,10 @@ public void setEntityType(ObTableEntityType entityType) {
super.setEntityType(entityType);
tableClientQuery.setEntityType(entityType);
}

@Override
public TableQuery setSearchText(String searchText) {
tableClientQuery.setSearchText(searchText);
return this;
}
}
5 changes: 2 additions & 3 deletions src/main/java/com/alipay/oceanbase/rpc/ObGlobal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,14 @@ public static String getObVsnString(long version) {

public static boolean isLsOpSupport() {
return OB_VERSION >= OB_VERSION_4_2_3_0 && OB_VERSION < OB_VERSION_4_3_0_0
|| OB_VERSION >= OB_VERSION_4_3_4_0;
|| OB_VERSION >= OB_VERSION_4_3_4_0;
}

public static boolean isReturnOneResultSupport() {
return OB_VERSION >= OB_VERSION_4_2_3_0 && OB_VERSION < OB_VERSION_4_3_0_0
|| OB_VERSION >= OB_VERSION_4_3_4_0;
|| OB_VERSION >= OB_VERSION_4_3_4_0;
}


public static final long OB_VERSION_4_2_3_0 = calcVersion(4, (short) 2, (byte) 3, (byte) 0);

public static final long OB_VERSION_4_3_0_0 = calcVersion(4, (short) 3, (byte) 0, (byte) 0);
Expand Down
Loading