Skip to content

Commit eb32f14

Browse files
gongxuanzhanggongxuanzhang
authored
Merge branch 'apache:trunk' into expire_batch
2 parents 83f4f2f + a78a931 commit eb32f14

File tree

125 files changed

+2614
-1791
lines changed

Some content is hidden

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

125 files changed

+2614
-1791
lines changed

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -277,14 +277,6 @@ See [trogdor/README.md](trogdor/README.md).
277277

278278
See [vagrant/README.md](vagrant/README.md).
279279

280-
### Release Kafka ###
281-
282-
See [release/README.md](release/README.md).
283-
284-
### Official Documentation ###
285-
286-
See [docs/README.md](docs/README.md).
287-
288280
### Kafka client examples ###
289281

290282
See [examples/README.md](examples/README.md).

‎bin/kafka-run-class.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ if [ -z "$KAFKA_LOG4J_OPTS" ]; then
225225
(( WINDOWS_OS_FORMAT )) && LOG4J_DIR=$(cygpath --path --mixed "${LOG4J_DIR}")
226226
KAFKA_LOG4J_OPTS="-Dlog4j2.configurationFile=${LOG4J_DIR}"
227227
else
228-
if echo "$KAFKA_LOG4J_OPTS" | grep -E "log4j\.[^[:space:]]+(\.properties|\.xml)$"; then
228+
if echo "$KAFKA_LOG4J_OPTS" | grep -E "log4j\.[^[:space:]]+(\.properties|\.xml)$" >/dev/null; then
229229
# Enable Log4j 1.x configuration compatibility mode for Log4j 2
230230
export LOG4J_COMPATIBILITY=true
231231
echo DEPRECATED: A Log4j 1.x configuration file has been detected, which is no longer recommended. >&2

‎build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,7 @@ project(':server') {
902902
implementation project(':transaction-coordinator')
903903
implementation project(':raft')
904904
implementation project(':share-coordinator')
905+
implementation project(':storage:storage-api')
905906
implementation libs.jacksonDatabind
906907
implementation libs.metrics
907908
implementation libs.slf4jApi
@@ -913,6 +914,7 @@ project(':server') {
913914
testImplementation testLog4j2Libs
914915
testImplementation project(':test-common:test-common-internal-api')
915916
testImplementation project(':test-common:test-common-runtime')
917+
testImplementation project(':storage:storage-api').sourceSets.test.output
916918

917919
testRuntimeOnly runtimeTestLibs
918920
}
@@ -2242,6 +2244,7 @@ project(':storage') {
22422244
testImplementation project(':clients').sourceSets.test.output
22432245
testImplementation project(':core')
22442246
testImplementation project(':core').sourceSets.test.output
2247+
testImplementation project(':storage:storage-api').sourceSets.test.output
22452248
testImplementation project(':test-common:test-common-internal-api')
22462249
testImplementation project(':test-common:test-common-runtime')
22472250
testImplementation project(':test-common:test-common-util')
@@ -2415,6 +2418,7 @@ project(':tools') {
24152418
implementation project(':group-coordinator')
24162419
implementation project(':coordinator-common')
24172420
implementation project(':share-coordinator')
2421+
implementation project(':raft')
24182422
implementation libs.argparse4j
24192423
implementation libs.jacksonDatabind
24202424
implementation libs.jacksonDataformatCsv

‎checkstyle/import-control-clients-integration-tests.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<import-control pkg="org.apache.kafka">
2222
<allow pkg="java"/>
2323
<allow pkg="org.junit"/>
24+
<allow pkg="scala" />
2425

2526
<!-- These are tests, allow whatever -->
2627
<allow pkg="org.apache.kafka"/>

‎checkstyle/import-control-core.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,6 @@
6666
<allow class="com.fasterxml.jackson.annotation.JsonIgnoreProperties" />
6767
</subpackage>
6868

69-
<subpackage name="log.remote">
70-
<allow pkg="org.apache.kafka.server.common" />
71-
<allow pkg="org.apache.kafka.server.log.remote" />
72-
<allow pkg="org.apache.kafka.server.log.remote.quota" />
73-
<allow pkg="org.apache.kafka.server.metrics" />
74-
<allow pkg="org.apache.kafka.storage.internals" />
75-
<allow pkg="org.apache.kafka.storage.log.metrics" />
76-
<allow pkg="kafka.log" />
77-
<allow pkg="kafka.cluster" />
78-
<allow pkg="kafka.server" />
79-
<allow pkg="org.mockito" />
80-
<allow pkg="org.apache.kafka.test" />
81-
</subpackage>
82-
8369
<subpackage name="server">
8470
<allow pkg="kafka" />
8571
<allow pkg="org.apache.kafka" />

‎checkstyle/import-control-storage.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<allow pkg="org.junit" />
3030
<allow pkg="org.hamcrest" />
3131
<allow pkg="org.mockito" />
32+
<allow pkg="org.opentest4j" />
3233
<allow pkg="java.security" />
3334
<allow pkg="javax.net.ssl" />
3435
<allow pkg="javax.security" />
@@ -74,8 +75,12 @@
7475
</subpackage>
7576
<subpackage name="storage">
7677
<allow pkg="com.yammer.metrics.core" />
77-
<allow pkg="org.apache.kafka.server.metrics" />
7878
<allow pkg="org.apache.kafka.common.test" />
79+
<allow pkg="org.apache.kafka.server.metrics" />
80+
<allow pkg="org.apache.kafka.server.purgatory" />
81+
<allow pkg="org.apache.kafka.server.quota" />
82+
<allow pkg="org.apache.kafka.server.storage.log" />
83+
<allow pkg="org.apache.kafka.server.util" />
7984
</subpackage>
8085
</subpackage>
8186
</subpackage>

‎checkstyle/import-control.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@
295295
<allow pkg="org.apache.kafka.metadata" />
296296
<allow pkg="org.apache.kafka.metadata.properties" />
297297
<allow pkg="org.apache.kafka.network" />
298+
<allow pkg="org.apache.kafka.raft" />
298299
<allow pkg="org.apache.kafka.server.util" />
299300
<allow pkg="kafka.admin" />
300301
<allow pkg="kafka.server" />

‎checkstyle/suppressions.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737

3838
<!-- core -->
3939
<suppress checks="NPathComplexity" files="(ClusterTestExtensions|KafkaApisBuilder|SharePartition|SharePartitionManager).java"/>
40-
<suppress checks="NPathComplexity|ClassFanOutComplexity|ClassDataAbstractionCoupling|JavaNCSS" files="(RemoteLogManager|RemoteLogManagerTest).java"/>
41-
<suppress checks="MethodLength" files="RemoteLogManager.java"/>
42-
<suppress checks="MethodLength" files="RemoteLogManagerConfig.java"/>
43-
<suppress checks="ClassFanOutComplexity" files="RemoteLogManagerTest.java"/>
4440
<suppress checks="MethodLength"
4541
files="(KafkaClusterTestKit).java"/>
4642
<suppress checks="NPathComplexity" files="TestKitNodes.java"/>
4743
<suppress checks="JavaNCSS"
48-
files="(RemoteLogManagerTest|SharePartitionManagerTest|SharePartitionTest).java"/>
44+
files="(SharePartitionManagerTest|SharePartitionTest).java"/>
4945
<suppress checks="ClassDataAbstractionCoupling|ClassFanOutComplexity" files="SharePartitionManagerTest"/>
5046
<suppress checks="CyclomaticComplexity" files="SharePartition.java"/>
5147

@@ -364,7 +360,9 @@
364360
<suppress checks="ParameterNumber"
365361
files="(LogAppendInfo|LogLoader|RemoteLogManagerConfig|UnifiedLog).java"/>
366362
<suppress checks="(ClassDataAbstractionCoupling|ClassFanOutComplexity)"
367-
files="(UnifiedLog).java"/>
363+
files="(UnifiedLog|RemoteLogManager|RemoteLogManagerTest).java"/>
364+
<suppress checks="MethodLength" files="(RemoteLogManager|RemoteLogManagerConfig).java"/>
365+
<suppress checks="JavaNCSS" files="RemoteLogManagerTest.java"/>
368366

369367
<!-- benchmarks -->
370368
<suppress checks="(ClassDataAbstractionCoupling|ClassFanOutComplexity)"

0 commit comments

Comments
 (0)