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

Fix sort in hsearch - use full millis #3787

Merged
merged 2 commits into from
Jul 13, 2022
Merged

Conversation

michaelabuckley
Copy link
Contributor

We were sorting on the date ordinal, not the timestamp.

@michaelabuckley michaelabuckley enabled auto-merge (squash) July 13, 2022 15:41
@codecov
Copy link

codecov bot commented Jul 13, 2022

Codecov Report

Merging #3787 (152a015) into master (6ba84e1) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #3787      +/-   ##
============================================
+ Coverage     83.40%   83.41%   +0.01%     
- Complexity    21813    21817       +4     
============================================
  Files          1434     1434              
  Lines         78165    78165              
  Branches      11553    11553              
============================================
+ Hits          65196    65204       +8     
+ Misses         8526     8521       -5     
+ Partials       4443     4440       -3     
Impacted Files Coverage Δ
...uhn/fhir/jpa/dao/search/HSearchSortHelperImpl.java 83.67% <100.00%> (ø)
...or/TransactionConcurrencySemaphoreInterceptor.java 79.41% <0.00%> (-4.42%) ⬇️
.../uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java 90.18% <0.00%> (+0.93%) ⬆️
...ain/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java 59.18% <0.00%> (+2.04%) ⬆️
...ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java 79.24% <0.00%> (+5.66%) ⬆️
...n/fhir/jpa/config/HapiFhirHibernateJpaDialect.java 90.62% <0.00%> (+15.62%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6ba84e1...152a015. Read the comment docs.

@michaelabuckley michaelabuckley merged commit 94a1cda into master Jul 13, 2022
@michaelabuckley michaelabuckley deleted the mb-fix-hsearch-sort-date branch July 13, 2022 17:32
michaelabuckley added a commit that referenced this pull request Aug 8, 2022
* commit '0a1e782a8ea4c29eb490836ebd0360c3e6999635': (81 commits)
  3817 enhance subscription before message delivery (#3824)
  3755 use batch2 job after search parameter change (#3806)
  separate elastic tests into their own project (#3827)
  Document the need to reindex when enabling full resource storage with indexed resources. (#3815)
  fix checkstyle
  test passes with a lot of copy/paste
  Issue 3804 application fails to start 610 pre14 snapshot with beandefinitionoverrideexception invalid bean definition with name loadidsstep (#3805)
  Implement patch in mongo db (#3781)
  3531 implement bulk processors (#3566)
  Hsearch no scroll queries (#3799)
  3770 fix batch2 failure loop (#3779)
  Make patch `add` actually add instead of replace. (#3800)
  Adding autoclosing for sonatype publishing (#3798)
  3664 fast elastic load (#3769)
  3788 FHIR patch on soft deleted resource undeletes resource (#3789)
  3790 remove legacy search builder (#3791)
  Fix sort in hsearch - use full millis (#3787)
  Mb implement token :not inmemory (#3784)
  Changelog
  Bump jetty-http from 9.4.44.v20210927 to 9.4.48.v20220622 (#3766)
  ...

# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchClauseBuilder.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchIndexExtractor.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java
#	hapi-fhir-jpaserver-elastic-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java
#	hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/ExtendedHSearchIndexData.java
#	hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/HSearchIndexWriter.java
#	hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/search/SearchParamTextPropertyBinder.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants