Skip to content

MINOR: Upgrade to Scala 2.13.4#9643

Merged
ijuma merged 14 commits intoapache:trunkfrom
ijuma:scala-2.13.4
Nov 24, 2020
Merged

MINOR: Upgrade to Scala 2.13.4#9643
ijuma merged 14 commits intoapache:trunkfrom
ijuma:scala-2.13.4

Conversation

@ijuma
Copy link
Copy Markdown
Member

@ijuma ijuma commented Nov 23, 2020 •
edited
Loading

Scala 2.13.4 restores default global ExecutionContext to 2.12 behavior
(to fix a perf regression in some use cases) and improves pattern matching
(especially exhaustiveness checking). Most of the changes are related
to the latter as I have enabled the newly introduced -Xlint:strict-unsealed-patmat.

More details on the code changes:

  • Don't swallow exception in ReassignPartitionsCommand.topicDescriptionFutureToState.
  • RequestChannel.Response should be sealed.
  • Introduce sealed ClientQuotaManager.BaseUserEntity to avoid false positive
    exhaustiveness warning.
  • Handle a number of cases where pattern matches were not exhaustive:
    either by marking them with @unchecked or by adding a catch-all clause.
  • Workaround scalac bug related to exhaustiveness warnings in ZooKeeperClient
  • Remove warning suppression annotations related to the optimizer that are no
    longer needed in ConsumerGroupCommand and AclAuthorizer.
  • Use forKeyValue in AclAuthorizer.acls as the scala bug preventing us from
    using it seems to be fixed.
  • Also update scalaCollectionCompat to 2.3.0, which includes minor improvements.

Full release notes:

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

@ijuma ijuma requested a review from omkreddy November 23, 2020 15:46
omkreddy
omkreddy approved these changes Nov 24, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@omkreddy omkreddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ijuma Thanks for the PR. LGTM of tests pass,

chia7712
chia7712 approved these changes Nov 24, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@chia7712 chia7712 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 and a trivial comment.

Comment thread core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala Outdated
Copy link
Copy Markdown
Member

@chia7712 chia7712 Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useless brackets

Copy link
Copy Markdown
Member Author

@ijuma ijuma Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

ijuma added 12 commits November 24, 2020 06:21
@ijuma ijuma changed the title MINOR: Upgrade to Scala 2.13.4 and 2.12.13 MINOR: Upgrade to Scala 2.13.4 Nov 24, 2020
@ijuma
Copy link
Copy Markdown
Member Author

ijuma commented Nov 24, 2020

I reverted the Scala 2.12.13 change, looks like this hasn't been published to Maven yet.

@ijuma
Copy link
Copy Markdown
Member Author

ijuma commented Nov 24, 2020

Tests passed, merging.

@ijuma ijuma merged commit cbf8ad2 into apache:trunk Nov 24, 2020
@ijuma ijuma deleted the scala-2.13.4 branch November 24, 2020 18:29
@cadonna cadonna mentioned this pull request Nov 25, 2020
Merged
ijuma added a commit to ijuma/kafka that referenced this pull request Dec 2, 2020
@ijuma
Merge remote-tracking branch 'apache-github/trunk' into skip-to-struc…
d834f14 
…t-for-generated-requests

* apache-github/trunk: (405 commits)
KAFKA-6687: restrict DSL to allow only Streams from the same source
topics (apache#9609)
  MINOR: Small cleanups in `AlterIsr` handling logic (apache#9663)
MINOR: Increase unit test coverage of method
ProcessorTopology#updateSourceTopics() (apache#9654)
  MINOR: fix reading SSH output in Streams system tests (apache#9665)
  KAFKA-10770: Remove duplicate defination of Metrics#getTags (apache#9659)
  KAFKA-10722: Described the types of the used state stores (apache#9607)
  KAFKA-10702; Skip bookkeeping of empty transactions (apache#9632)
  MINOR: Remove erroneous extra <code> in design doc (apache#9657)
KAFKA-10736 Convert transaction coordinator metadata schemas to use g…
(apache#9611)
  MINOR: Update vagrant/tests readme (apache#9650)
  KAFKA-10720: Document prohibition on header mutation by SMTs (apache#9597)
  KAFKA-10713: Stricter protocol parsing in hostnames (apache#9593)
  KAFKA-10565: Only print console producer prompt with a tty (apache#9644)
  MINOR: fix listeners doc to close <code> properly (apache#9655)
  MINOR: Remove unnecessary statement from WorkerConnector#doRun (apache#9653)
KAFKA-10758: ProcessorTopology should only consider its own nodes when
updating regex source topics (apache#9648)
KAFKA-10754: fix flaky tests by waiting kafka streams be in running
state before assert (apache#9629)
  MINOR: Upgrade to Scala 2.13.4 (apache#9643)
  MINOR: Update build and test dependencies (apache#9645)
MINOR: Remove redundant argument from TaskMetricsGroup#recordCommit
(apache#9642)
  ...

clients/src/main/java/org/apache/kafka/clients/ClientRequest.java
clients/src/main/java/org/apache/kafka/clients/NetworkClient.java
clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java
clients/src/main/java/org/apache/kafka/common/requests/AbstractRequestResponse.java
clients/src/main/java/org/apache/kafka/common/requests/AbstractResponse.java
clients/src/main/java/org/apache/kafka/common/requests/AlterConfigsResponse.java
clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java
clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java
clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java
clients/src/main/java/org/apache/kafka/common/requests/LeaderAndIsrRequest.java
clients/src/main/java/org/apache/kafka/common/requests/ListOffsetRequest.java
clients/src/main/java/org/apache/kafka/common/requests/ListOffsetResponse.java
clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochResponse.java
clients/src/main/java/org/apache/kafka/common/requests/ProduceRequest.java
clients/src/main/java/org/apache/kafka/common/requests/ProduceResponse.java
clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java
clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java
clients/src/main/java/org/apache/kafka/common/requests/UpdateMetadataRequest.java
clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java
clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java
clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java
clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java
clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java
clients/src/test/java/org/apache/kafka/common/requests/RequestHeaderTest.java
clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java
@chia7712 chia7712 mentioned this pull request Jan 27, 2021
Merged
3 tasks
udaynpusa pushed a commit to mapr/kafka that referenced this pull request Apr 25, 2024
@ijuma @ychernysh
KAFKA-1001 Update scala version to resolve CVE-2022-36944
3c6ef14 
This change bumps scala version to 2.13.12 and cherry-picks squashed combination of the following commits (only scala-related changes):
dfaae31 MINOR: Upgrade Scala for Java 20/21 support (apache#13840)
6ae08c4 KAFKA-14256: Upgrade from Scala 2.13.8 to 2.13.10 (apache#12675)
7c2d672 MINOR: Update library dependencies (Q1 2022) (apache#11306)
a8bd649 MINOR: Update Scala to 2.13.6 (apache#10711)
dd34e40 MINOR: Update Scala to 2.13.5 (apache#10169)
cbf8ad2 MINOR: Upgrade to Scala 2.13.4 (apache#9643)
7f90a58 MINOR: Update Scala to 2.13.3 (apache#8931)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chia7712 chia7712 chia7712 approved these changes

@omkreddy omkreddy omkreddy approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ijuma @chia7712 @omkreddy