Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LPS-101058 As a site admin it should be possible to create content sets based on keyword searches #2533

Closed
wants to merge 57 commits into from

Conversation

rotty3000
Copy link

No description provided.

@liferay-continuous-integration
Copy link
Collaborator

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

@kyle-miho
Copy link

ci:test

@rotty3000
Copy link
Author

@ealonso while the above is functional there is a coupld of details that I think can still use some work:

  • the _mergeKeywords logic I think is not solid enough, might need assistance from @arboliveira to get it correct
  • detecting and handling luceneSyntax could be cleaner

@rotty3000
Copy link
Author

ci:stop

@rotty3000
Copy link
Author

ci:test

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test - 0 out of 1 jobs passed in 17 minutes 10 seconds 282 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: be62634ad850bed6561afd14982dc2ccf199b1b9

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: bde67ee189e438bb57d8ceef095e82cf9e423fad

0 out of 1 jobs PASSED
For more details click here.

Failures unique to this pull:

  1. test-portal-acceptance-pullrequest(master)
    Job Results:

    0 Jobs Passed.
    1 Job Failed.

    Build was aborted

For upstream results, click here.

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test - 179 out of 197 jobs passed in 2 hours 23 minutes 22 seconds 174 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: be62634ad850bed6561afd14982dc2ccf199b1b9

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: bde67ee189e438bb57d8ceef095e82cf9e423fad

179 out of 197 jobs PASSED

18 Failed Jobs:

179 Successful Jobs:
For more details click here.

Failures unique to this pull:

  1. test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-jboss71-mysql57-jdk8/0
    Job Results:

    0 Tests Passed.
    1 Test Failed.

    1. AXIS_VARIABLE=0,label_exp=!master #321960
      clean-up-web-xml:
           [copy] Copying 1 file to /opt/dev/projects/github/liferay-portal/bundles/jboss-eap-7.1.0/webapps/ROOT/WEB-INF
      [stopwatch] [run.jboss: 11:15.904 sec]
      [stopwatch] [run.selenium.jboss: 11:46.918 sec]
           [exec] Shutting down MySQL..[  OK  ]
      [stopwatch] [run.batch.test.action: 11:51.178 sec]
           [echo] 
            [get] Getting: http://test-1-11/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=0,label_exp=!master/321960//consoleText
            [get] To: /opt/dev/projects/github/liferay-portal/20190905182143375.txt
         [delete] Deleting: /opt/dev/projects/github/liferay-portal/20190905182143375.txt
         [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1907260359.properties
  2. test-portal-acceptance-pullrequest-batch(master)/modules-integration-db2111-jdk8
    Job Results:

    31 Tests Passed.
    2 Tests Failed.

    1. AXIS_VARIABLE=1,label_exp=!master #333964
           [exec] * What went wrong:
           [exec] Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] > Compilation failed; see the compiler error output for details.
           [exec] 
           [exec] * Try:
           [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
           [exec] 
           [exec] * Exception is:
           [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
    2. AXIS_VARIABLE=23,label_exp=!master #333964
           [exec] * What went wrong:
           [exec] Execution failed for task ':apps:portal:portal-jmx-test:startTestableTomcat'.
           [exec] > Timeout while waiting for the application server
           [exec] 
           [exec] * Try:
           [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
           [exec] 
           [exec] * Exception is:
           [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':apps:portal:portal-jmx-test:startTestableTomcat'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
           [exec] 	at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.run(EventFiringTaskExecuter.java:51)
  3. test-portal-acceptance-pullrequest-batch(master)/modules-integration-hypersonic20-jdk8
    Job Results:

    32 Tests Passed.
    1 Test Failed.

    1. AXIS_VARIABLE=1,label_exp=!master #321961
           [exec] * What went wrong:
           [exec] Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] > Compilation failed; see the compiler error output for details.
           [exec] 
           [exec] * Try:
           [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
           [exec] 
           [exec] * Exception is:
           [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
  4. test-portal-acceptance-pullrequest-batch(master)/modules-integration-mariadb102-jdk8
    Job Results:

    31 Tests Passed.
    2 Tests Failed.

    1. AXIS_VARIABLE=1,label_exp=!master #284572
           [exec] * What went wrong:
           [exec] Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] > Compilation failed; see the compiler error output for details.
           [exec] 
           [exec] * Try:
           [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
           [exec] 
           [exec] * Exception is:
           [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':test:arquillian-extension-junit-bridge-test:compileTestIntegrationJava'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
    2. AXIS_VARIABLE=23,label_exp=!master #284572
           [exec] * What went wrong:
           [exec] Execution failed for task ':apps:portal:portal-jmx-test:startTestableTomcat'.
           [exec] > Timeout while waiting for the application server
           [exec] 
           [exec] * Try:
           [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
           [exec] 
           [exec] * Exception is:
           [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':apps:portal:portal-jmx-test:startTestableTomcat'.
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeActions(ExecuteActionsTaskExecuter.java:110)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:77)
           [exec] 	at org.gradle.api.internal.tasks.execution.OutputDirectoryCreatingTaskExecuter.execute(OutputDirectoryCreatingTaskExecuter.java:51)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipUpToDateTaskExecuter.execute(SkipUpToDateTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskOutputCachingStateExecuter.execute(ResolveTaskOutputCachingStateExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:101)
           [exec] 	at org.gradle.api.internal.tasks.execution.FinalizeInputFilePropertiesTaskExecuter.execute(FinalizeInputFilePropertiesTaskExecuter.java:44)
           [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:91)
           [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskArtifactStateTaskExecuter.execute(ResolveTaskArtifactStateTaskExecuter.java:62)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:59)
           [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:54)
           [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteAtMostOnceTaskExecuter.execute(ExecuteAtMostOnceTaskExecuter.java:43)
           [exec] 	at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:34)
           [exec] 	at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.run(EventFiringTaskExecuter.java:51)
  5. ...

@ealonso
Copy link
Owner

ealonso commented Sep 6, 2019

Just started reviewing :)

:octocat: Sent from GH.

@ealonso
Copy link
Owner

ealonso commented Sep 10, 2019

Hey @rotty3000,

After reviewing your pull, I've see some improvements that we should take into account to merge it into the product.

  • Move the _mergeKeywords to AssetSearcher, implementing it with BooleanFilter
  • Implement something similar to addSearchAssetTagNames, creating new methods for all, any, notall and notany and maybe a new method for addSearchAssetKeywords
  • Avoid using the "search.lucene.syntax" into the service context, I think we can avoid it if we create the new methods

Could you please take a look at it? if you don't have enough time, I can take care of it but I don't have enough time at this moment, so it should wait a couple of days.

Regards,
Eudaldo.

cc: @JorgeFerrer

@rotty3000
Copy link
Author

hey @ealonso please see updated. I think this probably covers your comments.

@rotty3000
Copy link
Author

Oh, and I also reflected the changes directly in the Asset Publisher portlet as well. So the logic in both places where the Filter builder is used are the same.

@ealonso
Copy link
Owner

ealonso commented Sep 24, 2019

Just started reviewing :)

:octocat: Sent from GH.

BryanEngler and others added 23 commits September 29, 2019 22:41
…neAdapterClusterRequestTest.testExecuteHealthClusterRequest - Elastic default number of shards is now 1

https://issues.liferay.com/browse/LPS-101266
…neAdapterSnapshotRequestTest.testCreateSnapshot - Default number of shards is 1

https://issues.liferay.com/browse/LPS-101266
…d field (e.g. the `*<substring>*` construct) will always score 1.0 leading to indeterministic order of results on some search engine versions.

https://issues.liferay.com/browse/LPS-101266
…e when new localization does not exist"

This reverts commit e0f5e6f.
@ealonso
Copy link
Owner

ealonso commented Oct 7, 2019

Pull request submitted to brianchandotcom#79223.

:octocat: Sent from GH.

@ealonso ealonso closed this Oct 7, 2019
@ealonso
Copy link
Owner

ealonso commented Oct 8, 2019

Pull request submitted to brianchandotcom#79274.

:octocat: Sent from GH.

@ealonso
Copy link
Owner

ealonso commented Oct 8, 2019

Pull request submitted to brianchandotcom#79276.

:octocat: Sent from GH.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet