Skip to content

Commit 82fb644

Browse files
junphinejunphine
committed
merge from upstream
2 parents 8808b6f + 913d638 commit 82fb644

595 files changed

Lines changed: 5885 additions & 7381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
# limitations under the License.
1616
#
1717

18+
wrapperVersion=3.3.4
19+
distributionType=only-script
1820
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
19-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

‎bin/include/jvmdefaults.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ if %java_version% GEQ 11 if %java_version% LSS 14 (
3232
--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED ^
3333
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ^
3434
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED ^
35+
--add-opens=java.base/java.nio=ALL-UNNAMED ^
3536
--illegal-access=permit ^
3637
%current_value%
3738
)
@@ -45,6 +46,7 @@ if %java_version% GEQ 14 if %java_version% LSS 15 (
4546
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ^
4647
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED ^
4748
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED ^
49+
--add-opens=java.base/java.nio=ALL-UNNAMED ^
4850
--illegal-access=permit ^
4951
%current_value%
5052
)
@@ -69,6 +71,7 @@ if %java_version% GEQ 15 (
6971
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED ^
7072
--add-opens=java.base/java.time=ALL-UNNAMED ^
7173
--add-opens=java.base/java.text=ALL-UNNAMED ^
74+
--add-opens=java.logging/java.util.logging=ALL-UNNAMED ^
7275
--add-opens=java.management/sun.management=ALL-UNNAMED ^
7376
--add-opens java.desktop/java.awt.font=ALL-UNNAMED ^
7477
%current_value%

‎bin/include/jvmdefaults.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ getJavaSpecificOpts() {
3232
--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
3333
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
3434
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
35+
--add-opens=java.base/java.nio=ALL-UNNAMED \
3536
--illegal-access=permit \
3637
${current_value}"
3738

@@ -44,6 +45,7 @@ getJavaSpecificOpts() {
4445
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
4546
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
4647
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
48+
--add-opens=java.base/java.nio=ALL-UNNAMED \
4749
--illegal-access=permit \
4850
${current_value}"
4951

@@ -67,6 +69,7 @@ getJavaSpecificOpts() {
6769
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
6870
--add-opens=java.base/java.time=ALL-UNNAMED \
6971
--add-opens=java.base/java.text=ALL-UNNAMED \
72+
--add-opens=java.logging/java.util.logging=ALL-UNNAMED \
7073
--add-opens=java.management/sun.management=ALL-UNNAMED \
7174
--add-opens java.desktop/java.awt.font=ALL-UNNAMED \
7275
${current_value}"

‎config/ignite-log4j2.xml~‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎config/lucene.xml‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,38 @@
77

88
<bean id="simple_text" class="org.apache.lucene.analysis.core.SimpleAnalyzer">
99
</bean>
10+
1011
<!--
1112
<bean id="index_text_cn" class="com.hankcs.lucene.HanLPIndexAnalyzer">
1213
</bean>
1314
<bean id="query_text_cn" class="com.hankcs.lucene.HanLPAnalyzer">
1415
</bean>
1516
-->
16-
<!--
17-
<bean id="index_text_cn" class="org.ansj.lucene7.AnsjAnalyzer">
18-
<constructor-arg value="index_ansj"></constructor-arg>
17+
18+
19+
<bean id="index_factory" class="org.apache.lucene.analysis.jieba.JiebaTokenizerFactory">
20+
<constructor-arg >
21+
<map>
22+
<entry key="stopWordDictionaryPath" value="classpath" />
23+
</map>
24+
</constructor-arg>
25+
</bean>
26+
27+
<bean id="index_text_cn" class="org.apache.lucene.analysis.jieba.JiebaIndexAnalyzer">
28+
<constructor-arg ref="index_factory"></constructor-arg>
1929
</bean>
20-
<bean id="query_text_cn" class="org.ansj.lucene7.AnsjAnalyzer">
21-
<constructor-arg value="query_ansj"></constructor-arg>
22-
</bean>
23-
-->
30+
<bean id="query_text_cn" class="org.apache.lucene.analysis.jieba.JiebaAnalyzer">
31+
<constructor-arg ref="index_factory"></constructor-arg>
32+
</bean>
33+
34+
<bean id="default" class="org.apache.ignite.cache.LuceneConfiguration">
35+
<property name="indexAnalyzer" ref="index_text_cn" />
36+
<property name="queryAnalyzer" ref="query_text_cn" />
37+
<property name="fieldAnalyzerMap">
38+
<map>
39+
<entry key="tag" value-ref="simple_text" />
40+
</map>
41+
</property>
42+
</bean>
43+
2444
</beans>

‎deliveries/docker/apache-ignite/run.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ if [ "${version}" -ge 11 ] ; then
8484
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
8585
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
8686
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
87+
--add-opens=java.logging/java.util.logging=ALL-UNNAMED \
8788
--illegal-access=permit \
8889
${JVM_OPTS}"
8990
fi

‎docs/_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
exclude: [guidelines.md, "Gemfile", "Gemfile.lock", README.adoc, "_docs/code-snippets", "_docs/includes", '*.sh']
1616
attrs: &asciidoc_attributes
17-
version: 2.18.0-SNAPSHOT
17+
version: 2.19.0-SNAPSHOT
1818
base_url: /docs
1919
stylesdir: /docs/assets/css
2020
imagesdir: /docs

‎docs/_docs/SQL/JDBC/jdbc-driver.adoc‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ For the list of security parameters, refer to the <<Using SSL>> section.
162162
- `jdbc:ignite:thin://myHost:11900;user=ignite;password=ignite` - connect to myHost on custom port 11900 with user credentials for authentication.
163163
- `jdbc:ignite:thin://myHost:11900;distributedJoins=true&autoCloseServerCursor=true` - connect to myHost on custom port 11900 with enabled distributed joins and autoCloseServerCursor optimization.
164164
- `jdbc:ignite:thin://myHost:11900/myschema;` - connect to myHost on custom port 11900 and access to MYSCHEMA.
165-
- `jdbc:ignite:thin://myHost:11900/"MySchema";lazy=false` - connect to myHost on custom port 11900 with disabled lazy query execution and access to MySchema (schema name is case sensitive).
166165

167166
=== Multiple Endpoints
168167

@@ -676,21 +675,3 @@ The table below lists all the link:https://en.wikipedia.org/wiki/SQLSTATE[ANSI S
676675
|50000| Internal error.
677676
The code is not defined by ANSI and refers to an Ignite specific error. Refer to the `java.sql.SQLException` error message for more information.
678677
|=======================================================================
679-
680-
681-
682-
683-
684-
685-
686-
687-
688-
689-
690-
691-
692-
693-
694-
695-
696-

0 commit comments

Comments
 (0)