You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2020/10/07 10:09:18 UTC
[GitHub] [beam] piotr-szuberski opened a new pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
piotr-szuberski opened a new pull request #13027:
URL: https://github.com/apache/beam/pull/13027
Update Solr from 5.5.4 to 8.5.2
I couldn't update to 8.6.2 because it depends on or.restlet 2.4.3 which is not available (2.4.0 currently is the max) : https://mvnrepository.com/artifact/org.restlet.jee/org.restlet
I also removed a workaround connected to a bug in 5.5.4
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) and mention them in a comment (`R: @username`).
- [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/#make-reviewers-job-easier).
Post-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
Lang | SDK | Dataflow | Flink | Samza | Spark | Twister2
--- | --- | --- | --- | --- | --- | ---
Go | [](https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/) | ---
Java | [](https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/)
Python | [](https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_PVR_Flink_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/) | ---
XLang | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/) | ---
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
--- |Java | Python | Go | Website | Whitespace | Typescript
--- | --- | --- | --- | --- | --- | ---
Non-portable | [](https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/lastCompletedBuild/) <br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Whitespace_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Typescript_Cron/lastCompletedBuild/)
Portable | --- | [](https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/) | --- | --- | --- | ---
See [.test-infra/jenkins/README](https://github.com/apache/beam/blob/master/.test-infra/jenkins/README.md) for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
[](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706137319
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on a change in pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on a change in pull request #13027:
URL: https://github.com/apache/beam/pull/13027#discussion_r502405568
##########
File path: sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTestUtils.java
##########
@@ -37,10 +37,8 @@ static void createCollection(
String collection, int numShards, int replicationFactor, AuthorizedSolrClient client)
throws Exception {
CollectionAdminRequest.Create create =
- new CollectionAdminRequest.Create()
- .setCollectionName(collection)
- .setNumShards(numShards)
- .setReplicationFactor(replicationFactor)
+ CollectionAdminRequest.Create.createCollection(
+ collection, null, numShards, replicationFactor)
Review comment:
Good catch! Done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on pull request #13027: [BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706163307
> Thanks, @piotr-szuberski for this
>
> One nit comment but otherwise LGTM. Can you consider that, but please change the commit message to follow the project guidelines? It should read:
>
> `[BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2`
Sure, done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on pull request #13027: [BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706169464
Thanks @piotr-szuberski
You've renamed the PR, but it's the commit message that needs to have that text. Can you please squash those into one commit and set the message and I'll merge it?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706137319
R: @timrobertson100 Could I ask you to review this?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on pull request #13027: [BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706176955
Thanks @piotr-szuberski
Waiting for green, then will merge
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706150158
Thanks, @piotr-szuberski for this
One nit comment but otherwise LGTM. Can you consider that, but please change the commit message to follow the project guidelines? It should read:
`[BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on a change in pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on a change in pull request #13027:
URL: https://github.com/apache/beam/pull/13027#discussion_r502385742
##########
File path: sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTestUtils.java
##########
@@ -37,10 +37,8 @@ static void createCollection(
String collection, int numShards, int replicationFactor, AuthorizedSolrClient client)
throws Exception {
CollectionAdminRequest.Create create =
- new CollectionAdminRequest.Create()
- .setCollectionName(collection)
- .setNumShards(numShards)
- .setReplicationFactor(replicationFactor)
+ CollectionAdminRequest.Create.createCollection(
+ collection, null, numShards, replicationFactor)
Review comment:
Nit: can this use `public static Create createCollection(String collection, int numShards, int numReplicas)` to avoid `null`
https://github.com/apache/lucene-solr/blob/master/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java#L395
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on pull request #13027: [BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706176032
> Thanks @piotr-szuberski
>
> You've renamed the PR, but it's the commit message that needs to have that text. Can you please squash those into one commit and set the message and I'll merge it?
Sorry for that. Done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on pull request #13027:
URL: https://github.com/apache/beam/pull/13027#issuecomment-706150158
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 commented on a change in pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 commented on a change in pull request #13027:
URL: https://github.com/apache/beam/pull/13027#discussion_r502385742
##########
File path: sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTestUtils.java
##########
@@ -37,10 +37,8 @@ static void createCollection(
String collection, int numShards, int replicationFactor, AuthorizedSolrClient client)
throws Exception {
CollectionAdminRequest.Create create =
- new CollectionAdminRequest.Create()
- .setCollectionName(collection)
- .setNumShards(numShards)
- .setReplicationFactor(replicationFactor)
+ CollectionAdminRequest.Create.createCollection(
+ collection, null, numShards, replicationFactor)
Review comment:
Nit: can this use `public static Create createCollection(String collection, int numShards, int numReplicas)` to avoid `null`
https://github.com/apache/lucene-solr/blob/master/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java#L395
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] timrobertson100 merged pull request #13027: [BEAM-5589 BEAM-5590 BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
timrobertson100 merged pull request #13027:
URL: https://github.com/apache/beam/pull/13027
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] piotr-szuberski commented on a change in pull request #13027: [BEAM-5589][BEAM-5590][BEAM-5591] Update Solr dependencies from 5.5.4 to 8.5.2
Posted by GitBox <gi...@apache.org>.
piotr-szuberski commented on a change in pull request #13027:
URL: https://github.com/apache/beam/pull/13027#discussion_r502405568
##########
File path: sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTestUtils.java
##########
@@ -37,10 +37,8 @@ static void createCollection(
String collection, int numShards, int replicationFactor, AuthorizedSolrClient client)
throws Exception {
CollectionAdminRequest.Create create =
- new CollectionAdminRequest.Create()
- .setCollectionName(collection)
- .setNumShards(numShards)
- .setReplicationFactor(replicationFactor)
+ CollectionAdminRequest.Create.createCollection(
+ collection, null, numShards, replicationFactor)
Review comment:
Good catch! Done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org