You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/03/06 19:52:53 UTC
[GitHub] [nifi] bbende opened a new pull request #4120: NIFI-7221 Support
v2/v3 protocols with HWX Schema Registry
bbende opened a new pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
_Enables X functionality; fixes bug NIFI-YYYY._
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with **NIFI-XXXX** where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `master`)?
- [ ] Is your initial contribution a single, squashed commit? _Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not `squash` or use `--force` when pushing to allow for clean monitoring of changes._
### For code changes:
- [ ] Have you ensured that the full suite of tests is executed via `mvn -Pcontrib-check clean install` at the root `nifi` folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] Have you verified that the full build is successful on both JDK 8 and JDK 11?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the `LICENSE` file, including the main `LICENSE` file under `nifi-assembly`?
- [ ] If applicable, have you updated the `NOTICE` file, including the main `NOTICE` file found under `nifi-assembly`?
- [ ] If adding new Properties, have you added `.displayName` in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] markap14 commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
markap14 commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r395198033
##########
File path: nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/StandardSchemaIdentifier.java
##########
@@ -25,15 +25,18 @@
private final Optional<String> name;
private final OptionalLong identifier;
private final OptionalInt version;
+ private final OptionalLong schemaVersionId;
private final Optional<String> branch;
- StandardSchemaIdentifier(final String name, final Long identifier, final Integer version, final String branch) {
+ StandardSchemaIdentifier(final String name, final Long identifier, final Integer version,
+ final Long schemaVersionId, final String branch) {
this.name = Optional.ofNullable(name);
- this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);;
- this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);;
+ this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);
+ this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);
+ this.schemaVersionId = schemaVersionId == null ? OptionalLong.empty() : OptionalLong.of(schemaVersionId);
this.branch = Optional.ofNullable(branch);
- if (this.name == null && this.identifier == null) {
+ if ((this.name == null && this.identifier == null) || this.schemaVersionId == null) {
Review comment:
This logic seems to be off a bit. It indicates that `this.schemaVersionId` cannot be null. And either `this.name` or `this.identifier` cannot be null. But none of them can be null because they are set to Optional objects above...
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
bbende commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r395212660
##########
File path: nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/StandardSchemaIdentifier.java
##########
@@ -25,15 +25,18 @@
private final Optional<String> name;
private final OptionalLong identifier;
private final OptionalInt version;
+ private final OptionalLong schemaVersionId;
private final Optional<String> branch;
- StandardSchemaIdentifier(final String name, final Long identifier, final Integer version, final String branch) {
+ StandardSchemaIdentifier(final String name, final Long identifier, final Integer version,
+ final Long schemaVersionId, final String branch) {
this.name = Optional.ofNullable(name);
- this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);;
- this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);;
+ this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);
+ this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);
+ this.schemaVersionId = schemaVersionId == null ? OptionalLong.empty() : OptionalLong.of(schemaVersionId);
this.branch = Optional.ofNullable(branch);
- if (this.name == null && this.identifier == null) {
+ if ((this.name == null && this.identifier == null) || this.schemaVersionId == null) {
Review comment:
Since we have a constant for an EMPTY schema:
`SchemaIdentifier EMPTY = new StandardSchemaIdentifier(null, null, null, null, null);`
I think it makes more sense to get rid of this check all together since it wasn't actually doing anything before.
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] markap14 commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
markap14 commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r395321816
##########
File path: nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksEncodedSchemaReferenceWriter.java
##########
@@ -24,31 +24,60 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Collections;
-import java.util.EnumSet;
import java.util.Map;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
import java.util.Set;
public class HortonworksEncodedSchemaReferenceWriter implements SchemaAccessWriter {
- private static final Set<SchemaField> requiredSchemaFields = EnumSet.of(SchemaField.SCHEMA_IDENTIFIER, SchemaField.SCHEMA_VERSION);
- private static final int LATEST_PROTOCOL_VERSION = 1;
+
+ private final Integer protocolVersion;
+
+ public HortonworksEncodedSchemaReferenceWriter(final Integer protocolVersion) {
Review comment:
If the `protocolVersion` cannot be null, should this just be an `int`?
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on issue #4120: NIFI-7221 Support v2/v3
protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
bbende commented on issue #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#issuecomment-601725264
I addressed Mark's last comments and rebased against master. After the ci builds go through I'll merge, assuming no issues.
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] asfgit closed pull request #4120: NIFI-7221 Support v2/v3
protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] pvillard31 commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
pvillard31 commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r389266710
##########
File path: nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/serialization/SchemaRegistryRecordSetWriter.java
##########
@@ -134,10 +153,19 @@ protected PropertyDescriptor getSchemaWriteStrategyDescriptor() {
public void storeSchemaWriteStrategy(final ConfigurationContext context) {
this.configurationContext = context;
+ // If Schema Protocol Version is specified is specified without EL then we can create it up front, otherwise when
Review comment:
```suggestion
// If Schema Protocol Version is specified without EL then we can create it up front, otherwise when
```
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] bbende commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
bbende commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r395212787
##########
File path: nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/StandardSchemaIdentifier.java
##########
@@ -25,15 +25,18 @@
private final Optional<String> name;
private final OptionalLong identifier;
private final OptionalInt version;
+ private final OptionalLong schemaVersionId;
private final Optional<String> branch;
- StandardSchemaIdentifier(final String name, final Long identifier, final Integer version, final String branch) {
+ StandardSchemaIdentifier(final String name, final Long identifier, final Integer version,
+ final Long schemaVersionId, final String branch) {
this.name = Optional.ofNullable(name);
- this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);;
- this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);;
+ this.identifier = identifier == null ? OptionalLong.empty() : OptionalLong.of(identifier);
+ this.version = version == null ? OptionalInt.empty() : OptionalInt.of(version);
+ this.schemaVersionId = schemaVersionId == null ? OptionalLong.empty() : OptionalLong.of(schemaVersionId);
this.branch = Optional.ofNullable(branch);
- if (this.name == null && this.identifier == null) {
+ if ((this.name == null && this.identifier == null) || this.schemaVersionId == null) {
Review comment:
Pushed a new commit
----------------------------------------------------------------
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
With regards,
Apache Git Services
[GitHub] [nifi] markap14 commented on a change in pull request #4120:
NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
Posted by GitBox <gi...@apache.org>.
markap14 commented on a change in pull request #4120: NIFI-7221 Support v2/v3 protocols with HWX Schema Registry
URL: https://github.com/apache/nifi/pull/4120#discussion_r395321123
##########
File path: nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/schema/access/HortonworksAttributeSchemaReferenceWriter.java
##########
@@ -22,16 +22,29 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
public class HortonworksAttributeSchemaReferenceWriter implements SchemaAccessWriter {
- private static final Set<SchemaField> requiredSchemaFields = EnumSet.of(SchemaField.SCHEMA_IDENTIFIER, SchemaField.SCHEMA_VERSION);
- static final int LATEST_PROTOCOL_VERSION = 1;
+
static final String SCHEMA_BRANCH_ATTRIBUTE = "schema.branch";
+ private final Integer protocolVersion;
+
+ public HortonworksAttributeSchemaReferenceWriter(final Integer protocolVersion) {
Review comment:
If `protocolVersion` cannot be null, is there a reason to make it an `Integer` instead of an `int`?
----------------------------------------------------------------
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
With regards,
Apache Git Services