add DataSchema.Builder to tidy stuff up a bit#17065
Merged
gianm merged 7 commits intoapache:masterfrom Sep 15, 2024
Merged
Conversation
github-actions
Bot
added
Area - Batch Ingestion
Area - Streaming Ingestion
Kubernetes
Area - Ingestion
Area - MSQ
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+329
to
+337
| new StringInputRowParser( | ||
| new JSONParseSpec( | ||
| new TimestampSpec(null, null, null), | ||
| DimensionsSpec.EMPTY, | ||
| null, | ||
| null, | ||
| null | ||
| ) | ||
| ), |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation
Comment on lines
+112
to
+128
| new StringInputRowParser( | ||
| new JSONParseSpec( | ||
| new TimestampSpec("timestamp", "iso", null), | ||
| new DimensionsSpec( | ||
| Arrays.asList( | ||
| new StringDimensionSchema("dim1"), | ||
| new StringDimensionSchema("dim1t"), | ||
| new StringDimensionSchema("dim2"), | ||
| new LongDimensionSchema("dimLong"), | ||
| new FloatDimensionSchema("dimFloat") | ||
| ) | ||
| ), | ||
| new JSONPathSpec(true, ImmutableList.of()), | ||
| ImmutableMap.of(), | ||
| false | ||
| ) | ||
| ), |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation
Comment on lines
+444
to
+456
| DataSchema schema = DataSchema.builder() | ||
| .withDataSource(IdUtilsTest.VALID_ID_CHARS) | ||
| .withParserMap(parser) | ||
| .withAggregators( | ||
| new DoubleSumAggregatorFactory("metric1", "col1"), | ||
| new DoubleSumAggregatorFactory("metric2", "col2"), | ||
| new DoubleSumAggregatorFactory("metric1", "col3"), | ||
| new DoubleSumAggregatorFactory("metric3", "col4"), | ||
| new DoubleSumAggregatorFactory("metric3", "col5") | ||
| ) | ||
| .withGranularity(ARBITRARY_GRANULARITY) | ||
| .withObjectMapper(jsonMapper) | ||
| .build(); |
Check notice
Code scanning / CodeQL
Unread local variable
gianm
approved these changes
Sep 15, 2024
Contributor
gianm
left a comment
gianm
left a comment
There was a problem hiding this comment.
LGTM, left some thoughts that came to mind.
| .withDimensions(dimensionsAndAggregators.lhs) | ||
| .withAggregators(dimensionsAndAggregators.rhs.toArray(new AggregatorFactory[0])) | ||
| .withGranularity(makeGranularitySpecForIngestion(querySpec.getQuery(), querySpec.getColumnMappings(), isRollupQuery, jsonMapper)) | ||
| .withTransform(new TransformSpec(null, Collections.emptyList())) |
Contributor
There was a problem hiding this comment.
Could leave this line out, if the default is a no-op TransformSpec.
| return this; | ||
| } | ||
|
|
||
| public Builder withParserMap(Map<String, Object> parserMap) |
Contributor
There was a problem hiding this comment.
Include @Deprecated to match the annotation in the constructor?
| return this; | ||
| } | ||
|
|
||
| public Builder withObjectMapper(ObjectMapper objectMapper) |
Contributor
There was a problem hiding this comment.
Include @Deprecated, since this is only used with the parserMap, which is itself deprecated?
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
gianm
approved these changes
Sep 15, 2024
pranavbhole
pushed a commit
to pranavbhole/druid
that referenced
this pull request
Sep 17, 2024
* add DataSchema.Builder to tidy stuff up a bit * fixes * fixes * more style fixes * review stuff
clintropolis
added a commit
to clintropolis/druid
that referenced
this pull request
Oct 5, 2024
* add DataSchema.Builder to tidy stuff up a bit * fixes * fixes * more style fixes * review stuff
Merged
abhishekagarwal87
pushed a commit
that referenced
this pull request
Oct 5, 2024
* abstract `IncrementalIndex` cursor stuff to prepare for using different "views" of the data based on the cursor build spec (#17064) * abstract `IncrementalIndex` cursor stuff to prepare to allow for possibility of using different "views" of the data based on the cursor build spec changes: * introduce `IncrementalIndexRowSelector` interface to capture how `IncrementalIndexCursor` and `IncrementalIndexColumnSelectorFactory` read data * `IncrementalIndex` implements `IncrementalIndexRowSelector` * move `FactsHolder` interface to separate file * other minor refactorings * add DataSchema.Builder to tidy stuff up a bit (#17065) * add DataSchema.Builder to tidy stuff up a bit * fixes * fixes * more style fixes * review stuff * Projections prototype (#17214)
Contributor
|
This has already been backported in #17257 , so added it to the milestone. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
changes:
DataSchemanow only has a single constructor (the JSON creator)DataSchema.builder()to simplify things a bit, as well as insulate against changes to the JSON schema