Skip to content

Commit f8b8fd7

Browse files
junphinejunphine
committed
Merge remote-tracking branch 'upstream/master'
1 parent 589e89c commit f8b8fd7

122 files changed

Lines changed: 2913 additions & 1369 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.

‎RELEASE_NOTES.txt‎

Lines changed: 130 additions & 380 deletions
Large diffs are not rendered by default.

‎checkstyle/checkstyle-suppressions.xml‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,57 @@
1818
-->
1919

2020
<!DOCTYPE suppressions PUBLIC
21-
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
22-
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
21+
"-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
22+
"https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
2323
<suppressions>
2424
<suppress checks="RightCurly|LeftCurly|EmptyLineSeparator|MethodParamPad|SingleSpaceSeparator"
2525
files="BCrypt\.java|ConcurrentLinkedDeque8\.java"/>
26-
<suppress checks="NoWhitespaceBefore" files="ConcurrentLinkedHashMap\.java"/>
26+
27+
<suppress checks="NoWhitespaceBefore"
28+
files="ConcurrentLinkedHashMap\.java"/>
29+
2730
<suppress checks="LineLength"
2831
files="ClusterTagGenerator\.java|PagesWriteSpeedBasedThrottle\.java|GridExecutorService\.java|CatboostClassificationModel\.java|classnames\.properties"/>
32+
33+
<suppress checks="(?&lt;!Missing)JavadocMethod"
34+
files="[\\/]internal[\\/]"/>
35+
36+
<suppress checks="(?&lt;!Missing)JavadocMethod"
37+
files="[\\/]test[\\/]"/>
38+
39+
<suppress checks="(?&lt;!Missing)JavadocMethod"
40+
files="[\\/]tests[\\/]"/>
41+
42+
<suppress checks="(?&lt;!Missing)JavadocMethod"
43+
files="[\\/]ml[\\/]"/>
44+
45+
<suppress checks="(?&lt;!Missing)JavadocMethod"
46+
files="[\\/]yardstick[\\/]"/>
47+
48+
<suppress checks="Javadoc"
49+
files="BCrypt\.java|HLL\.java|HLLMetadata\.java|HLLType\.java|BigEndianAscendingWordSerializer\.java|NumberUtil\.java|SchemaVersionOne\.java|BigEndianAscendingWordDeserializer\.java|CacheView\.java|ConcurrentLinkedDeque8\.java|ConcurrentHashMap8\.java|ConcurrentLinkedHashMap\.java"/>
50+
51+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
52+
files="[\\/]yardstick[\\/]"/>
53+
54+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
55+
files="[\\/]internal[\\/]thread[\\/]"/>
56+
57+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
58+
files="[\\/]internal[\\/]jdbc[\\/]thin[\\/]"/>
59+
60+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
61+
files="[\\/]internal[\\/]client[\\/]"/>
62+
63+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
64+
files="[\\/]io[\\/]opencensus[\\/]"/>
65+
66+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
67+
files="[\\/]test[\\/]|[\\/]tests[\\/]"/>
68+
69+
<suppress checks="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule"
70+
files="DumpReader\.java|CacheLoadOnlyStoreAdapter\.java"/>
71+
72+
<suppress-xpath checks="AnnotationOnSameLine"
73+
query="//ANNOTATION[.//IDENT[not(@text='Override')]]"/>
2974
</suppressions>

‎checkstyle/checkstyle.xml‎

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424

2525
<property name="fileExtensions" value="java, properties, xml"/>
2626

27+
<!-- Suppressions. See: https://checkstyle.sourceforge.io/filters/suppressionfilter.html -->
28+
<module name="SuppressionFilter">
29+
<property name="file" value="${checkstyle.suppressions.file}"/>
30+
</module>
31+
2732
<!-- Whitespaces Checks. See: http://checkstyle.sourceforge.net/config_whitespace.html -->
2833
<module name="FileTabCharacter">
2934
<property name="eachLine" value="true"/>
@@ -39,6 +44,11 @@
3944
</module>
4045

4146
<module name="TreeWalker">
47+
<!-- Suppressions. See: https://checkstyle.sourceforge.io/filters/suppressionxpathfilter.html -->
48+
<module name="SuppressionXpathFilter">
49+
<property name="file" value="${checkstyle.suppressions.file}"/>
50+
</module>
51+
4252
<!-- Coding Checks. See: https://checkstyle.sourceforge.io/config_coding.html -->
4353
<module name="SimplifyBooleanExpression"/>
4454

@@ -88,10 +98,7 @@
8898

8999
<!-- @Override annotations on the same line with a method declaration check. -->
90100
<module name="AnnotationOnSameLine" />
91-
<module name="SuppressionXpathSingleFilter">
92-
<property name="checks" value="AnnotationOnSameLine" />
93-
<property name="query" value="//ANNOTATION[.//IDENT[not(@text='Override')]]" />
94-
</module>
101+
95102
<!--
96103
Checks the padding between the identifier of a method definition, constructor definition, method call, or
97104
constructor invocation; and the left parenthesis of the parameter list.
@@ -172,24 +179,6 @@
172179
-->
173180
<module name="JavadocVariable"/>
174181

175-
<!--
176-
Suppresses MissingJavadocMethod check violations in the specified packages.
177-
See: https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathSingleFilter
178-
-->
179-
<module name="SuppressionXpathSingleFilter">
180-
<property name="checks" value="(?&lt;!Missing)JavadocMethod"/>
181-
<property name="files" value="[\\/]internal[\\/]|[\\/]test[\\/]|[\\/]tests[\\/]|[\\/]ml[\\/]|[\\/]yardstick[\\/]"/>
182-
</module>
183-
184-
<!--
185-
Suppresses all Javadoc check violations in the specified files.
186-
See: https://checkstyle.sourceforge.io/config_filters.html#SuppressionXpathSingleFilter
187-
-->
188-
<module name="SuppressionXpathSingleFilter">
189-
<property name="checks" value="Javadoc"/>
190-
<property name="files" value="BCrypt\.java|HLL\.java|HLLMetadata\.java|HLLType\.java|BigEndianAscendingWordSerializer\.java|NumberUtil\.java|SchemaVersionOne\.java|BigEndianAscendingWordDeserializer\.java|CacheView\.java|ConcurrentLinkedDeque8\.java|ConcurrentHashMap8\.java|ConcurrentLinkedHashMap\.java"/>
191-
</module>
192-
193182
<module name="Indentation" />
194183

195184
<module name="LeftCurly"/>
@@ -200,6 +189,35 @@
200189

201190
<!-- Usage of Ignite abbrevations check. -->
202191
<module name="org.apache.ignite.tools.checkstyle.IgniteAbbrevationsRule"/>
192+
193+
<!-- Prevents usage of the particular Java classes in Ignite codebase. -->
194+
<module name="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule">
195+
<property name="className" value="java.util.concurrent.ForkJoinPool"/>
196+
<property name="factoryMethods" value="commonPool"/>
197+
<property name="substitutionClassName" value="org.apache.ignite.internal.thread.pool.IgniteForkJoinPool"/>
198+
</module>
199+
200+
<module name="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule">
201+
<property name="className" value="java.util.concurrent.Executors"/>
202+
<property name="factoryMethods" value="newFixedThreadPool, newWorkStealingPool, newSingleThreadExecutor, newCachedThreadPool, unconfigurableExecutorService"/>
203+
<property name="substitutionClassName" value="org.apache.ignite.internal.thread.IgniteThreadPoolExecutor"/>
204+
</module>
205+
206+
<module name="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule">
207+
<property name="className" value="java.util.concurrent.Executors"/>
208+
<property name="factoryMethods" value="newSingleThreadScheduledExecutor, newScheduledThreadPool, unconfigurableScheduledExecutorService"/>
209+
<property name="substitutionClassName" value="org.apache.ignite.internal.thread.pool.IgniteScheduledThreadPoolExecutor"/>
210+
</module>
211+
212+
<module name="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule">
213+
<property name="className" value="java.util.concurrent.ThreadPoolExecutor"/>
214+
<property name="substitutionClassName" value="org.apache.ignite.internal.thread.IgniteThreadPoolExecutor"/>
215+
</module>
216+
217+
<module name="org.apache.ignite.tools.checkstyle.ClassUsageRestrictionRule">
218+
<property name="className" value="java.util.concurrent.ScheduledThreadPoolExecutor"/>
219+
<property name="substitutionClassName" value="org.apache.ignite.internal.thread.pool.IgniteScheduledThreadPoolExecutor"/>
220+
</module>
203221
</module>
204222

205223
<!--

‎config/apache-ignite-slim/default-config.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,28 @@
2525
<!--
2626
Alter configuration below as needed.
2727
-->
28-
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
28+
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
29+
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
30+
<property name="discoverySpi">
31+
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
32+
<property name="ipFinder">
33+
<!--
34+
Ignite provides several options for automatic discovery that can be used
35+
instead os static IP based discovery. For information on all options refer
36+
to our documentation: https://ignite.apache.org/docs/ignite2/latest/clustering/clustering
37+
-->
38+
<!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. -->
39+
<!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> -->
40+
<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
41+
<property name="addresses">
42+
<list>
43+
<!-- In distributed environment, replace with actual host IP address. -->
44+
<value>127.0.0.1:47500..47509</value>
45+
</list>
46+
</property>
47+
</bean>
48+
</property>
49+
</bean>
50+
</property>
51+
</bean>
2952
</beans>

‎config/apache-ignite/default-config.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,28 @@
2525
<!--
2626
Alter configuration below as needed.
2727
-->
28-
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"/>
28+
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
29+
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
30+
<property name="discoverySpi">
31+
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
32+
<property name="ipFinder">
33+
<!--
34+
Ignite provides several options for automatic discovery that can be used
35+
instead os static IP based discovery. For information on all options refer
36+
to our documentation: https://ignite.apache.org/docs/ignite2/latest/clustering/clustering
37+
-->
38+
<!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. -->
39+
<!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> -->
40+
<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
41+
<property name="addresses">
42+
<list>
43+
<!-- In distributed environment, replace with actual host IP address. -->
44+
<value>127.0.0.1:47500..47509</value>
45+
</list>
46+
</property>
47+
</bean>
48+
</property>
49+
</bean>
50+
</property>
51+
</bean>
2952
</beans>

‎docs/_docs/extensions-and-integrations/performance-statistics.adoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ performance-statistics-tool/build-report.sh --help
5454

5555
=== Performance Statistics Report Example
5656

57-
:perf_stat_url: ../../assets/images/integrations/performance-statistics
57+
:perf_stat_url: images/integrations/performance-statistics
5858

5959
[tabs]
6060
--
6161
tab:Cache operations[]
62-
image:{perf_stat_url}/perf_stat_2.jpg[link="{perf_stat_url}/perf_stat_2.jpg",window=_blank]
62+
image:{perf_stat_url}/perf_stat_2.jpg[Cache operations report]
6363
tab:Transactions[]
64-
image:{perf_stat_url}/perf_stat_3.jpg[link="{perf_stat_url}/perf_stat_3.jpg",window=_blank]
64+
image:{perf_stat_url}/perf_stat_3.jpg[Transactions report]
6565
tab:Queries[]
66-
image:{perf_stat_url}/perf_stat_4.jpg[link="{perf_stat_url}/perf_stat_4.jpg",window=_blank]
66+
image:{perf_stat_url}/perf_stat_4.jpg[Queries report]
6767
tab:Compute[]
68-
image:{perf_stat_url}/perf_stat_5.jpg[link="{perf_stat_url}/perf_stat_5.jpg",window=_blank]
68+
image:{perf_stat_url}/perf_stat_5.jpg[Compute report]
6969
tab:Cluster info[]
70-
image:{perf_stat_url}/perf_stat_1.jpg[link="{perf_stat_url}/perf_stat_1.jpg",window=_blank]
70+
image:{perf_stat_url}/perf_stat_1.jpg[Cluster info report]
7171
--
7272

7373
== Print Statistics

docs/assets/images/integrations/performance-statistics/perf_stat_1.jpg renamed to docs/_docs/images/integrations/performance-statistics/perf_stat_1.jpg

File renamed without changes.

docs/assets/images/integrations/performance-statistics/perf_stat_2.jpg renamed to docs/_docs/images/integrations/performance-statistics/perf_stat_2.jpg

File renamed without changes.

docs/assets/images/integrations/performance-statistics/perf_stat_3.jpg renamed to docs/_docs/images/integrations/performance-statistics/perf_stat_3.jpg

File renamed without changes.

docs/assets/images/integrations/performance-statistics/perf_stat_4.jpg renamed to docs/_docs/images/integrations/performance-statistics/perf_stat_4.jpg

File renamed without changes.

0 commit comments

Comments
 (0)