[Rollup] Remove builders from DateHistogramGroupConfig #32555

tlrx · 2018-08-01T16:46:26Z

Same motivation as #32507 but for the DateHistogramGroupConfig configuration object. This pull request also changes the format of the time zone from a Joda's DateTimeZone to a simple String.

It should help to port the API to the high level rest client and allows clients to not be forced to use the Joda Time library. Serialization is impacted but does not need a backward compatibility layer as DateTimeZone are serialized as String anyway. XContent also expects a String for timezone, so I found it easier to move everything to String but I'm happy to have any feedback on this change.

Related to #29827

elasticmachine · 2018-08-01T16:46:28Z

Pinging @elastic/es-search-aggs

jimczi

Thanks @tlrx , I left a small comment, LGTM otherwise

jimczi · 2018-08-01T20:24:02Z

...gin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/DateHistogramGroupConfig.java

+    public DateHistogramGroupConfig(final String field,
+                                    final DateHistogramInterval interval,
+                                    final @Nullable DateHistogramInterval delay,
+                                    final String timeZone) {


Can you add javadocs to this constructor and maybe add the fact that we use Joda to parse the timeZone. Also the timeZone is optional so we could maybe have a simple ctr for field and interval and one that have all the options ?

++

Also, could we annotate timeZone as @Nullable here too?

I added some javadoc. Let me know if that's ok for you.

polyfractal · 2018-08-01T20:37:07Z

...t/java/org/elasticsearch/xpack/core/rollup/job/DateHistogramGroupConfigSerializingTests.java

        config.validateMappings(responseMap, e);
        assertThat(e.validationErrors().size(), equalTo(0));
    }
+
+    public void testBwcSerialization() throws IOException {


Isn't this sort of test covered by AbstractSerializingTestCase via it's super-class AbstractWireTestCase? Or am I missing something that makes this different?

It's a bit different: AbstractSerializingTestCase takes care of testing the XContent parsing logic and AbstractWireTestCase tests the java serialization logic. But this pull request changes the format of the timezone from DateTimeZone to String and AbstractWireTestCase will now execute the tests using the new type only.

This test checks that we can still read from / write to the old format that serializes/deserializes DateTimeZone objects.

Ooh, missed that little detail. Great thanks!

polyfractal · 2018-08-01T20:43:40Z

...gin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/DateHistogramGroupConfig.java

        this.interval = interval;
        this.field = field;
        this.delay = delay;
-        this.timeZone = Objects.requireNonNull(timeZone);
+        this.timeZone = timeZone != null ? timeZone : DEFAULT_TIMEZONE;


Since timezone is now a string, we should probably check for Strings.isNullOrEmpty() instead of just null now.

(or null/empty check, I'll leave that up to personal preference :) )

polyfractal

Few minor comments/questions from me too but otherwise LGTM :)

jimczi

Thanks @tlrx !

tlrx · 2018-08-03T11:19:08Z

Thanks @jimczi and @polyfractal

Same motivation as #32507 but for the DateHistogramGroupConfig configuration object. This pull request also changes the format of the time zone from a Joda's DateTimeZone to a simple String. It should help to port the API to the high level rest client and allows clients to not be forced to use the Joda Time library. Serialization is impacted but does not need a backward compatibility layer as DateTimeZone are serialized as String anyway. XContent also expects a String for timezone, so I found it easier to move everything to String. Related to #29827

…pe-detection-with-leading-whitespace * elastic/master: (34 commits) Cross-cluster search: preserve cluster alias in shard failures (elastic#32608) Handle AlreadyClosedException when bumping primary term [TEST] Allow to run in FIPS JVM (elastic#32607) [Test] Add ckb to the list of unsupported languages (elastic#32611) SCRIPTING: Move Aggregation Scripts to their own context (elastic#32068) Painless: Use LocalMethod Map For Lookup at Runtime (elastic#32599) [TEST] Enhance failure message when bulk updates have failures [ML] Add ML result classes to protocol library (elastic#32587) Suppress LicensingDocumentationIT.testPutLicense in release builds (elastic#32613) [Rollup] Update wire version check after backport Suppress Wildfly test in FIPS JVMs (elastic#32543) [Rollup] Improve ID scheme for rollup documents (elastic#32558) ingest: doc: move Dot Expander Processor doc to correct position (elastic#31743) [ML] Add some ML config classes to protocol library (elastic#32502) [TEST]Split transport verification mode none tests (elastic#32488) Core: Move helper date formatters over to java time (elastic#32504) [Rollup] Remove builders from DateHistogramGroupConfig (elastic#32555) [TEST} unmutes SearchAsyncActionTests and adds debugging info [ML] Add Detector config classes to protocol library (elastic#32495) [Rollup] Remove builders from MetricConfig (elastic#32536) ...

* 6.x: [Kerberos] Use canonical host name (#32588) Cross-cluster search: preserve cluster alias in shard failures (#32608) [TEST] Allow to run in FIPS JVM (#32607) Handle AlreadyClosedException when bumping primary term [Test] Add ckb to the list of unsupported languages (#32611) SCRIPTING: Move Aggregation Scripts to their own context (#32068) (#32629) [TEST] Enhance failure message when bulk updates have failures [ML] Add ML result classes to protocol library (#32587) Suppress LicensingDocumentationIT.testPutLicense in release builds (#32613) [Rollup] Improve ID scheme for rollup documents (#32558) Mutes failing SQL string function tests due to #32589 Suppress Wildfly test in FIPS JVMs (#32543) Add cluster UUID to Cluster Stats API response (#32206) [ML] Add some ML config classes to protocol library (#32502) [TEST]Split transport verification mode none tests (#32488) [Rollup] Remove builders from DateHistogramGroupConfig (#32555) [ML] Add Detector config classes to protocol library (#32495) [Rollup] Remove builders from MetricConfig (#32536) Fix race between replica reset and primary promotion (#32442) HLRC: Move commercial clients from XPackClient (#32596) Security: move User to protocol project (#32367) Minor fix for javadoc (applicable for java 11). (#32573) Painless: Move Some Lookup Logic to PainlessLookup (#32565) Core: Minor size reduction for AbstractComponent (#32509) INGEST: Enable default pipelines (#32286) (#32591) TEST: Avoid merges in testSeqNoAndCheckpoints [Rollup] Remove builders from HistoGroupConfig (#32533) fixed elements in array of produced terms (#32519) Mutes ReindexFailureTests.searchFailure dues to #28053 Mutes LicensingDocumentationIT due to #32580 Remove the SATA controller from OpenSUSE box [ML] Rename JobProvider to JobResultsProvider (#32551)

* master: Cross-cluster search: preserve cluster alias in shard failures (#32608) Handle AlreadyClosedException when bumping primary term [TEST] Allow to run in FIPS JVM (#32607) [Test] Add ckb to the list of unsupported languages (#32611) SCRIPTING: Move Aggregation Scripts to their own context (#32068) Painless: Use LocalMethod Map For Lookup at Runtime (#32599) [TEST] Enhance failure message when bulk updates have failures [ML] Add ML result classes to protocol library (#32587) Suppress LicensingDocumentationIT.testPutLicense in release builds (#32613) [Rollup] Update wire version check after backport Suppress Wildfly test in FIPS JVMs (#32543) [Rollup] Improve ID scheme for rollup documents (#32558) ingest: doc: move Dot Expander Processor doc to correct position (#31743) [ML] Add some ML config classes to protocol library (#32502) [TEST]Split transport verification mode none tests (#32488) Core: Move helper date formatters over to java time (#32504) [Rollup] Remove builders from DateHistogramGroupConfig (#32555) [TEST} unmutes SearchAsyncActionTests and adds debugging info [ML] Add Detector config classes to protocol library (#32495) [Rollup] Remove builders from MetricConfig (#32536) Tests: Add rolling upgrade tests for watcher (#32428) Fix race between replica reset and primary promotion (#32442)

tlrx added review v7.0.0 >refactoring :StorageEngine/Rollup Turn fine-grained time-based data into coarser-grained data v6.5.0 labels Aug 1, 2018

tlrx requested review from polyfractal and jimczi August 1, 2018 16:46

jimczi approved these changes Aug 1, 2018

View reviewed changes

$polyfractal$

polyfractal reviewed Aug 1, 2018

View reviewed changes

$polyfractal$

polyfractal approved these changes Aug 1, 2018

View reviewed changes

jimczi approved these changes Aug 2, 2018

View reviewed changes

tlrx force-pushed the remove-builders-from-rollup-fate-histo-group-config branch from 65d3ecb to e75e3ec Compare August 2, 2018 11:18

tlrx added 4 commits August 3, 2018 10:29

[Rollup] Remove builders from DateHistogramGroupConfig

aedac77

DateHistogramGroupConfig must implement ToXContentObject

15e4bec

Apply feedback

c2d3510

Fix parsing

ee78d03

tlrx force-pushed the remove-builders-from-rollup-fate-histo-group-config branch from e75e3ec to ee78d03 Compare August 3, 2018 08:37

tlrx merged commit 21f660d into elastic:master Aug 3, 2018

tlrx deleted the remove-builders-from-rollup-fate-histo-group-config branch August 3, 2018 11:11

colings86 added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Rollup] Remove builders from DateHistogramGroupConfig #32555

[Rollup] Remove builders from DateHistogramGroupConfig #32555

tlrx commented Aug 1, 2018

elasticmachine commented Aug 1, 2018

jimczi left a comment

jimczi Aug 1, 2018

$@polyfractal$ polyfractal Aug 1, 2018

tlrx Aug 2, 2018

$@polyfractal$ polyfractal Aug 1, 2018

tlrx Aug 2, 2018

$@polyfractal$ polyfractal Aug 2, 2018

$@polyfractal$ polyfractal Aug 1, 2018 •

edited

Loading

$@polyfractal$ polyfractal left a comment

jimczi left a comment

tlrx commented Aug 3, 2018

[Rollup] Remove builders from DateHistogramGroupConfig #32555

[Rollup] Remove builders from DateHistogramGroupConfig #32555

Conversation

tlrx commented Aug 1, 2018

elasticmachine commented Aug 1, 2018

jimczi left a comment

Choose a reason for hiding this comment

jimczi Aug 1, 2018

Choose a reason for hiding this comment

polyfractal Aug 1, 2018

Choose a reason for hiding this comment

tlrx Aug 2, 2018

Choose a reason for hiding this comment

polyfractal Aug 1, 2018

Choose a reason for hiding this comment

tlrx Aug 2, 2018

Choose a reason for hiding this comment

polyfractal Aug 2, 2018

Choose a reason for hiding this comment

polyfractal Aug 1, 2018 • edited Loading

Choose a reason for hiding this comment

polyfractal left a comment

Choose a reason for hiding this comment

jimczi left a comment

Choose a reason for hiding this comment

tlrx commented Aug 3, 2018

$@polyfractal$ polyfractal Aug 1, 2018

$@polyfractal$ polyfractal Aug 1, 2018

$@polyfractal$ polyfractal Aug 2, 2018

$@polyfractal$ polyfractal Aug 1, 2018 •

edited

Loading

$@polyfractal$ polyfractal left a comment