diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml index d2b3a8c72a97..9955da36dd3e 100644 --- a/pinot-common/pom.xml +++ b/pinot-common/pom.xml @@ -69,6 +69,35 @@ org.xolstice.maven.plugins protobuf-maven-plugin + + com.diffplug.spotless + spotless-maven-plugin + 2.9.0 + + + verify + + check + + + + + + + src/main/java/**/*.java + src/test/java/**/*.java + + + src/main/java/org/apache/pinot/common/request/*.java + src/main/java/org/apache/pinot/common/response/ProcessingException.java + + + ,\# + + + + + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java b/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java index 10d2bad84bbc..1d1b64eec560 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/AggregationInfo.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Aggregation - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class AggregationInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AggregationInfo"); @@ -123,16 +123,16 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.AGGREGATION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("aggregationType", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.AGGREGATION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("aggregationType", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.AGGREGATION_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("aggregationParams", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.AGGREGATION_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("aggregationParams", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.IS_IN_SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("isInSelectList", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.IS_IN_SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("isInSelectList", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AggregationInfo.class, metaDataMap); @@ -327,6 +327,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setExpressions((java.util.List)value); } break; + } } @@ -344,6 +345,7 @@ public java.lang.Object getFieldValue(_Fields field) { case EXPRESSIONS: return getExpressions(); + } throw new java.lang.IllegalStateException(); } @@ -369,8 +371,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof AggregationInfo) return this.equals((AggregationInfo)that); return false; @@ -452,7 +452,7 @@ public int compareTo(AggregationInfo other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetAggregationType()).compareTo(other.isSetAggregationType()); + lastComparison = java.lang.Boolean.compare(isSetAggregationType(), other.isSetAggregationType()); if (lastComparison != 0) { return lastComparison; } @@ -462,7 +462,7 @@ public int compareTo(AggregationInfo other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetAggregationParams()).compareTo(other.isSetAggregationParams()); + lastComparison = java.lang.Boolean.compare(isSetAggregationParams(), other.isSetAggregationParams()); if (lastComparison != 0) { return lastComparison; } @@ -472,7 +472,7 @@ public int compareTo(AggregationInfo other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetIsInSelectList()).compareTo(other.isSetIsInSelectList()); + lastComparison = java.lang.Boolean.compare(isSetIsInSelectList(), other.isSetIsInSelectList()); if (lastComparison != 0) { return lastComparison; } @@ -482,7 +482,7 @@ public int compareTo(AggregationInfo other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetExpressions()).compareTo(other.isSetExpressions()); + lastComparison = java.lang.Boolean.compare(isSetExpressions(), other.isSetExpressions()); if (lastComparison != 0) { return lastComparison; } @@ -589,7 +589,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AggregationInfo str while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -597,7 +597,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AggregationInfo str if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.aggregationType = iprot.readString(); struct.setAggregationTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -617,7 +617,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AggregationInfo str iprot.readMapEnd(); } struct.setAggregationParamsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -625,7 +625,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AggregationInfo str if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isInSelectList = iprot.readBool(); struct.setIsInSelectListIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -643,7 +643,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AggregationInfo str iprot.readListEnd(); } struct.setExpressionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -704,6 +704,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AggregationInfo st oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class AggregationInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -768,7 +769,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, AggregationInfo stru } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map63 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TMap _map63 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); struct.aggregationParams = new java.util.HashMap(2*_map63.size); @org.apache.thrift.annotation.Nullable java.lang.String _key64; @org.apache.thrift.annotation.Nullable java.lang.String _val65; @@ -787,7 +788,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, AggregationInfo stru } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list67 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.expressions = new java.util.ArrayList(_list67.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem68; for (int _i69 = 0; _i69 < _list67.size; ++_i69) @@ -805,3 +806,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java index 3846dd49901e..acb98977499e 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/BrokerRequest.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Broker Query - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class BrokerRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BrokerRequest"); @@ -199,49 +199,49 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.QUERY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("queryType", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.QUERY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("queryType", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, QueryType.class))); - tmpMap.put(_Fields.QUERY_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("querySource", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.QUERY_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("querySource", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, QuerySource.class))); - tmpMap.put(_Fields.TIME_INTERVAL, new org.apache.thrift.meta_data.FieldMetaData("timeInterval", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.TIME_INTERVAL, new org.apache.thrift.meta_data.FieldMetaData("timeInterval", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.DURATION, new org.apache.thrift.meta_data.FieldMetaData("duration", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.DURATION, new org.apache.thrift.meta_data.FieldMetaData("duration", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FILTER_QUERY, new org.apache.thrift.meta_data.FieldMetaData("filterQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.FILTER_QUERY, new org.apache.thrift.meta_data.FieldMetaData("filterQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FilterQuery.class))); - tmpMap.put(_Fields.AGGREGATIONS_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationsInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.AGGREGATIONS_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationsInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AggregationInfo.class)))); - tmpMap.put(_Fields.GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("groupBy", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("groupBy", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GroupBy.class))); - tmpMap.put(_Fields.SELECTIONS, new org.apache.thrift.meta_data.FieldMetaData("selections", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.SELECTIONS, new org.apache.thrift.meta_data.FieldMetaData("selections", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Selection.class))); - tmpMap.put(_Fields.FILTER_SUB_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterSubQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.FILTER_SUB_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterSubQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FilterQueryMap.class))); - tmpMap.put(_Fields.BUCKET_HASH_KEY, new org.apache.thrift.meta_data.FieldMetaData("bucketHashKey", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.BUCKET_HASH_KEY, new org.apache.thrift.meta_data.FieldMetaData("bucketHashKey", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.RESPONSE_FORMAT, new org.apache.thrift.meta_data.FieldMetaData("responseFormat", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.RESPONSE_FORMAT, new org.apache.thrift.meta_data.FieldMetaData("responseFormat", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.HAVING_FILTER_QUERY, new org.apache.thrift.meta_data.FieldMetaData("havingFilterQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAVING_FILTER_QUERY, new org.apache.thrift.meta_data.FieldMetaData("havingFilterQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HavingFilterQuery.class))); - tmpMap.put(_Fields.HAVING_FILTER_SUB_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("havingFilterSubQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAVING_FILTER_SUB_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("havingFilterSubQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HavingFilterQueryMap.class))); - tmpMap.put(_Fields.PINOT_QUERY, new org.apache.thrift.meta_data.FieldMetaData("pinotQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.PINOT_QUERY, new org.apache.thrift.meta_data.FieldMetaData("pinotQuery", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.pinot.common.request.PinotQuery.class))); - tmpMap.put(_Fields.ORDER_BY, new org.apache.thrift.meta_data.FieldMetaData("orderBy", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.ORDER_BY, new org.apache.thrift.meta_data.FieldMetaData("orderBy", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SelectionSort.class)))); - tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BrokerRequest.class, metaDataMap); @@ -249,6 +249,7 @@ public java.lang.String getFieldName() { public BrokerRequest() { this.limit = 0; + } /** @@ -347,6 +348,7 @@ public void clear() { this.pinotQuery = null; this.orderBy = null; this.limit = 0; + } @org.apache.thrift.annotation.Nullable @@ -1008,6 +1010,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setLimit((java.lang.Integer)value); } break; + } } @@ -1070,6 +1073,7 @@ public java.lang.Object getFieldValue(_Fields field) { case LIMIT: return getLimit(); + } throw new java.lang.IllegalStateException(); } @@ -1125,8 +1129,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof BrokerRequest) return this.equals((BrokerRequest)that); return false; @@ -1403,7 +1405,7 @@ public int compareTo(BrokerRequest other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetQueryType()).compareTo(other.isSetQueryType()); + lastComparison = java.lang.Boolean.compare(isSetQueryType(), other.isSetQueryType()); if (lastComparison != 0) { return lastComparison; } @@ -1413,7 +1415,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetQuerySource()).compareTo(other.isSetQuerySource()); + lastComparison = java.lang.Boolean.compare(isSetQuerySource(), other.isSetQuerySource()); if (lastComparison != 0) { return lastComparison; } @@ -1423,7 +1425,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetTimeInterval()).compareTo(other.isSetTimeInterval()); + lastComparison = java.lang.Boolean.compare(isSetTimeInterval(), other.isSetTimeInterval()); if (lastComparison != 0) { return lastComparison; } @@ -1433,7 +1435,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetDuration()).compareTo(other.isSetDuration()); + lastComparison = java.lang.Boolean.compare(isSetDuration(), other.isSetDuration()); if (lastComparison != 0) { return lastComparison; } @@ -1443,7 +1445,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetFilterQuery()).compareTo(other.isSetFilterQuery()); + lastComparison = java.lang.Boolean.compare(isSetFilterQuery(), other.isSetFilterQuery()); if (lastComparison != 0) { return lastComparison; } @@ -1453,7 +1455,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetAggregationsInfo()).compareTo(other.isSetAggregationsInfo()); + lastComparison = java.lang.Boolean.compare(isSetAggregationsInfo(), other.isSetAggregationsInfo()); if (lastComparison != 0) { return lastComparison; } @@ -1463,7 +1465,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetGroupBy()).compareTo(other.isSetGroupBy()); + lastComparison = java.lang.Boolean.compare(isSetGroupBy(), other.isSetGroupBy()); if (lastComparison != 0) { return lastComparison; } @@ -1473,7 +1475,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSelections()).compareTo(other.isSetSelections()); + lastComparison = java.lang.Boolean.compare(isSetSelections(), other.isSetSelections()); if (lastComparison != 0) { return lastComparison; } @@ -1483,7 +1485,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetFilterSubQueryMap()).compareTo(other.isSetFilterSubQueryMap()); + lastComparison = java.lang.Boolean.compare(isSetFilterSubQueryMap(), other.isSetFilterSubQueryMap()); if (lastComparison != 0) { return lastComparison; } @@ -1493,7 +1495,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetBucketHashKey()).compareTo(other.isSetBucketHashKey()); + lastComparison = java.lang.Boolean.compare(isSetBucketHashKey(), other.isSetBucketHashKey()); if (lastComparison != 0) { return lastComparison; } @@ -1503,7 +1505,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetEnableTrace()).compareTo(other.isSetEnableTrace()); + lastComparison = java.lang.Boolean.compare(isSetEnableTrace(), other.isSetEnableTrace()); if (lastComparison != 0) { return lastComparison; } @@ -1513,7 +1515,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetResponseFormat()).compareTo(other.isSetResponseFormat()); + lastComparison = java.lang.Boolean.compare(isSetResponseFormat(), other.isSetResponseFormat()); if (lastComparison != 0) { return lastComparison; } @@ -1523,7 +1525,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetDebugOptions()).compareTo(other.isSetDebugOptions()); + lastComparison = java.lang.Boolean.compare(isSetDebugOptions(), other.isSetDebugOptions()); if (lastComparison != 0) { return lastComparison; } @@ -1533,7 +1535,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetQueryOptions()).compareTo(other.isSetQueryOptions()); + lastComparison = java.lang.Boolean.compare(isSetQueryOptions(), other.isSetQueryOptions()); if (lastComparison != 0) { return lastComparison; } @@ -1543,7 +1545,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHavingFilterQuery()).compareTo(other.isSetHavingFilterQuery()); + lastComparison = java.lang.Boolean.compare(isSetHavingFilterQuery(), other.isSetHavingFilterQuery()); if (lastComparison != 0) { return lastComparison; } @@ -1553,7 +1555,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHavingFilterSubQueryMap()).compareTo(other.isSetHavingFilterSubQueryMap()); + lastComparison = java.lang.Boolean.compare(isSetHavingFilterSubQueryMap(), other.isSetHavingFilterSubQueryMap()); if (lastComparison != 0) { return lastComparison; } @@ -1563,7 +1565,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetPinotQuery()).compareTo(other.isSetPinotQuery()); + lastComparison = java.lang.Boolean.compare(isSetPinotQuery(), other.isSetPinotQuery()); if (lastComparison != 0) { return lastComparison; } @@ -1573,7 +1575,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOrderBy()).compareTo(other.isSetOrderBy()); + lastComparison = java.lang.Boolean.compare(isSetOrderBy(), other.isSetOrderBy()); if (lastComparison != 0) { return lastComparison; } @@ -1583,7 +1585,7 @@ public int compareTo(BrokerRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit()); + lastComparison = java.lang.Boolean.compare(isSetLimit(), other.isSetLimit()); if (lastComparison != 0) { return lastComparison; } @@ -1863,7 +1865,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -1872,7 +1874,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.queryType = new QueryType(); struct.queryType.read(iprot); struct.setQueryTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1881,7 +1883,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.querySource = new QuerySource(); struct.querySource.read(iprot); struct.setQuerySourceIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1889,7 +1891,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.timeInterval = iprot.readString(); struct.setTimeIntervalIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1897,7 +1899,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.duration = iprot.readString(); struct.setDurationIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1906,7 +1908,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.filterQuery = new FilterQuery(); struct.filterQuery.read(iprot); struct.setFilterQueryIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1925,7 +1927,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc iprot.readListEnd(); } struct.setAggregationsInfoIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1934,7 +1936,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.groupBy = new GroupBy(); struct.groupBy.read(iprot); struct.setGroupByIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1943,7 +1945,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.selections = new Selection(); struct.selections.read(iprot); struct.setSelectionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1952,7 +1954,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.filterSubQueryMap = new FilterQueryMap(); struct.filterSubQueryMap.read(iprot); struct.setFilterSubQueryMapIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1960,7 +1962,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.bucketHashKey = iprot.readString(); struct.setBucketHashKeyIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1968,7 +1970,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.enableTrace = iprot.readBool(); struct.setEnableTraceIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1976,7 +1978,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.responseFormat = iprot.readString(); struct.setResponseFormatIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1996,7 +1998,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc iprot.readMapEnd(); } struct.setDebugOptionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2016,7 +2018,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc iprot.readMapEnd(); } struct.setQueryOptionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2025,7 +2027,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.havingFilterQuery = new HavingFilterQuery(); struct.havingFilterQuery.read(iprot); struct.setHavingFilterQueryIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2034,7 +2036,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.havingFilterSubQueryMap = new HavingFilterQueryMap(); struct.havingFilterSubQueryMap.read(iprot); struct.setHavingFilterSubQueryMapIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2043,7 +2045,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc struct.pinotQuery = new org.apache.pinot.common.request.PinotQuery(); struct.pinotQuery.read(iprot); struct.setPinotQueryIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2062,7 +2064,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc iprot.readListEnd(); } struct.setOrderByIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2070,7 +2072,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BrokerRequest struc if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.limit = iprot.readI32(); struct.setLimitIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -2249,6 +2251,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, BrokerRequest stru oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class BrokerRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -2435,7 +2438,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, BrokerRequest struct } if (incoming.get(5)) { { - org.apache.thrift.protocol.TList _list124 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list124 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.aggregationsInfo = new java.util.ArrayList(_list124.size); @org.apache.thrift.annotation.Nullable AggregationInfo _elem125; for (int _i126 = 0; _i126 < _list124.size; ++_i126) @@ -2476,7 +2479,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, BrokerRequest struct } if (incoming.get(12)) { { - org.apache.thrift.protocol.TMap _map127 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TMap _map127 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); struct.debugOptions = new java.util.HashMap(2*_map127.size); @org.apache.thrift.annotation.Nullable java.lang.String _key128; @org.apache.thrift.annotation.Nullable java.lang.String _val129; @@ -2491,7 +2494,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, BrokerRequest struct } if (incoming.get(13)) { { - org.apache.thrift.protocol.TMap _map131 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TMap _map131 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); struct.queryOptions = new java.util.HashMap(2*_map131.size); @org.apache.thrift.annotation.Nullable java.lang.String _key132; @org.apache.thrift.annotation.Nullable java.lang.String _val133; @@ -2521,7 +2524,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, BrokerRequest struct } if (incoming.get(17)) { { - org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list135 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.orderBy = new java.util.ArrayList(_list135.size); @org.apache.thrift.annotation.Nullable SelectionSort _elem136; for (int _i137 = 0; _i137 < _list135.size; ++_i137) @@ -2544,3 +2547,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java b/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java index 5a0ec7413fb8..9cc26e65aa8c 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/DataSource.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class DataSource implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataSource"); @@ -106,10 +106,10 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.SUBQUERY, new org.apache.thrift.meta_data.FieldMetaData("subquery", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "PinotQuery"))); + tmpMap.put(_Fields.SUBQUERY, new org.apache.thrift.meta_data.FieldMetaData("subquery", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "PinotQuery"))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataSource.class, metaDataMap); } @@ -204,6 +204,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setSubquery((PinotQuery)value); } break; + } } @@ -215,6 +216,7 @@ public java.lang.Object getFieldValue(_Fields field) { case SUBQUERY: return getSubquery(); + } throw new java.lang.IllegalStateException(); } @@ -236,8 +238,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof DataSource) return this.equals((DataSource)that); return false; @@ -293,7 +293,7 @@ public int compareTo(DataSource other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName()); + lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName()); if (lastComparison != 0) { return lastComparison; } @@ -303,7 +303,7 @@ public int compareTo(DataSource other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSubquery()).compareTo(other.isSetSubquery()); + lastComparison = java.lang.Boolean.compare(isSetSubquery(), other.isSetSubquery()); if (lastComparison != 0) { return lastComparison; } @@ -392,7 +392,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -400,7 +400,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct) if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.tableName = iprot.readString(); struct.setTableNameIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -409,7 +409,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DataSource struct) struct.subquery = new PinotQuery(); struct.subquery.read(iprot); struct.setSubqueryIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -443,6 +443,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DataSource struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class DataSourceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -492,3 +493,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java index ce6d4d618c5e..8b474293461d 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Expression.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class Expression implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Expression"); @@ -45,7 +45,7 @@ public class Expression implements org.apache.thrift.TBase metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ExpressionType.class))); - tmpMap.put(_Fields.FUNCTION_CALL, new org.apache.thrift.meta_data.FieldMetaData("functionCall", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Function"))); - tmpMap.put(_Fields.LITERAL, new org.apache.thrift.meta_data.FieldMetaData("literal", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Literal"))); - tmpMap.put(_Fields.IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("identifier", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Identifier"))); + tmpMap.put(_Fields.FUNCTION_CALL, new org.apache.thrift.meta_data.FieldMetaData("functionCall", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Function"))); + tmpMap.put(_Fields.LITERAL, new org.apache.thrift.meta_data.FieldMetaData("literal", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Literal"))); + tmpMap.put(_Fields.IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("identifier", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Identifier"))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Expression.class, metaDataMap); } @@ -173,7 +173,7 @@ public void clear() { } /** - * + * * @see ExpressionType */ @org.apache.thrift.annotation.Nullable @@ -182,7 +182,7 @@ public ExpressionType getType() { } /** - * + * * @see ExpressionType */ public void setType(@org.apache.thrift.annotation.Nullable ExpressionType type) { @@ -309,6 +309,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setIdentifier((Identifier)value); } break; + } } @@ -326,6 +327,7 @@ public java.lang.Object getFieldValue(_Fields field) { case IDENTIFIER: return getIdentifier(); + } throw new java.lang.IllegalStateException(); } @@ -351,8 +353,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof Expression) return this.equals((Expression)that); return false; @@ -434,7 +434,7 @@ public int compareTo(Expression other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType()); + lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType()); if (lastComparison != 0) { return lastComparison; } @@ -444,7 +444,7 @@ public int compareTo(Expression other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetFunctionCall()).compareTo(other.isSetFunctionCall()); + lastComparison = java.lang.Boolean.compare(isSetFunctionCall(), other.isSetFunctionCall()); if (lastComparison != 0) { return lastComparison; } @@ -454,7 +454,7 @@ public int compareTo(Expression other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetLiteral()).compareTo(other.isSetLiteral()); + lastComparison = java.lang.Boolean.compare(isSetLiteral(), other.isSetLiteral()); if (lastComparison != 0) { return lastComparison; } @@ -464,7 +464,7 @@ public int compareTo(Expression other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetIdentifier()).compareTo(other.isSetIdentifier()); + lastComparison = java.lang.Boolean.compare(isSetIdentifier(), other.isSetIdentifier()); if (lastComparison != 0) { return lastComparison; } @@ -575,7 +575,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -583,7 +583,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.type = org.apache.pinot.common.request.ExpressionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -592,7 +592,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) struct.functionCall = new Function(); struct.functionCall.read(iprot); struct.setFunctionCallIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -601,7 +601,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) struct.literal = new Literal(); struct.literal.read(iprot); struct.setLiteralIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -610,7 +610,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Expression struct) struct.identifier = new Identifier(); struct.identifier.read(iprot); struct.setIdentifierIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -656,6 +656,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Expression struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class ExpressionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -720,3 +721,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java b/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java index 7e625c5295ae..644ff4d4015e 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/ExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public enum ExpressionType implements org.apache.thrift.TEnum { LITERAL(0), IDENTIFIER(1), @@ -49,7 +49,7 @@ public int getValue() { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static ExpressionType findByValue(int value) { + public static ExpressionType findByValue(int value) { switch (value) { case 0: return LITERAL; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java index 0724368aa4f1..6759d259e802 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterOperator.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Filter Operator - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public enum FilterOperator implements org.apache.thrift.TEnum { AND(0), OR(1), @@ -63,7 +63,7 @@ public int getValue() { * @return null if the value is not found. */ @org.apache.thrift.annotation.Nullable - public static FilterOperator findByValue(int value) { + public static FilterOperator findByValue(int value) { switch (value) { case 0: return AND; diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java index 377f49b6a1e8..7aec3c901e60 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQuery.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Filter query - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class FilterQuery implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterQuery"); @@ -58,7 +58,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { COLUMN((short)2, "column"), VALUE((short)3, "value"), /** - * + * * @see FilterOperator */ OPERATOR((short)4, "operator"), @@ -135,17 +135,17 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FilterOperator.class))); - tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FilterQuery.class, metaDataMap); @@ -295,7 +295,7 @@ public void setValueIsSet(boolean value) { } /** - * + * * @see FilterOperator */ @org.apache.thrift.annotation.Nullable @@ -304,7 +304,7 @@ public FilterOperator getOperator() { } /** - * + * * @see FilterOperator */ public void setOperator(@org.apache.thrift.annotation.Nullable FilterOperator operator) { @@ -407,6 +407,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setNestedFilterQueryIds((java.util.List)value); } break; + } } @@ -427,6 +428,7 @@ public java.lang.Object getFieldValue(_Fields field) { case NESTED_FILTER_QUERY_IDS: return getNestedFilterQueryIds(); + } throw new java.lang.IllegalStateException(); } @@ -454,8 +456,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof FilterQuery) return this.equals((FilterQuery)that); return false; @@ -548,7 +548,7 @@ public int compareTo(FilterQuery other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + lastComparison = java.lang.Boolean.compare(isSetId(), other.isSetId()); if (lastComparison != 0) { return lastComparison; } @@ -558,7 +558,7 @@ public int compareTo(FilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn()); + lastComparison = java.lang.Boolean.compare(isSetColumn(), other.isSetColumn()); if (lastComparison != 0) { return lastComparison; } @@ -568,7 +568,7 @@ public int compareTo(FilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue()); + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); if (lastComparison != 0) { return lastComparison; } @@ -578,7 +578,7 @@ public int compareTo(FilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOperator()).compareTo(other.isSetOperator()); + lastComparison = java.lang.Boolean.compare(isSetOperator(), other.isSetOperator()); if (lastComparison != 0) { return lastComparison; } @@ -588,7 +588,7 @@ public int compareTo(FilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetNestedFilterQueryIds()).compareTo(other.isSetNestedFilterQueryIds()); + lastComparison = java.lang.Boolean.compare(isSetNestedFilterQueryIds(), other.isSetNestedFilterQueryIds()); if (lastComparison != 0) { return lastComparison; } @@ -703,7 +703,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -711,7 +711,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.id = iprot.readI32(); struct.setIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -719,7 +719,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.column = iprot.readString(); struct.setColumnIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -737,7 +737,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) iprot.readListEnd(); } struct.setValueIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -745,7 +745,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32()); struct.setOperatorIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -763,7 +763,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQuery struct) iprot.readListEnd(); } struct.setNestedFilterQueryIdsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -824,6 +824,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FilterQuery struct oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class FilterQueryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -890,7 +891,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, FilterQuery struct) } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list10 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.value = new java.util.ArrayList(_list10.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem11; for (int _i12 = 0; _i12 < _list10.size; ++_i12) @@ -907,7 +908,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, FilterQuery struct) } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32); struct.nestedFilterQueryIds = new java.util.ArrayList(_list13.size); int _elem14; for (int _i15 = 0; _i15 < _list13.size; ++_i15) @@ -925,3 +926,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java index e3bc137738f5..f7651fb3065b 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/FilterQueryMap.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Filter Query is nested but thrift stable version does not support yet (The support is there in top of the trunk but no released jars. Two concerns : stability and onus of maintaining a stable point. Also, its pretty difficult to compile thrift in Linkedin software development environment which is not geared towards c++ dev. Hence, the ) - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class FilterQueryMap implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterQueryMap"); @@ -106,9 +106,9 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32), + tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32), new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FilterQuery.class)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FilterQueryMap.class, metaDataMap); @@ -191,6 +191,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setFilterQueryMap((java.util.Map)value); } break; + } } @@ -199,6 +200,7 @@ public java.lang.Object getFieldValue(_Fields field) { switch (field) { case FILTER_QUERY_MAP: return getFilterQueryMap(); + } throw new java.lang.IllegalStateException(); } @@ -218,8 +220,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof FilterQueryMap) return this.equals((FilterQueryMap)that); return false; @@ -262,7 +262,7 @@ public int compareTo(FilterQueryMap other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetFilterQueryMap()).compareTo(other.isSetFilterQueryMap()); + lastComparison = java.lang.Boolean.compare(isSetFilterQueryMap(), other.isSetFilterQueryMap()); if (lastComparison != 0) { return lastComparison; } @@ -341,7 +341,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQueryMap stru while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -362,7 +362,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, FilterQueryMap stru iprot.readMapEnd(); } struct.setFilterQueryMapIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -397,6 +397,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, FilterQueryMap str oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class FilterQueryMapTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -433,7 +434,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, FilterQueryMap struc java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TMap _map22 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT); struct.filterQueryMap = new java.util.HashMap(2*_map22.size); int _key23; @org.apache.thrift.annotation.Nullable FilterQuery _val24; @@ -454,3 +455,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java index b438ec4bab07..d60a625ae4e1 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Function.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class Function implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Function"); @@ -106,10 +106,10 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.OPERANDS, new org.apache.thrift.meta_data.FieldMetaData("operands", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.OPERANDS, new org.apache.thrift.meta_data.FieldMetaData("operands", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Expression.class)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Function.class, metaDataMap); @@ -232,6 +232,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setOperands((java.util.List)value); } break; + } } @@ -243,6 +244,7 @@ public java.lang.Object getFieldValue(_Fields field) { case OPERANDS: return getOperands(); + } throw new java.lang.IllegalStateException(); } @@ -264,8 +266,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof Function) return this.equals((Function)that); return false; @@ -321,7 +321,7 @@ public int compareTo(Function other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetOperator()).compareTo(other.isSetOperator()); + lastComparison = java.lang.Boolean.compare(isSetOperator(), other.isSetOperator()); if (lastComparison != 0) { return lastComparison; } @@ -331,7 +331,7 @@ public int compareTo(Function other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOperands()).compareTo(other.isSetOperands()); + lastComparison = java.lang.Boolean.compare(isSetOperands(), other.isSetOperands()); if (lastComparison != 0) { return lastComparison; } @@ -422,7 +422,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -430,7 +430,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.operator = iprot.readString(); struct.setOperatorIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -449,7 +449,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Function struct) th iprot.readListEnd(); } struct.setOperandsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -488,6 +488,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Function struct) t oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class FunctionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -526,7 +527,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Function struct) thr java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list59 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list59 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.operands = new java.util.ArrayList(_list59.size); @org.apache.thrift.annotation.Nullable Expression _elem60; for (int _i61 = 0; _i61 < _list59.size; ++_i61) @@ -545,3 +546,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java b/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java index 320aa3ea3ea6..518548ac4a3b 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/GroupBy.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * GroupBy - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class GroupBy implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GroupBy"); @@ -118,13 +118,13 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.TOP_N, new org.apache.thrift.meta_data.FieldMetaData("topN", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.TOP_N, new org.apache.thrift.meta_data.FieldMetaData("topN", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.EXPRESSIONS, new org.apache.thrift.meta_data.FieldMetaData("expressions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GroupBy.class, metaDataMap); @@ -288,6 +288,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setExpressions((java.util.List)value); } break; + } } @@ -302,6 +303,7 @@ public java.lang.Object getFieldValue(_Fields field) { case EXPRESSIONS: return getExpressions(); + } throw new java.lang.IllegalStateException(); } @@ -325,8 +327,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof GroupBy) return this.equals((GroupBy)that); return false; @@ -395,7 +395,7 @@ public int compareTo(GroupBy other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); + lastComparison = java.lang.Boolean.compare(isSetColumns(), other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } @@ -405,7 +405,7 @@ public int compareTo(GroupBy other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetTopN()).compareTo(other.isSetTopN()); + lastComparison = java.lang.Boolean.compare(isSetTopN(), other.isSetTopN()); if (lastComparison != 0) { return lastComparison; } @@ -415,7 +415,7 @@ public int compareTo(GroupBy other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetExpressions()).compareTo(other.isSetExpressions()); + lastComparison = java.lang.Boolean.compare(isSetExpressions(), other.isSetExpressions()); if (lastComparison != 0) { return lastComparison; } @@ -512,7 +512,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, GroupBy struct) thr while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -530,7 +530,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, GroupBy struct) thr iprot.readListEnd(); } struct.setColumnsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -538,7 +538,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, GroupBy struct) thr if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.topN = iprot.readI64(); struct.setTopNIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -556,7 +556,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, GroupBy struct) thr iprot.readListEnd(); } struct.setExpressionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -609,6 +609,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, GroupBy struct) th oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class GroupByTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -662,7 +663,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, GroupBy struct) thro java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list80 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list80 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.columns = new java.util.ArrayList(_list80.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem81; for (int _i82 = 0; _i82 < _list80.size; ++_i82) @@ -679,7 +680,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, GroupBy struct) thro } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list83 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.expressions = new java.util.ArrayList(_list83.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem84; for (int _i85 = 0; _i85 < _list83.size; ++_i85) @@ -697,3 +698,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java index 526f59e476d0..acf485c3633d 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQuery.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Having Filter query - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class HavingFilterQuery implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HavingFilterQuery"); @@ -58,7 +58,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AGGREGATION_INFO((short)2, "aggregationInfo"), VALUE((short)3, "value"), /** - * + * * @see FilterOperator */ OPERATOR((short)4, "operator"), @@ -135,17 +135,17 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.AGGREGATION_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "AggregationInfo"))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.AGGREGATION_INFO, new org.apache.thrift.meta_data.FieldMetaData("aggregationInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "AggregationInfo"))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.OPERATOR, new org.apache.thrift.meta_data.FieldMetaData("operator", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FilterOperator.class))); - tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.NESTED_FILTER_QUERY_IDS, new org.apache.thrift.meta_data.FieldMetaData("nestedFilterQueryIds", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HavingFilterQuery.class, metaDataMap); @@ -295,7 +295,7 @@ public void setValueIsSet(boolean value) { } /** - * + * * @see FilterOperator */ @org.apache.thrift.annotation.Nullable @@ -304,7 +304,7 @@ public FilterOperator getOperator() { } /** - * + * * @see FilterOperator */ public void setOperator(@org.apache.thrift.annotation.Nullable FilterOperator operator) { @@ -407,6 +407,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setNestedFilterQueryIds((java.util.List)value); } break; + } } @@ -427,6 +428,7 @@ public java.lang.Object getFieldValue(_Fields field) { case NESTED_FILTER_QUERY_IDS: return getNestedFilterQueryIds(); + } throw new java.lang.IllegalStateException(); } @@ -454,8 +456,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof HavingFilterQuery) return this.equals((HavingFilterQuery)that); return false; @@ -548,7 +548,7 @@ public int compareTo(HavingFilterQuery other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + lastComparison = java.lang.Boolean.compare(isSetId(), other.isSetId()); if (lastComparison != 0) { return lastComparison; } @@ -558,7 +558,7 @@ public int compareTo(HavingFilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetAggregationInfo()).compareTo(other.isSetAggregationInfo()); + lastComparison = java.lang.Boolean.compare(isSetAggregationInfo(), other.isSetAggregationInfo()); if (lastComparison != 0) { return lastComparison; } @@ -568,7 +568,7 @@ public int compareTo(HavingFilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue()); + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); if (lastComparison != 0) { return lastComparison; } @@ -578,7 +578,7 @@ public int compareTo(HavingFilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOperator()).compareTo(other.isSetOperator()); + lastComparison = java.lang.Boolean.compare(isSetOperator(), other.isSetOperator()); if (lastComparison != 0) { return lastComparison; } @@ -588,7 +588,7 @@ public int compareTo(HavingFilterQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetNestedFilterQueryIds()).compareTo(other.isSetNestedFilterQueryIds()); + lastComparison = java.lang.Boolean.compare(isSetNestedFilterQueryIds(), other.isSetNestedFilterQueryIds()); if (lastComparison != 0) { return lastComparison; } @@ -703,7 +703,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -711,7 +711,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.id = iprot.readI32(); struct.setIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -720,7 +720,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s struct.aggregationInfo = new AggregationInfo(); struct.aggregationInfo.read(iprot); struct.setAggregationInfoIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -738,7 +738,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s iprot.readListEnd(); } struct.setValueIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -746,7 +746,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.operator = org.apache.pinot.common.request.FilterOperator.findByValue(iprot.readI32()); struct.setOperatorIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -764,7 +764,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQuery s iprot.readListEnd(); } struct.setNestedFilterQueryIdsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -825,6 +825,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HavingFilterQuery oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class HavingFilterQueryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -892,7 +893,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, HavingFilterQuery st } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list36 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.value = new java.util.ArrayList(_list36.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem37; for (int _i38 = 0; _i38 < _list36.size; ++_i38) @@ -909,7 +910,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, HavingFilterQuery st } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + org.apache.thrift.protocol.TList _list39 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32); struct.nestedFilterQueryIds = new java.util.ArrayList(_list39.size); int _elem40; for (int _i41 = 0; _i41 < _list39.size; ++_i41) @@ -927,3 +928,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java index cdf95fcc4bcf..077b03ce9b14 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/HavingFilterQueryMap.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class HavingFilterQueryMap implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HavingFilterQueryMap"); @@ -101,9 +101,9 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32), + tmpMap.put(_Fields.FILTER_QUERY_MAP, new org.apache.thrift.meta_data.FieldMetaData("filterQueryMap", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32), new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HavingFilterQuery.class)))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HavingFilterQueryMap.class, metaDataMap); @@ -186,6 +186,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setFilterQueryMap((java.util.Map)value); } break; + } } @@ -194,6 +195,7 @@ public java.lang.Object getFieldValue(_Fields field) { switch (field) { case FILTER_QUERY_MAP: return getFilterQueryMap(); + } throw new java.lang.IllegalStateException(); } @@ -213,8 +215,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof HavingFilterQueryMap) return this.equals((HavingFilterQueryMap)that); return false; @@ -257,7 +257,7 @@ public int compareTo(HavingFilterQueryMap other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetFilterQueryMap()).compareTo(other.isSetFilterQueryMap()); + lastComparison = java.lang.Boolean.compare(isSetFilterQueryMap(), other.isSetFilterQueryMap()); if (lastComparison != 0) { return lastComparison; } @@ -336,7 +336,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQueryMa while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -357,7 +357,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HavingFilterQueryMa iprot.readMapEnd(); } struct.setFilterQueryMapIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -392,6 +392,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HavingFilterQueryM oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class HavingFilterQueryMapTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -428,7 +429,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, HavingFilterQueryMap java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT); struct.filterQueryMap = new java.util.HashMap(2*_map48.size); int _key49; @org.apache.thrift.annotation.Nullable HavingFilterQuery _val50; @@ -449,3 +450,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java index d6b551e1a8d8..49f6fbb4e2f0 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Identifier.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class Identifier implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Identifier"); @@ -100,7 +100,7 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Identifier.class, metaDataMap); @@ -167,6 +167,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setName((java.lang.String)value); } break; + } } @@ -175,6 +176,7 @@ public java.lang.Object getFieldValue(_Fields field) { switch (field) { case NAME: return getName(); + } throw new java.lang.IllegalStateException(); } @@ -194,8 +196,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof Identifier) return this.equals((Identifier)that); return false; @@ -238,7 +238,7 @@ public int compareTo(Identifier other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName()); if (lastComparison != 0) { return lastComparison; } @@ -319,7 +319,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Identifier struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -327,7 +327,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Identifier struct) if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -352,6 +352,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Identifier struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class IdentifierTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -380,3 +381,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java b/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java index 3ad8dbf8f153..df057dd922e4 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/InstanceRequest.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Instance Request - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class InstanceRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InstanceRequest"); @@ -129,16 +129,16 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("requestId", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.REQUEST_ID, new org.apache.thrift.meta_data.FieldMetaData("requestId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BrokerRequest.class))); - tmpMap.put(_Fields.SEARCH_SEGMENTS, new org.apache.thrift.meta_data.FieldMetaData("searchSegments", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.SEARCH_SEGMENTS, new org.apache.thrift.meta_data.FieldMetaData("searchSegments", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.ENABLE_TRACE, new org.apache.thrift.meta_data.FieldMetaData("enableTrace", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.BROKER_ID, new org.apache.thrift.meta_data.FieldMetaData("brokerId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.BROKER_ID, new org.apache.thrift.meta_data.FieldMetaData("brokerId", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InstanceRequest.class, metaDataMap); @@ -364,6 +364,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setBrokerId((java.lang.String)value); } break; + } } @@ -384,6 +385,7 @@ public java.lang.Object getFieldValue(_Fields field) { case BROKER_ID: return getBrokerId(); + } throw new java.lang.IllegalStateException(); } @@ -411,8 +413,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof InstanceRequest) return this.equals((InstanceRequest)that); return false; @@ -505,7 +505,7 @@ public int compareTo(InstanceRequest other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetRequestId()).compareTo(other.isSetRequestId()); + lastComparison = java.lang.Boolean.compare(isSetRequestId(), other.isSetRequestId()); if (lastComparison != 0) { return lastComparison; } @@ -515,7 +515,7 @@ public int compareTo(InstanceRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetQuery()).compareTo(other.isSetQuery()); + lastComparison = java.lang.Boolean.compare(isSetQuery(), other.isSetQuery()); if (lastComparison != 0) { return lastComparison; } @@ -525,7 +525,7 @@ public int compareTo(InstanceRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSearchSegments()).compareTo(other.isSetSearchSegments()); + lastComparison = java.lang.Boolean.compare(isSetSearchSegments(), other.isSetSearchSegments()); if (lastComparison != 0) { return lastComparison; } @@ -535,7 +535,7 @@ public int compareTo(InstanceRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetEnableTrace()).compareTo(other.isSetEnableTrace()); + lastComparison = java.lang.Boolean.compare(isSetEnableTrace(), other.isSetEnableTrace()); if (lastComparison != 0) { return lastComparison; } @@ -545,7 +545,7 @@ public int compareTo(InstanceRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetBrokerId()).compareTo(other.isSetBrokerId()); + lastComparison = java.lang.Boolean.compare(isSetBrokerId(), other.isSetBrokerId()); if (lastComparison != 0) { return lastComparison; } @@ -665,7 +665,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -673,7 +673,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.requestId = iprot.readI64(); struct.setRequestIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -682,7 +682,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str struct.query = new BrokerRequest(); struct.query.read(iprot); struct.setQueryIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -700,7 +700,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str iprot.readListEnd(); } struct.setSearchSegmentsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -708,7 +708,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.enableTrace = iprot.readBool(); struct.setEnableTraceIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -716,7 +716,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InstanceRequest str if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.brokerId = iprot.readString(); struct.setBrokerIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -770,6 +770,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InstanceRequest st oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class InstanceRequestTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -824,7 +825,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, InstanceRequest stru java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list143 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.searchSegments = new java.util.ArrayList(_list143.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem144; for (int _i145 = 0; _i145 < _list143.size; ++_i145) @@ -850,3 +851,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java index 1456446268eb..eee7e788d536 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Literal.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class Literal extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Literal"); private static final org.apache.thrift.protocol.TField BOOL_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("boolValue", org.apache.thrift.protocol.TType.BOOL, (short)1); @@ -121,22 +121,22 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.BYTE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("byteValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))); - tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.SHORT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("shortValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16))); - tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.LONG_VALUE, new org.apache.thrift.meta_data.FieldMetaData("longValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.thrift.meta_data.FieldMetaData("doubleValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); - tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING, true))); + tmpMap.put(_Fields.BINARY_VALUE, new org.apache.thrift.meta_data.FieldMetaData("binaryValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Literal.class, metaDataMap); } @@ -597,9 +597,8 @@ public java.lang.String getStringValue() { } public void setStringValue(java.lang.String value) { - if (value == null) throw new java.lang.NullPointerException(); setField_ = _Fields.STRING_VALUE; - value_ = value; + value_ = java.util.Objects.requireNonNull(value,"_Fields.STRING_VALUE"); } public byte[] getBinaryValue() { @@ -621,9 +620,8 @@ public void setBinaryValue(byte[] value) { } public void setBinaryValue(java.nio.ByteBuffer value) { - if (value == null) throw new java.lang.NullPointerException(); setField_ = _Fields.BINARY_VALUE; - value_ = value; + value_ = java.util.Objects.requireNonNull(value,"_Fields.BINARY_VALUE"); } public boolean isSetBoolValue() { @@ -720,4 +718,6 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException throw new java.io.IOException(te); } } + + } diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java b/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java index 5a7461781c2d..6902a3603677 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/PinotQuery.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,7 +25,7 @@ package org.apache.pinot.common.request; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class PinotQuery implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PinotQuery"); @@ -166,41 +166,41 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.DATA_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("dataSource", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.DATA_SOURCE, new org.apache.thrift.meta_data.FieldMetaData("dataSource", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataSource.class))); - tmpMap.put(_Fields.SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("selectList", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression")))); - tmpMap.put(_Fields.FILTER_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("filterExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression"))); - tmpMap.put(_Fields.GROUP_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression")))); - tmpMap.put(_Fields.ORDER_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("orderByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression")))); - tmpMap.put(_Fields.HAVING_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("havingExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression"))); - tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.SELECT_LIST, new org.apache.thrift.meta_data.FieldMetaData("selectList", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression")))); + tmpMap.put(_Fields.FILTER_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("filterExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression"))); + tmpMap.put(_Fields.GROUP_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression")))); + tmpMap.put(_Fields.ORDER_BY_LIST, new org.apache.thrift.meta_data.FieldMetaData("orderByList", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression")))); + tmpMap.put(_Fields.HAVING_EXPRESSION, new org.apache.thrift.meta_data.FieldMetaData("havingExpression", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression"))); + tmpMap.put(_Fields.LIMIT, new org.apache.thrift.meta_data.FieldMetaData("limit", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.DEBUG_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("debugOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.QUERY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("queryOptions", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.EXPLAIN, new org.apache.thrift.meta_data.FieldMetaData("explain", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.EXPLAIN, new org.apache.thrift.meta_data.FieldMetaData("explain", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.EXPRESSION_OVERRIDE_HINTS, new org.apache.thrift.meta_data.FieldMetaData("expressionOverrideHints", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression"), - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT, "Expression")))); + tmpMap.put(_Fields.EXPRESSION_OVERRIDE_HINTS, new org.apache.thrift.meta_data.FieldMetaData("expressionOverrideHints", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression"), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "Expression")))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PinotQuery.class, metaDataMap); } @@ -209,6 +209,7 @@ public PinotQuery() { this.limit = 10; this.offset = 0; + } /** @@ -790,6 +791,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setExpressionOverrideHints((java.util.Map)value); } break; + } } @@ -834,6 +836,7 @@ public java.lang.Object getFieldValue(_Fields field) { case EXPRESSION_OVERRIDE_HINTS: return getExpressionOverrideHints(); + } throw new java.lang.IllegalStateException(); } @@ -877,8 +880,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof PinotQuery) return this.equals((PinotQuery)that); return false; @@ -1077,7 +1078,7 @@ public int compareTo(PinotQuery other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + lastComparison = java.lang.Boolean.compare(isSetVersion(), other.isSetVersion()); if (lastComparison != 0) { return lastComparison; } @@ -1087,7 +1088,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetDataSource()).compareTo(other.isSetDataSource()); + lastComparison = java.lang.Boolean.compare(isSetDataSource(), other.isSetDataSource()); if (lastComparison != 0) { return lastComparison; } @@ -1097,7 +1098,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSelectList()).compareTo(other.isSetSelectList()); + lastComparison = java.lang.Boolean.compare(isSetSelectList(), other.isSetSelectList()); if (lastComparison != 0) { return lastComparison; } @@ -1107,7 +1108,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetFilterExpression()).compareTo(other.isSetFilterExpression()); + lastComparison = java.lang.Boolean.compare(isSetFilterExpression(), other.isSetFilterExpression()); if (lastComparison != 0) { return lastComparison; } @@ -1117,7 +1118,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetGroupByList()).compareTo(other.isSetGroupByList()); + lastComparison = java.lang.Boolean.compare(isSetGroupByList(), other.isSetGroupByList()); if (lastComparison != 0) { return lastComparison; } @@ -1127,7 +1128,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOrderByList()).compareTo(other.isSetOrderByList()); + lastComparison = java.lang.Boolean.compare(isSetOrderByList(), other.isSetOrderByList()); if (lastComparison != 0) { return lastComparison; } @@ -1137,7 +1138,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHavingExpression()).compareTo(other.isSetHavingExpression()); + lastComparison = java.lang.Boolean.compare(isSetHavingExpression(), other.isSetHavingExpression()); if (lastComparison != 0) { return lastComparison; } @@ -1147,7 +1148,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetLimit()).compareTo(other.isSetLimit()); + lastComparison = java.lang.Boolean.compare(isSetLimit(), other.isSetLimit()); if (lastComparison != 0) { return lastComparison; } @@ -1157,7 +1158,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOffset()).compareTo(other.isSetOffset()); + lastComparison = java.lang.Boolean.compare(isSetOffset(), other.isSetOffset()); if (lastComparison != 0) { return lastComparison; } @@ -1167,7 +1168,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetDebugOptions()).compareTo(other.isSetDebugOptions()); + lastComparison = java.lang.Boolean.compare(isSetDebugOptions(), other.isSetDebugOptions()); if (lastComparison != 0) { return lastComparison; } @@ -1177,7 +1178,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetQueryOptions()).compareTo(other.isSetQueryOptions()); + lastComparison = java.lang.Boolean.compare(isSetQueryOptions(), other.isSetQueryOptions()); if (lastComparison != 0) { return lastComparison; } @@ -1187,7 +1188,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetExplain()).compareTo(other.isSetExplain()); + lastComparison = java.lang.Boolean.compare(isSetExplain(), other.isSetExplain()); if (lastComparison != 0) { return lastComparison; } @@ -1197,7 +1198,7 @@ public int compareTo(PinotQuery other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetExpressionOverrideHints()).compareTo(other.isSetExpressionOverrideHints()); + lastComparison = java.lang.Boolean.compare(isSetExpressionOverrideHints(), other.isSetExpressionOverrideHints()); if (lastComparison != 0) { return lastComparison; } @@ -1385,7 +1386,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -1393,7 +1394,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.version = iprot.readI32(); struct.setVersionIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1402,7 +1403,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) struct.dataSource = new DataSource(); struct.dataSource.read(iprot); struct.setDataSourceIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1421,7 +1422,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readListEnd(); } struct.setSelectListIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1430,7 +1431,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) struct.filterExpression = new Expression(); struct.filterExpression.read(iprot); struct.setFilterExpressionIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1449,7 +1450,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readListEnd(); } struct.setGroupByListIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1468,7 +1469,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readListEnd(); } struct.setOrderByListIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1477,7 +1478,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) struct.havingExpression = new Expression(); struct.havingExpression.read(iprot); struct.setHavingExpressionIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1485,7 +1486,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.limit = iprot.readI32(); struct.setLimitIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1493,7 +1494,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.offset = iprot.readI32(); struct.setOffsetIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1513,7 +1514,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readMapEnd(); } struct.setDebugOptionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1533,7 +1534,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readMapEnd(); } struct.setQueryOptionsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1541,7 +1542,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.explain = iprot.readBool(); struct.setExplainIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1563,7 +1564,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PinotQuery struct) iprot.readMapEnd(); } struct.setExpressionOverrideHintsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1711,6 +1712,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PinotQuery struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class PinotQueryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -1860,7 +1862,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list33 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.selectList = new java.util.ArrayList(_list33.size); @org.apache.thrift.annotation.Nullable Expression _elem34; for (int _i35 = 0; _i35 < _list33.size; ++_i35) @@ -1879,7 +1881,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(4)) { { - org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list36 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.groupByList = new java.util.ArrayList(_list36.size); @org.apache.thrift.annotation.Nullable Expression _elem37; for (int _i38 = 0; _i38 < _list36.size; ++_i38) @@ -1893,7 +1895,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(5)) { { - org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list39 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.orderByList = new java.util.ArrayList(_list39.size); @org.apache.thrift.annotation.Nullable Expression _elem40; for (int _i41 = 0; _i41 < _list39.size; ++_i41) @@ -1920,7 +1922,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(9)) { { - org.apache.thrift.protocol.TMap _map42 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); struct.debugOptions = new java.util.HashMap(2*_map42.size); @org.apache.thrift.annotation.Nullable java.lang.String _key43; @org.apache.thrift.annotation.Nullable java.lang.String _val44; @@ -1935,7 +1937,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(10)) { { - org.apache.thrift.protocol.TMap _map46 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TMap _map46 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); struct.queryOptions = new java.util.HashMap(2*_map46.size); @org.apache.thrift.annotation.Nullable java.lang.String _key47; @org.apache.thrift.annotation.Nullable java.lang.String _val48; @@ -1954,7 +1956,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PinotQuery struct) t } if (incoming.get(12)) { { - org.apache.thrift.protocol.TMap _map50 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT); struct.expressionOverrideHints = new java.util.HashMap(2*_map50.size); @org.apache.thrift.annotation.Nullable Expression _key51; @org.apache.thrift.annotation.Nullable Expression _val52; @@ -1976,3 +1978,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java b/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java index b868c2665fda..4436c8944df1 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/QuerySource.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Query source - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class QuerySource implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QuerySource"); @@ -106,7 +106,7 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QuerySource.class, metaDataMap); @@ -166,6 +166,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setTableName((java.lang.String)value); } break; + } } @@ -174,6 +175,7 @@ public java.lang.Object getFieldValue(_Fields field) { switch (field) { case TABLE_NAME: return getTableName(); + } throw new java.lang.IllegalStateException(); } @@ -193,8 +195,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof QuerySource) return this.equals((QuerySource)that); return false; @@ -237,7 +237,7 @@ public int compareTo(QuerySource other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName()); + lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName()); if (lastComparison != 0) { return lastComparison; } @@ -316,7 +316,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QuerySource struct) while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -324,7 +324,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QuerySource struct) if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.tableName = iprot.readString(); struct.setTableNameIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -351,6 +351,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, QuerySource struct oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class QuerySourceTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -389,3 +390,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java b/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java index e5aa599357f7..9426b10218ec 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/QueryType.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Query type - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class QueryType implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QueryType"); @@ -132,15 +132,15 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.HAS_SELECTION, new org.apache.thrift.meta_data.FieldMetaData("hasSelection", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAS_SELECTION, new org.apache.thrift.meta_data.FieldMetaData("hasSelection", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.HAS_FILTER, new org.apache.thrift.meta_data.FieldMetaData("hasFilter", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAS_FILTER, new org.apache.thrift.meta_data.FieldMetaData("hasFilter", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.HAS_AGGREGATION, new org.apache.thrift.meta_data.FieldMetaData("hasAggregation", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAS_AGGREGATION, new org.apache.thrift.meta_data.FieldMetaData("hasAggregation", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.HAS_GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("hasGroup_by", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAS_GROUP_BY, new org.apache.thrift.meta_data.FieldMetaData("hasGroup_by", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.HAS_HAVING, new org.apache.thrift.meta_data.FieldMetaData("hasHaving", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.HAS_HAVING, new org.apache.thrift.meta_data.FieldMetaData("hasHaving", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QueryType.class, metaDataMap); @@ -330,6 +330,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setHasHaving((java.lang.Boolean)value); } break; + } } @@ -350,6 +351,7 @@ public java.lang.Object getFieldValue(_Fields field) { case HAS_HAVING: return isHasHaving(); + } throw new java.lang.IllegalStateException(); } @@ -377,8 +379,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof QueryType) return this.equals((QueryType)that); return false; @@ -473,7 +473,7 @@ public int compareTo(QueryType other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetHasSelection()).compareTo(other.isSetHasSelection()); + lastComparison = java.lang.Boolean.compare(isSetHasSelection(), other.isSetHasSelection()); if (lastComparison != 0) { return lastComparison; } @@ -483,7 +483,7 @@ public int compareTo(QueryType other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHasFilter()).compareTo(other.isSetHasFilter()); + lastComparison = java.lang.Boolean.compare(isSetHasFilter(), other.isSetHasFilter()); if (lastComparison != 0) { return lastComparison; } @@ -493,7 +493,7 @@ public int compareTo(QueryType other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHasAggregation()).compareTo(other.isSetHasAggregation()); + lastComparison = java.lang.Boolean.compare(isSetHasAggregation(), other.isSetHasAggregation()); if (lastComparison != 0) { return lastComparison; } @@ -503,7 +503,7 @@ public int compareTo(QueryType other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHasGroup_by()).compareTo(other.isSetHasGroup_by()); + lastComparison = java.lang.Boolean.compare(isSetHasGroup_by(), other.isSetHasGroup_by()); if (lastComparison != 0) { return lastComparison; } @@ -513,7 +513,7 @@ public int compareTo(QueryType other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetHasHaving()).compareTo(other.isSetHasHaving()); + lastComparison = java.lang.Boolean.compare(isSetHasHaving(), other.isSetHasHaving()); if (lastComparison != 0) { return lastComparison; } @@ -614,7 +614,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -622,7 +622,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.hasSelection = iprot.readBool(); struct.setHasSelectionIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -630,7 +630,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.hasFilter = iprot.readBool(); struct.setHasFilterIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -638,7 +638,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.hasAggregation = iprot.readBool(); struct.setHasAggregationIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -646,7 +646,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.hasGroup_by = iprot.readBool(); struct.setHasGroup_byIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -654,7 +654,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryType struct) t if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.hasHaving = iprot.readBool(); struct.setHasHavingIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -699,6 +699,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, QueryType struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class QueryTypeTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -777,3 +778,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java b/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java index ac17d013a15b..46e3abe632f8 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/Selection.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -28,9 +28,9 @@ /** * AUTO GENERATED: DO NOT EDIT * Selection - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class Selection implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Selection"); @@ -124,15 +124,15 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SELECTION_COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("selectionColumns", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.SELECTION_COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("selectionColumns", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.SELECTION_SORT_SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("selectionSortSequence", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + tmpMap.put(_Fields.SELECTION_SORT_SEQUENCE, new org.apache.thrift.meta_data.FieldMetaData("selectionSortSequence", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SelectionSort.class)))); - tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.OFFSET, new org.apache.thrift.meta_data.FieldMetaData("offset", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.SIZE, new org.apache.thrift.meta_data.FieldMetaData("size", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Selection.class, metaDataMap); @@ -142,6 +142,7 @@ public Selection() { this.offset = 0; this.size = 10; + } /** @@ -175,6 +176,7 @@ public void clear() { this.offset = 0; this.size = 10; + } public int getSelectionColumnsSize() { @@ -334,6 +336,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setSize((java.lang.Integer)value); } break; + } } @@ -351,6 +354,7 @@ public java.lang.Object getFieldValue(_Fields field) { case SIZE: return getSize(); + } throw new java.lang.IllegalStateException(); } @@ -376,8 +380,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof Selection) return this.equals((Selection)that); return false; @@ -459,7 +461,7 @@ public int compareTo(Selection other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetSelectionColumns()).compareTo(other.isSetSelectionColumns()); + lastComparison = java.lang.Boolean.compare(isSetSelectionColumns(), other.isSetSelectionColumns()); if (lastComparison != 0) { return lastComparison; } @@ -469,7 +471,7 @@ public int compareTo(Selection other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSelectionSortSequence()).compareTo(other.isSetSelectionSortSequence()); + lastComparison = java.lang.Boolean.compare(isSetSelectionSortSequence(), other.isSetSelectionSortSequence()); if (lastComparison != 0) { return lastComparison; } @@ -479,7 +481,7 @@ public int compareTo(Selection other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetOffset()).compareTo(other.isSetOffset()); + lastComparison = java.lang.Boolean.compare(isSetOffset(), other.isSetOffset()); if (lastComparison != 0) { return lastComparison; } @@ -489,7 +491,7 @@ public int compareTo(Selection other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetSize()).compareTo(other.isSetSize()); + lastComparison = java.lang.Boolean.compare(isSetSize(), other.isSetSize()); if (lastComparison != 0) { return lastComparison; } @@ -592,7 +594,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Selection struct) t while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -610,7 +612,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Selection struct) t iprot.readListEnd(); } struct.setSelectionColumnsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -629,7 +631,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Selection struct) t iprot.readListEnd(); } struct.setSelectionSortSequenceIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -637,7 +639,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Selection struct) t if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.offset = iprot.readI32(); struct.setOffsetIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -645,7 +647,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Selection struct) t if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.size = iprot.readI32(); struct.setSizeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -703,6 +705,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Selection struct) oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class SelectionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -762,7 +765,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Selection struct) th java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list96 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list96 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); struct.selectionColumns = new java.util.ArrayList(_list96.size); @org.apache.thrift.annotation.Nullable java.lang.String _elem97; for (int _i98 = 0; _i98 < _list96.size; ++_i98) @@ -775,7 +778,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Selection struct) th } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list99 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); struct.selectionSortSequence = new java.util.ArrayList(_list99.size); @org.apache.thrift.annotation.Nullable SelectionSort _elem100; for (int _i101 = 0; _i101 < _list99.size; ++_i101) @@ -802,3 +805,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java b/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java index 0195d509c0a2..54d6ecd2cead 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/request/SelectionSort.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -29,9 +29,9 @@ * AUTO GENERATED: DO NOT EDIT * selection-sort : specifies how the search results should be sorted. * The results can be sorted based on one or multiple columns - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class SelectionSort implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SelectionSort"); @@ -114,9 +114,9 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.IS_ASC, new org.apache.thrift.meta_data.FieldMetaData("isAsc", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.IS_ASC, new org.apache.thrift.meta_data.FieldMetaData("isAsc", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SelectionSort.class, metaDataMap); @@ -210,6 +210,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setIsAsc((java.lang.Boolean)value); } break; + } } @@ -221,6 +222,7 @@ public java.lang.Object getFieldValue(_Fields field) { case IS_ASC: return isIsAsc(); + } throw new java.lang.IllegalStateException(); } @@ -242,8 +244,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof SelectionSort) return this.equals((SelectionSort)that); return false; @@ -299,7 +299,7 @@ public int compareTo(SelectionSort other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn()); + lastComparison = java.lang.Boolean.compare(isSetColumn(), other.isSetColumn()); if (lastComparison != 0) { return lastComparison; } @@ -309,7 +309,7 @@ public int compareTo(SelectionSort other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetIsAsc()).compareTo(other.isSetIsAsc()); + lastComparison = java.lang.Boolean.compare(isSetIsAsc(), other.isSetIsAsc()); if (lastComparison != 0) { return lastComparison; } @@ -396,7 +396,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SelectionSort struc while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -404,7 +404,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SelectionSort struc if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.column = iprot.readString(); struct.setColumnIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -412,7 +412,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SelectionSort struc if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isAsc = iprot.readBool(); struct.setIsAscIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -444,6 +444,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SelectionSort stru oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class SelectionSortTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -492,3 +493,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java b/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java index 344f47e87999..5f6649fee397 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/response/ProcessingException.java @@ -17,7 +17,7 @@ * under the License. */ /** - * Autogenerated by Thrift Compiler (0.13.0) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -27,9 +27,9 @@ @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) /** * Processing exception - * + * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2022-03-28") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2022-03-28") public class ProcessingException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessingException"); @@ -112,9 +112,9 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ERROR_CODE, new org.apache.thrift.meta_data.FieldMetaData("errorCode", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.ERROR_CODE, new org.apache.thrift.meta_data.FieldMetaData("errorCode", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessingException.class, metaDataMap); @@ -216,6 +216,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable setMessage((java.lang.String)value); } break; + } } @@ -227,6 +228,7 @@ public java.lang.Object getFieldValue(_Fields field) { case MESSAGE: return getMessage(); + } throw new java.lang.IllegalStateException(); } @@ -248,8 +250,6 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof ProcessingException) return this.equals((ProcessingException)that); return false; @@ -303,7 +303,7 @@ public int compareTo(ProcessingException other) { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetErrorCode()).compareTo(other.isSetErrorCode()); + lastComparison = java.lang.Boolean.compare(isSetErrorCode(), other.isSetErrorCode()); if (lastComparison != 0) { return lastComparison; } @@ -313,7 +313,7 @@ public int compareTo(ProcessingException other) { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); + lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } @@ -402,7 +402,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ProcessingException while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -410,7 +410,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ProcessingException if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.errorCode = iprot.readI32(); struct.setErrorCodeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -418,7 +418,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ProcessingException if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.message = iprot.readString(); struct.setMessageIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -448,6 +448,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ProcessingExceptio oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class ProcessingExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @@ -489,3 +490,4 @@ private static S scheme(org.apache. return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } + diff --git a/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml index 393ea238d1e6..63497373f9de 100644 --- a/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/pinot-common-jdk8/pom.xml @@ -57,6 +57,35 @@ org.xolstice.maven.plugins protobuf-maven-plugin + + com.diffplug.spotless + spotless-maven-plugin + 2.9.0 + + + verify + + check + + + + + + + src/main/java/**/*.java + src/test/java/**/*.java + + + src/main/java/org/apache/pinot/common/request/*.java + src/main/java/org/apache/pinot/common/response/ProcessingException.java + + + ,\# + + + + +