You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2016/04/22 10:07:37 UTC
[08/13] calcite git commit: Remove trailing spaces from all source
files
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
index a26e096..ca24f86 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/proto/Responses.java
@@ -248,7 +248,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
connectionId_ = s;
@@ -262,7 +262,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -713,7 +713,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -730,7 +730,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
connectionId_ = value;
onChanged();
return this;
@@ -739,7 +739,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional string connection_id = 1;</code>
*/
public Builder clearConnectionId() {
-
+
connectionId_ = getDefaultInstance().getConnectionId();
onChanged();
return this;
@@ -753,7 +753,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
connectionId_ = value;
onChanged();
return this;
@@ -770,7 +770,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder setStatementId(int value) {
-
+
statementId_ = value;
onChanged();
return this;
@@ -779,7 +779,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder clearStatementId() {
-
+
statementId_ = 0;
onChanged();
return this;
@@ -796,7 +796,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional bool own_statement = 3;</code>
*/
public Builder setOwnStatement(boolean value) {
-
+
ownStatement_ = value;
onChanged();
return this;
@@ -805,7 +805,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional bool own_statement = 3;</code>
*/
public Builder clearOwnStatement() {
-
+
ownStatement_ = false;
onChanged();
return this;
@@ -896,7 +896,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Signature signature = 4;</code>
*/
public org.apache.calcite.avatica.proto.Common.Signature.Builder getSignatureBuilder() {
-
+
onChanged();
return getSignatureFieldBuilder().getBuilder();
}
@@ -915,7 +915,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Signature signature = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>
+ org.apache.calcite.avatica.proto.Common.Signature, org.apache.calcite.avatica.proto.Common.Signature.Builder, org.apache.calcite.avatica.proto.Common.SignatureOrBuilder>
getSignatureFieldBuilder() {
if (signatureBuilder_ == null) {
signatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -1013,7 +1013,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Frame first_frame = 5;</code>
*/
public org.apache.calcite.avatica.proto.Common.Frame.Builder getFirstFrameBuilder() {
-
+
onChanged();
return getFirstFrameFieldBuilder().getBuilder();
}
@@ -1032,7 +1032,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Frame first_frame = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
+ org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
getFirstFrameFieldBuilder() {
if (firstFrameBuilder_ == null) {
firstFrameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -1064,7 +1064,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setUpdateCount(long value) {
-
+
updateCount_ = value;
onChanged();
return this;
@@ -1077,7 +1077,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearUpdateCount() {
-
+
updateCount_ = 0L;
onChanged();
return this;
@@ -1196,7 +1196,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -1223,7 +1223,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -1300,7 +1300,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .ResultSetResponse results = 1;</code>
*/
- java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse>
+ java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse>
getResultsList();
/**
* <code>repeated .ResultSetResponse results = 1;</code>
@@ -1313,7 +1313,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .ResultSetResponse results = 1;</code>
*/
- java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+ java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
getResultsOrBuilderList();
/**
* <code>repeated .ResultSetResponse results = 1;</code>
@@ -1452,7 +1452,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .ResultSetResponse results = 1;</code>
*/
- public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+ public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
getResultsOrBuilderList() {
return results_;
}
@@ -1753,7 +1753,7 @@ package org.apache.calcite.avatica.proto;
resultsBuilder_ = null;
results_ = other.results_;
bitField0_ = (bitField0_ & ~0x00000001);
- resultsBuilder_ =
+ resultsBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getResultsFieldBuilder() : null;
} else {
@@ -1989,7 +1989,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .ResultSetResponse results = 1;</code>
*/
- public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+ public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
getResultsOrBuilderList() {
if (resultsBuilder_ != null) {
return resultsBuilder_.getMessageOrBuilderList();
@@ -2015,12 +2015,12 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .ResultSetResponse results = 1;</code>
*/
- public java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder>
+ public java.util.List<org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder>
getResultsBuilderList() {
return getResultsFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.ResultSetResponse, org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder, org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.ResultSetResponse, org.apache.calcite.avatica.proto.Responses.ResultSetResponse.Builder, org.apache.calcite.avatica.proto.Responses.ResultSetResponseOrBuilder>
getResultsFieldBuilder() {
if (resultsBuilder_ == null) {
resultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
@@ -2053,7 +2053,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMissingStatement(boolean value) {
-
+
missingStatement_ = value;
onChanged();
return this;
@@ -2066,7 +2066,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMissingStatement() {
-
+
missingStatement_ = false;
onChanged();
return this;
@@ -2157,7 +2157,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -2176,7 +2176,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -2734,7 +2734,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .StatementHandle statement = 1;</code>
*/
public org.apache.calcite.avatica.proto.Common.StatementHandle.Builder getStatementBuilder() {
-
+
onChanged();
return getStatementFieldBuilder().getBuilder();
}
@@ -2753,7 +2753,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .StatementHandle statement = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder>
+ org.apache.calcite.avatica.proto.Common.StatementHandle, org.apache.calcite.avatica.proto.Common.StatementHandle.Builder, org.apache.calcite.avatica.proto.Common.StatementHandleOrBuilder>
getStatementFieldBuilder() {
if (statementBuilder_ == null) {
statementBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -2851,7 +2851,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -2870,7 +2870,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -3510,7 +3510,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Frame frame = 1;</code>
*/
public org.apache.calcite.avatica.proto.Common.Frame.Builder getFrameBuilder() {
-
+
onChanged();
return getFrameFieldBuilder().getBuilder();
}
@@ -3529,7 +3529,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Frame frame = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
+ org.apache.calcite.avatica.proto.Common.Frame, org.apache.calcite.avatica.proto.Common.Frame.Builder, org.apache.calcite.avatica.proto.Common.FrameOrBuilder>
getFrameFieldBuilder() {
if (frameBuilder_ == null) {
frameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -3561,7 +3561,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMissingStatement(boolean value) {
-
+
missingStatement_ = value;
onChanged();
return this;
@@ -3574,7 +3574,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMissingStatement() {
-
+
missingStatement_ = false;
onChanged();
return this;
@@ -3599,7 +3599,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMissingResults(boolean value) {
-
+
missingResults_ = value;
onChanged();
return this;
@@ -3612,7 +3612,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMissingResults() {
-
+
missingResults_ = false;
onChanged();
return this;
@@ -3703,7 +3703,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 4;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -3722,7 +3722,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -3926,7 +3926,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
connectionId_ = s;
@@ -3940,7 +3940,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -4247,7 +4247,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -4264,7 +4264,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
connectionId_ = value;
onChanged();
return this;
@@ -4273,7 +4273,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional string connection_id = 1;</code>
*/
public Builder clearConnectionId() {
-
+
connectionId_ = getDefaultInstance().getConnectionId();
onChanged();
return this;
@@ -4287,7 +4287,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
connectionId_ = value;
onChanged();
return this;
@@ -4304,7 +4304,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder setStatementId(int value) {
-
+
statementId_ = value;
onChanged();
return this;
@@ -4313,7 +4313,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder clearStatementId() {
-
+
statementId_ = 0;
onChanged();
return this;
@@ -4404,7 +4404,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -4423,7 +4423,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -4913,7 +4913,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -4932,7 +4932,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -5422,7 +5422,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -5441,7 +5441,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -5931,7 +5931,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -5950,7 +5950,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -6508,7 +6508,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .ConnectionProperties conn_props = 1;</code>
*/
public org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder getConnPropsBuilder() {
-
+
onChanged();
return getConnPropsFieldBuilder().getBuilder();
}
@@ -6527,7 +6527,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .ConnectionProperties conn_props = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder>
+ org.apache.calcite.avatica.proto.Common.ConnectionProperties, org.apache.calcite.avatica.proto.Common.ConnectionProperties.Builder, org.apache.calcite.avatica.proto.Common.ConnectionPropertiesOrBuilder>
getConnPropsFieldBuilder() {
if (connPropsBuilder_ == null) {
connPropsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -6625,7 +6625,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -6644,7 +6644,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -7262,7 +7262,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .DatabaseProperty key = 1;</code>
*/
public org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder getKeyBuilder() {
-
+
onChanged();
return getKeyFieldBuilder().getBuilder();
}
@@ -7281,7 +7281,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .DatabaseProperty key = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.DatabaseProperty, org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder, org.apache.calcite.avatica.proto.Common.DatabasePropertyOrBuilder>
+ org.apache.calcite.avatica.proto.Common.DatabaseProperty, org.apache.calcite.avatica.proto.Common.DatabaseProperty.Builder, org.apache.calcite.avatica.proto.Common.DatabasePropertyOrBuilder>
getKeyFieldBuilder() {
if (keyBuilder_ == null) {
keyBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -7379,7 +7379,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .TypedValue value = 2;</code>
*/
public org.apache.calcite.avatica.proto.Common.TypedValue.Builder getValueBuilder() {
-
+
onChanged();
return getValueFieldBuilder().getBuilder();
}
@@ -7398,7 +7398,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .TypedValue value = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
+ org.apache.calcite.avatica.proto.Common.TypedValue, org.apache.calcite.avatica.proto.Common.TypedValue.Builder, org.apache.calcite.avatica.proto.Common.TypedValueOrBuilder>
getValueFieldBuilder() {
if (valueBuilder_ == null) {
valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -7496,7 +7496,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -7515,7 +7515,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -7592,7 +7592,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
*/
- java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement>
+ java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement>
getPropsList();
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
@@ -7605,7 +7605,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
*/
- java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+ java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
getPropsOrBuilderList();
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
@@ -7729,7 +7729,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
*/
- public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+ public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
getPropsOrBuilderList() {
return props_;
}
@@ -8007,7 +8007,7 @@ package org.apache.calcite.avatica.proto;
propsBuilder_ = null;
props_ = other.props_;
bitField0_ = (bitField0_ & ~0x00000001);
- propsBuilder_ =
+ propsBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getPropsFieldBuilder() : null;
} else {
@@ -8240,7 +8240,7 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
*/
- public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+ public java.util.List<? extends org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
getPropsOrBuilderList() {
if (propsBuilder_ != null) {
return propsBuilder_.getMessageOrBuilderList();
@@ -8266,12 +8266,12 @@ package org.apache.calcite.avatica.proto;
/**
* <code>repeated .DatabasePropertyElement props = 1;</code>
*/
- public java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder>
+ public java.util.List<org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder>
getPropsBuilderList() {
return getPropsFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElement.Builder, org.apache.calcite.avatica.proto.Responses.DatabasePropertyElementOrBuilder>
getPropsFieldBuilder() {
if (propsBuilder_ == null) {
propsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
@@ -8370,7 +8370,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -8389,7 +8389,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -8772,7 +8772,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
errorMessage_ = s;
@@ -8790,7 +8790,7 @@ package org.apache.calcite.avatica.proto;
getErrorMessageBytes() {
java.lang.Object ref = errorMessage_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
errorMessage_ = b;
@@ -8843,7 +8843,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
sqlState_ = s;
@@ -8861,7 +8861,7 @@ package org.apache.calcite.avatica.proto;
getSqlStateBytes() {
java.lang.Object ref = sqlState_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
sqlState_ = b;
@@ -9356,7 +9356,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setHasExceptions(boolean value) {
-
+
hasExceptions_ = value;
onChanged();
return this;
@@ -9369,7 +9369,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearHasExceptions() {
-
+
hasExceptions_ = false;
onChanged();
return this;
@@ -9406,7 +9406,7 @@ package org.apache.calcite.avatica.proto;
getErrorMessageBytes() {
java.lang.Object ref = errorMessage_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
errorMessage_ = b;
@@ -9427,7 +9427,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
errorMessage_ = value;
onChanged();
return this;
@@ -9440,7 +9440,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearErrorMessage() {
-
+
errorMessage_ = getDefaultInstance().getErrorMessage();
onChanged();
return this;
@@ -9458,7 +9458,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
errorMessage_ = value;
onChanged();
return this;
@@ -9493,7 +9493,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
severity_ = value.getNumber();
onChanged();
return this;
@@ -9502,7 +9502,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .Severity severity = 3;</code>
*/
public Builder clearSeverity() {
-
+
severity_ = 0;
onChanged();
return this;
@@ -9527,7 +9527,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setErrorCode(int value) {
-
+
errorCode_ = value;
onChanged();
return this;
@@ -9540,7 +9540,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearErrorCode() {
-
+
errorCode_ = 0;
onChanged();
return this;
@@ -9577,7 +9577,7 @@ package org.apache.calcite.avatica.proto;
getSqlStateBytes() {
java.lang.Object ref = sqlState_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
sqlState_ = b;
@@ -9598,7 +9598,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
sqlState_ = value;
onChanged();
return this;
@@ -9611,7 +9611,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearSqlState() {
-
+
sqlState_ = getDefaultInstance().getSqlState();
onChanged();
return this;
@@ -9629,7 +9629,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
sqlState_ = value;
onChanged();
return this;
@@ -9720,7 +9720,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 6;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -9739,7 +9739,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -10237,7 +10237,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMissingStatement(boolean value) {
-
+
missingStatement_ = value;
onChanged();
return this;
@@ -10250,7 +10250,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMissingStatement() {
-
+
missingStatement_ = false;
onChanged();
return this;
@@ -10275,7 +10275,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMoreResults(boolean value) {
-
+
moreResults_ = value;
onChanged();
return this;
@@ -10288,7 +10288,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMoreResults() {
-
+
moreResults_ = false;
onChanged();
return this;
@@ -10379,7 +10379,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -10398,7 +10398,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
@@ -10577,7 +10577,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
serverAddress_ = s;
@@ -10595,7 +10595,7 @@ package org.apache.calcite.avatica.proto;
getServerAddressBytes() {
java.lang.Object ref = serverAddress_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
serverAddress_ = b;
@@ -10846,7 +10846,7 @@ package org.apache.calcite.avatica.proto;
getServerAddressBytes() {
java.lang.Object ref = serverAddress_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
serverAddress_ = b;
@@ -10867,7 +10867,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
serverAddress_ = value;
onChanged();
return this;
@@ -10880,7 +10880,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearServerAddress() {
-
+
serverAddress_ = getDefaultInstance().getServerAddress();
onChanged();
return this;
@@ -10898,7 +10898,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
serverAddress_ = value;
onChanged();
return this;
@@ -11795,7 +11795,7 @@ package org.apache.calcite.avatica.proto;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
connectionId_ = s;
@@ -11809,7 +11809,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -12208,7 +12208,7 @@ package org.apache.calcite.avatica.proto;
getConnectionIdBytes() {
java.lang.Object ref = connectionId_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
connectionId_ = b;
@@ -12225,7 +12225,7 @@ package org.apache.calcite.avatica.proto;
if (value == null) {
throw new NullPointerException();
}
-
+
connectionId_ = value;
onChanged();
return this;
@@ -12234,7 +12234,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional string connection_id = 1;</code>
*/
public Builder clearConnectionId() {
-
+
connectionId_ = getDefaultInstance().getConnectionId();
onChanged();
return this;
@@ -12248,7 +12248,7 @@ package org.apache.calcite.avatica.proto;
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
-
+
connectionId_ = value;
onChanged();
return this;
@@ -12265,7 +12265,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder setStatementId(int value) {
-
+
statementId_ = value;
onChanged();
return this;
@@ -12274,7 +12274,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional uint32 statement_id = 2;</code>
*/
public Builder clearStatementId() {
-
+
statementId_ = 0;
onChanged();
return this;
@@ -12365,7 +12365,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder setMissingStatement(boolean value) {
-
+
missingStatement_ = value;
onChanged();
return this;
@@ -12378,7 +12378,7 @@ package org.apache.calcite.avatica.proto;
* </pre>
*/
public Builder clearMissingStatement() {
-
+
missingStatement_ = false;
onChanged();
return this;
@@ -12469,7 +12469,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 5;</code>
*/
public org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder getMetadataBuilder() {
-
+
onChanged();
return getMetadataFieldBuilder().getBuilder();
}
@@ -12488,7 +12488,7 @@ package org.apache.calcite.avatica.proto;
* <code>optional .RpcMetadata metadata = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
+ org.apache.calcite.avatica.proto.Responses.RpcMetadata, org.apache.calcite.avatica.proto.Responses.RpcMetadata.Builder, org.apache.calcite.avatica.proto.Responses.RpcMetadataOrBuilder>
getMetadataFieldBuilder() {
if (metadataBuilder_ == null) {
metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/avatica/core/src/main/java/org/apache/calcite/avatica/util/Base64.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/util/Base64.java b/avatica/core/src/main/java/org/apache/calcite/avatica/util/Base64.java
index f6af109..c2393b1 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/util/Base64.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/util/Base64.java
@@ -28,9 +28,9 @@ package org.apache.calcite.avatica.util;
* <br>
* <code>byte[] myByteArray = Base64.decode( encoded );</code>
*
- * <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass
- * several pieces of information to the encoder. In the "higher level" methods such as
- * encodeBytes( bytes, options ) the options parameter can be used to indicate such
+ * <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass
+ * several pieces of information to the encoder. In the "higher level" methods such as
+ * encodeBytes( bytes, options ) the options parameter can be used to indicate such
* things as first gzipping the bytes before encoding them, not inserting linefeeds,
* and encoding using the URL-safe and Ordered dialects.</p>
*
@@ -39,7 +39,7 @@ package org.apache.calcite.avatica.util;
* to do so. I've got Base64 set to this behavior now, although earlier versions
* broke lines by default.</p>
*
- * <p>The constants defined in Base64 can be OR-ed together to combine options, so you
+ * <p>The constants defined in Base64 can be OR-ed together to combine options, so you
* might make a call like this:</p>
*
* <code>String encoded = Base64.encodeBytes( mybytes, Base64.GZIP | Base64.DO_BREAK_LINES );</code>
@@ -86,7 +86,7 @@ package org.apache.calcite.avatica.util;
* <li>v2.3 - <strong>This is not a drop-in replacement!</strong> This is two years of comments
* and bug fixes queued up and finally executed. Thanks to everyone who sent
* me stuff, and I'm sorry I wasn't able to distribute your fixes to everyone else.
- * Much bad coding was cleaned up including throwing exceptions where necessary
+ * Much bad coding was cleaned up including throwing exceptions where necessary
* instead of returning null values or something similar. Here are some changes
* that may affect you:
* <ul>
@@ -131,17 +131,17 @@ package org.apache.calcite.avatica.util;
* with other encodings (like EBCDIC).</li>
* <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
* encoded data was a single byte.</li>
- * <li>v2.0 - I got rid of methods that used booleans to set options.
+ * <li>v2.0 - I got rid of methods that used booleans to set options.
* Now everything is more consolidated and cleaner. The code now detects
* when data that's being decoded is gzip-compressed and will decompress it
* automatically. Generally things are cleaner. You'll probably have to
* change some method calls that you were making to support the new
* options format (<tt>int</tt>s that you "OR" together).</li>
- * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
- * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
- * Added the ability to "suspend" encoding in the Output Stream so
- * you can turn on and off the encoding if you need to embed base64
- * data in an otherwise "normal" stream (like an XML file).</li>
+ * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+ * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ * Added the ability to "suspend" encoding in the Output Stream so
+ * you can turn on and off the encoding if you need to embed base64
+ * data in an otherwise "normal" stream (like an XML file).</li>
* <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
* This helps when using GZIP streams.
* Added the ability to GZip-compress objects before encoding them.</li>
@@ -167,7 +167,7 @@ package org.apache.calcite.avatica.util;
*/
public class Base64
{
-
+
/* ******** P U B L I C F I E L D S ******** */
@@ -208,8 +208,8 @@ public class Base64
* <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
*/
public final static int ORDERED = 32;
-
-
+
+
/* ******** P R I V A T E F I E L D S ******** */
@@ -348,7 +348,7 @@ public class Base64
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255
};
@@ -459,10 +459,10 @@ public class Base64
/** Defeats instantiation. */
private Base64(){}
-
-
-
+
+
+
/* ******** E N C O D I N G M E T H O D S ******** */
@@ -1009,11 +1009,11 @@ public class Base64
} // end else: don't compress
} // end encodeBytesToBytes
-
-
-
-
+
+
+
+
/* ******** D E C O D I N G M E T H O D S ******** */
@@ -1642,8 +1642,8 @@ public class Base64
catch( Exception ex ){}
} // end finally
} // end decodeFileToFile
-
-
+
+
/* ******** I N N E R C L A S S I N P U T S T R E A M ******** */
@@ -1851,12 +1851,12 @@ public class Base64
} // end read
} // end inner class InputStream
-
-
-
-
-
-
+
+
+
+
+
+
/* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/avatica/core/src/main/protobuf/common.proto
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/protobuf/common.proto b/avatica/core/src/main/protobuf/common.proto
index 10ac13d..affe5d5 100644
--- a/avatica/core/src/main/protobuf/common.proto
+++ b/avatica/core/src/main/protobuf/common.proto
@@ -250,7 +250,7 @@ message MetaDataOperationArgument {
REPEATED_INT = 4;
NULL = 5;
}
-
+
string string_value = 1;
bool bool_value = 2;
sint32 int_value = 3;
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/avatica/core/src/main/scripts/generate-protobuf.sh
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/scripts/generate-protobuf.sh b/avatica/core/src/main/scripts/generate-protobuf.sh
index c4d3abe..14bbe4b 100755
--- a/avatica/core/src/main/scripts/generate-protobuf.sh
+++ b/avatica/core/src/main/scripts/generate-protobuf.sh
@@ -53,7 +53,7 @@ protoc ${PROTOC_ARGS} src/main/protobuf/*.proto || fail unable to generate Java
# For all generated protobuf code, suppress all warnings and add the LICENSE header
s='@SuppressWarnings({"unused", "rawtypes"})'
-find $BUILD_DIR -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public final class \)/'"$s"' \1/'
+find $BUILD_DIR -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public final class \)/'"$s"' \1/;s/ *$//'
PREFIX="/*
"
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/main/codegen/config.fmpp
----------------------------------------------------------------------
diff --git a/core/src/main/codegen/config.fmpp b/core/src/main/codegen/config.fmpp
index 80276c4..6f88718 100644
--- a/core/src/main/codegen/config.fmpp
+++ b/core/src/main/codegen/config.fmpp
@@ -75,7 +75,7 @@ data: {
includeCompoundIdentifier: true
includeBraces: true
- includeAdditionalDeclarations: false
+ includeAdditionalDeclarations: false
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
index f28f4e0..4df725f 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -1919,9 +1919,9 @@ public class RelOptRulesTest extends RelOptTestBase {
final HepProgram program = new HepProgramBuilder()
.addRuleInstance(AggregateJoinTransposeRule.EXTENDED)
.build();
- final String sql = "select e.empno,d.deptno \n"
- + "from (select * from sales.emp where empno = 10) as e "
- + "join sales.dept as d on e.empno = d.deptno "
+ final String sql = "select e.empno,d.deptno\n"
+ + "from (select * from sales.emp where empno = 10) as e\n"
+ + "join sales.dept as d on e.empno = d.deptno\n"
+ "group by e.empno,d.deptno";
checkPlanning(tester, preProgram, new HepPlanner(program), sql);
}
@@ -1933,10 +1933,10 @@ public class RelOptRulesTest extends RelOptTestBase {
final HepProgram program = new HepProgramBuilder()
.addRuleInstance(AggregateJoinTransposeRule.EXTENDED)
.build();
- final String sql = "select e.empno,d.deptno \n"
- + "from (select * from sales.emp where empno = 10) as e "
- + "join sales.dept as d on e.empno = d.deptno "
- + "and e.deptno + e.empno = d.deptno + 5 "
+ final String sql = "select e.empno,d.deptno\n"
+ + "from (select * from sales.emp where empno = 10) as e\n"
+ + "join sales.dept as d on e.empno = d.deptno\n"
+ + "and e.deptno + e.empno = d.deptno + 5\n"
+ "group by e.empno,d.deptno";
checkPlanning(tester, preProgram, new HepPlanner(program), sql);
}
@@ -1948,9 +1948,9 @@ public class RelOptRulesTest extends RelOptTestBase {
final HepProgram program = new HepProgramBuilder()
.addRuleInstance(AggregateJoinTransposeRule.EXTENDED)
.build();
- final String sql = "select e.empno,d.deptno \n"
- + "from (select * from sales.emp where empno = 10) as e "
- + "join sales.dept as d on e.empno < d.deptno "
+ final String sql = "select e.empno,d.deptno\n"
+ + "from (select * from sales.emp where empno = 10) as e\n"
+ + "join sales.dept as d on e.empno < d.deptno\n"
+ "group by e.empno,d.deptno";
checkPlanning(tester, preProgram, new HepPlanner(program), sql, true);
}
@@ -1963,9 +1963,9 @@ public class RelOptRulesTest extends RelOptTestBase {
final HepProgram program = new HepProgramBuilder()
.addRuleInstance(AggregateJoinTransposeRule.EXTENDED)
.build();
- final String sql = "select e.empno,sum(sal) \n"
- + "from (select * from sales.emp where empno = 10) as e "
- + "join sales.dept as d on e.empno = d.deptno "
+ final String sql = "select e.empno,sum(sal)\n"
+ + "from (select * from sales.emp where empno = 10) as e\n"
+ + "join sales.dept as d on e.empno = d.deptno\n"
+ "group by e.empno,d.deptno";
checkPlanning(tester, preProgram, new HepPlanner(program), sql);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
index 1600c7e..779b1fd 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -3669,8 +3669,10 @@ LogicalProject(SUM1=[SUM($7) OVER (PARTITION BY $7 ORDER BY $5 RANGE BETWEEN UNB
</TestCase>
<TestCase name="testPushAggregateThroughJoin1">
<Resource name="sql">
- <![CDATA[select e.empno,d.deptno
-from (select * from sales.emp where empno = 10) as e join sales.dept as d on e.empno = d.deptno group by e.empno,d.deptno]]>
+ <![CDATA[select e.empno,d.deptno
+from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno = d.deptno
+group by e.empno,d.deptno]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
@@ -3696,8 +3698,11 @@ LogicalJoin(condition=[=($0, $1)], joinType=[inner])
</TestCase>
<TestCase name="testPushAggregateThroughJoin2">
<Resource name="sql">
- <![CDATA[select e.empno,d.deptno
-from (select * from sales.emp where empno = 10) as e join sales.dept as d on e.empno = d.deptno and e.deptno + e.empno = d.deptno + 5 group by e.empno,d.deptno]]>
+ <![CDATA[select e.empno,d.deptno
+from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno = d.deptno
+and e.deptno + e.empno = d.deptno + 5
+group by e.empno,d.deptno]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
@@ -3728,8 +3733,10 @@ LogicalAggregate(group=[{0, 2}])
</TestCase>
<TestCase name="testPushAggregateThroughJoin3">
<Resource name="sql">
- <![CDATA[select e.empno,d.deptno
-from (select * from sales.emp where empno = 10) as e join sales.dept as d on e.empno < d.deptno group by e.empno,d.deptno]]>
+ <![CDATA[select e.empno,d.deptno
+from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno < d.deptno
+group by e.empno,d.deptno]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
@@ -3754,8 +3761,10 @@ LogicalAggregate(group=[{0, 9}])
</TestCase>
<TestCase name="testPushAggregateSumThroughJoin">
<Resource name="sql">
- <![CDATA[select e.empno,sum(sal)
-from (select * from sales.emp where empno = 10) as e join sales.dept as d on e.empno = d.deptno group by e.empno,d.deptno]]>
+ <![CDATA[select e.empno,sum(sal)
+from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno = d.deptno
+group by e.empno,d.deptno]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/test/resources/sql/outer.iq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/outer.iq b/core/src/test/resources/sql/outer.iq
index 80a32a4..820d4f7 100644
--- a/core/src/test/resources/sql/outer.iq
+++ b/core/src/test/resources/sql/outer.iq
@@ -177,19 +177,21 @@ select * from (select * from emp where gender ='F') as emp right join dept on em
!if (false) {
select * from emp full join dept on emp.deptno = dept.deptno and emp.gender = 'F';
- ename | deptno | gender | deptno | dname
--------+--------+--------+--------+-------------
- Jane | 10 | F | 10 | Sales
- | | | 20 | Marketing
- Alice | 30 | F | 30 | Engineering
- Susan | 30 | F | 30 | Engineering
- | | | 40 | Empty
- Wilma | | F | |
- Eric | 20 | M | |
- Bob | 10 | M | |
- Eve | 50 | F | |
- Adam | 50 | M | |
- Grace | 60 | F | |
++-------+--------+--------+--------+-------------+
+| ename | deptno | gender | deptno | dname |
++-------+--------+--------+--------+-------------+
+| Jane | 10 | F | 10 | Sales |
+| | | | 20 | Marketing |
+| Alice | 30 | F | 30 | Engineering |
+| Susan | 30 | F | 30 | Engineering |
+| | | | 40 | Empty |
+| Wilma | | F | | |
+| Eric | 20 | M | | |
+| Bob | 10 | M | | |
+| Eve | 50 | F | | |
+| Adam | 50 | M | | |
+| Grace | 60 | F | | |
++-------+--------+--------+--------+-------------+
(11 rows)
!ok
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/test/resources/sql/subquery.iq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/subquery.iq b/core/src/test/resources/sql/subquery.iq
index d014b57..ad71655 100644
--- a/core/src/test/resources/sql/subquery.iq
+++ b/core/src/test/resources/sql/subquery.iq
@@ -128,31 +128,39 @@ select deptno, deptno not in (select deptno from emp where deptno is null) from
!ok
+!set outputformat mysql
+
# RHS has only NOT NULL keys
select * from dept where deptno not in (select deptno from emp where deptno is not null);
- DEPTNO | DNAME
---------+-------------
- 40 | Empty
++--------+-------------+
+| DEPTNO | DNAME |
++--------+-------------+
+| 40 | Empty |
++--------+-------------+
(1 row)
!ok
select deptno, deptno in (select deptno from emp where deptno is not null) from dept;
- DEPTNO | EXPR$1
---------+--------
- 10 | true
- 20 | true
- 30 | true
- 40 | false
++--------+--------+
+| DEPTNO | EXPR$1 |
++--------+--------+
+| 10 | true |
+| 20 | true |
+| 30 | true |
+| 40 | false |
++--------+--------+
(4 rows)
!ok
select deptno, deptno not in (select deptno from emp where deptno is not null) from dept;
- DEPTNO | EXPR$1
---------+--------
- 10 | false
- 20 | false
- 30 | false
- 40 | true
++--------+--------+
+| DEPTNO | EXPR$1 |
++--------+--------+
+| 10 | false |
+| 20 | false |
+| 30 | false |
+| 40 | true |
++--------+--------+
(4 rows)
!ok
@@ -160,32 +168,38 @@ select deptno, deptno not in (select deptno from emp where deptno is not null) f
# RHS has no rows
# Even 'NULL NOT IN ...' is TRUE.
select * from dept where deptno not in (select deptno from emp where false);
- DEPTNO | DNAME
---------+-------------
- 10 | Sales
- 20 | Marketing
- 30 | Engineering
- 40 | Empty
++--------+-------------+
+| DEPTNO | DNAME |
++--------+-------------+
+| 10 | Sales |
+| 20 | Marketing |
+| 30 | Engineering |
+| 40 | Empty |
++--------+-------------+
(4 rows)
!ok
select deptno, deptno in (select deptno from emp where false) from dept;
- DEPTNO | EXPR$1
---------+--------
- 10 | false
- 20 | false
- 30 | false
- 40 | false
++--------+--------+
+| DEPTNO | EXPR$1 |
++--------+--------+
+| 10 | false |
+| 20 | false |
+| 30 | false |
+| 40 | false |
++--------+--------+
(4 rows)
!ok
select deptno, deptno not in (select deptno from emp where false) from dept;
- DEPTNO | EXPR$1
---------+--------
- 10 | true
- 20 | true
- 30 | true
- 40 | true
++--------+--------+
+| DEPTNO | EXPR$1 |
++--------+--------+
+| 10 | true |
+| 20 | true |
+| 30 | true |
+| 40 | true |
++--------+--------+
(4 rows)
!ok
@@ -194,11 +208,13 @@ select deptno, deptno not in (select deptno from emp where false) from dept;
select * from dept
where deptno in (select deptno from emp where gender = 'F')
or deptno in (select deptno from emp where gender = 'M');
- DEPTNO | DNAME
---------+-------------
- 30 | Engineering
- 10 | Sales
- 20 | Marketing
++--------+-------------+
+| DEPTNO | DNAME |
++--------+-------------+
+| 10 | Sales |
+| 20 | Marketing |
+| 30 | Engineering |
++--------+-------------+
(3 rows)
!ok
@@ -207,10 +223,12 @@ or deptno in (select deptno from emp where gender = 'M');
select * from dept
where deptno in (select deptno from emp where gender = 'F')
or exists (select 99, 101 from emp where gender = 'X');
- DEPTNO | DNAME
---------+-------------
- 30 | Engineering
- 10 | Sales
++--------+-------------+
+| DEPTNO | DNAME |
++--------+-------------+
+| 10 | Sales |
+| 30 | Engineering |
++--------+-------------+
(2 rows)
!ok
@@ -222,9 +240,11 @@ where (deptno, deptno) in (select deptno * 2 - deptno, deptno from emp where gen
# Composite key, part literal
select * from emp
where (gender, deptno) in (select gender, 10 from emp where gender = 'F');
- ENAME | DEPTNO | GENDER
--------+--------+--------
- Jane | 10 | F
++-------+--------+--------+
+| ENAME | DEPTNO | GENDER |
++-------+--------+--------+
+| Jane | 10 | F |
++-------+--------+--------+
(1 row)
!ok
@@ -233,10 +253,12 @@ where (gender, deptno) in (select gender, 10 from emp where gender = 'F');
# [CALCITE-1155] Support columns for IN list
SELECT empno, ename, mgr FROM "scott".emp WHERE 7782 IN (empno, mgr);
- EMPNO | ENAME | MGR
--------+--------+------
- 7782 | CLARK | 7839
- 7934 | MILLER | 7782
++-------+--------+------+
+| EMPNO | ENAME | MGR |
++-------+--------+------+
+| 7782 | CLARK | 7839 |
+| 7934 | MILLER | 7782 |
++-------+--------+------+
(2 rows)
!ok
@@ -247,9 +269,11 @@ FROM "scott".emp
GROUP BY emp.deptno
HAVING sum(case when emp.empno in (7369, 7839, 7902) then emp.sal else 0 end)
BETWEEN 5000.0 AND 10000.0;
- C
----
- 3
++---+
+| C |
++---+
+| 3 |
++---+
(1 row)
!ok
@@ -260,11 +284,13 @@ SELECT emp.deptno
FROM "scott".emp
GROUP BY emp.deptno
HAVING max(emp.empno) > (SELECT min(emp.empno) FROM "scott".emp);
- DEPTNO
---------
- 10
- 20
- 30
++--------+
+| DEPTNO |
++--------+
+| 10 |
+| 20 |
+| 30 |
++--------+
(3 rows)
!ok
@@ -275,11 +301,13 @@ SELECT emp.deptno,
max(emp.empno) > (SELECT min(emp.empno) FROM "scott".emp) as bbbb
FROM "scott".emp
GROUP BY emp.deptno;
- DEPTNO | BBBB
---------+------
- 10 | true
- 20 | true
- 30 | true
++--------+------+
+| DEPTNO | BBBB |
++--------+------+
+| 10 | true |
+| 20 | true |
+| 30 | true |
++--------+------+
(3 rows)
!ok
@@ -288,9 +316,11 @@ GROUP BY emp.deptno;
select count(*) as c
from "scott".emp
group by (select deptno from "scott".emp where empno = 10);
- C
-----
- 14
++----+
+| C |
++----+
+| 14 |
++----+
(1 row)
!ok
@@ -350,12 +380,14 @@ where sal = (
from "scott".emp as e2
join "scott".dept as d2 using (deptno)
where d2.deptno = d.deptno);
- EMPNO | ENAME | JOB | MGR | HIREDATE | SAL | COMM | DEPTNO | DEPTNO0 | DNAME | LOC
--------+-------+-----------+------+------------+---------+------+--------+---------+------------+----------
- 7698 | BLAKE | MANAGER | 7839 | 1981-01-05 | 2850.00 | | 30 | 30 | SALES | CHICAGO
- 7788 | SCOTT | ANALYST | 7566 | 1987-04-19 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS
- 7839 | KING | PRESIDENT | | 1981-11-17 | 5000.00 | | 10 | 10 | ACCOUNTING | NEW YORK
- 7902 | FORD | ANALYST | 7566 | 1981-12-03 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS
++-------+-------+-----------+------+------------+---------+------+--------+---------+------------+----------+
+| EMPNO | ENAME | JOB | MGR | HIREDATE | SAL | COMM | DEPTNO | DEPTNO0 | DNAME | LOC |
++-------+-------+-----------+------+------------+---------+------+--------+---------+------------+----------+
+| 7698 | BLAKE | MANAGER | 7839 | 1981-01-05 | 2850.00 | | 30 | 30 | SALES | CHICAGO |
+| 7788 | SCOTT | ANALYST | 7566 | 1987-04-19 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7839 | KING | PRESIDENT | | 1981-11-17 | 5000.00 | | 10 | 10 | ACCOUNTING | NEW YORK |
+| 7902 | FORD | ANALYST | 7566 | 1981-12-03 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS |
++-------+-------+-----------+------+------------+---------+------+--------+---------+------------+----------+
(4 rows)
!ok
@@ -368,12 +400,14 @@ where e.sal = (
select max(sal)
from "scott".emp as e2
where e2.deptno = e.deptno);
- EMPNO | ENAME | SAL | DEPTNO | LOC
--------+-------+---------+--------+----------
- 7698 | BLAKE | 2850.00 | 30 | CHICAGO
- 7788 | SCOTT | 3000.00 | 20 | DALLAS
- 7839 | KING | 5000.00 | 10 | NEW YORK
- 7902 | FORD | 3000.00 | 20 | DALLAS
++-------+-------+---------+--------+----------+
+| EMPNO | ENAME | SAL | DEPTNO | LOC |
++-------+-------+---------+--------+----------+
+| 7698 | BLAKE | 2850.00 | 30 | CHICAGO |
+| 7788 | SCOTT | 3000.00 | 20 | DALLAS |
+| 7839 | KING | 5000.00 | 10 | NEW YORK |
+| 7902 | FORD | 3000.00 | 20 | DALLAS |
++-------+-------+---------+--------+----------+
(4 rows)
!ok
@@ -386,22 +420,24 @@ where d.dname = (
select max(dname)
from "scott".dept as d2
where d2.deptno = d.deptno);
- EMPNO | ENAME | JOB | MGR | HIREDATE | SAL | COMM | DEPTNO | DEPTNO0 | DNAME | LOC
--------+--------+-----------+------+------------+---------+---------+--------+---------+------------+----------
- 7369 | SMITH | CLERK | 7902 | 1980-12-17 | 800.00 | | 20 | 20 | RESEARCH | DALLAS
- 7499 | ALLEN | SALESMAN | 7698 | 1981-02-20 | 1600.00 | 300.00 | 30 | 30 | SALES | CHICAGO
- 7521 | WARD | SALESMAN | 7698 | 1981-02-22 | 1250.00 | 500.00 | 30 | 30 | SALES | CHICAGO
- 7566 | JONES | MANAGER | 7839 | 1981-02-04 | 2975.00 | | 20 | 20 | RESEARCH | DALLAS
- 7654 | MARTIN | SALESMAN | 7698 | 1981-09-28 | 1250.00 | 1400.00 | 30 | 30 | SALES | CHICAGO
- 7698 | BLAKE | MANAGER | 7839 | 1981-01-05 | 2850.00 | | 30 | 30 | SALES | CHICAGO
- 7782 | CLARK | MANAGER | 7839 | 1981-06-09 | 2450.00 | | 10 | 10 | ACCOUNTING | NEW YORK
- 7788 | SCOTT | ANALYST | 7566 | 1987-04-19 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS
- 7839 | KING | PRESIDENT | | 1981-11-17 | 5000.00 | | 10 | 10 | ACCOUNTING | NEW YORK
- 7844 | TURNER | SALESMAN | 7698 | 1981-09-08 | 1500.00 | 0.00 | 30 | 30 | SALES | CHICAGO
- 7876 | ADAMS | CLERK | 7788 | 1987-05-23 | 1100.00 | | 20 | 20 | RESEARCH | DALLAS
- 7900 | JAMES | CLERK | 7698 | 1981-12-03 | 950.00 | | 30 | 30 | SALES | CHICAGO
- 7902 | FORD | ANALYST | 7566 | 1981-12-03 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS
- 7934 | MILLER | CLERK | 7782 | 1982-01-23 | 1300.00 | | 10 | 10 | ACCOUNTING | NEW YORK
++-------+--------+-----------+------+------------+---------+---------+--------+---------+------------+----------+
+| EMPNO | ENAME | JOB | MGR | HIREDATE | SAL | COMM | DEPTNO | DEPTNO0 | DNAME | LOC |
++-------+--------+-----------+------+------------+---------+---------+--------+---------+------------+----------+
+| 7369 | SMITH | CLERK | 7902 | 1980-12-17 | 800.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7499 | ALLEN | SALESMAN | 7698 | 1981-02-20 | 1600.00 | 300.00 | 30 | 30 | SALES | CHICAGO |
+| 7521 | WARD | SALESMAN | 7698 | 1981-02-22 | 1250.00 | 500.00 | 30 | 30 | SALES | CHICAGO |
+| 7566 | JONES | MANAGER | 7839 | 1981-02-04 | 2975.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7654 | MARTIN | SALESMAN | 7698 | 1981-09-28 | 1250.00 | 1400.00 | 30 | 30 | SALES | CHICAGO |
+| 7698 | BLAKE | MANAGER | 7839 | 1981-01-05 | 2850.00 | | 30 | 30 | SALES | CHICAGO |
+| 7782 | CLARK | MANAGER | 7839 | 1981-06-09 | 2450.00 | | 10 | 10 | ACCOUNTING | NEW YORK |
+| 7788 | SCOTT | ANALYST | 7566 | 1987-04-19 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7839 | KING | PRESIDENT | | 1981-11-17 | 5000.00 | | 10 | 10 | ACCOUNTING | NEW YORK |
+| 7844 | TURNER | SALESMAN | 7698 | 1981-09-08 | 1500.00 | 0.00 | 30 | 30 | SALES | CHICAGO |
+| 7876 | ADAMS | CLERK | 7788 | 1987-05-23 | 1100.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7900 | JAMES | CLERK | 7698 | 1981-12-03 | 950.00 | | 30 | 30 | SALES | CHICAGO |
+| 7902 | FORD | ANALYST | 7566 | 1981-12-03 | 3000.00 | | 20 | 20 | RESEARCH | DALLAS |
+| 7934 | MILLER | CLERK | 7782 | 1982-01-23 | 1300.00 | | 10 | 10 | ACCOUNTING | NEW YORK |
++-------+--------+-----------+------+------------+---------+---------+--------+---------+------------+----------+
(14 rows)
!ok
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/core/src/test/resources/sql/winagg.iq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/winagg.iq b/core/src/test/resources/sql/winagg.iq
index f7c6f54..c6013fa 100644
--- a/core/src/test/resources/sql/winagg.iq
+++ b/core/src/test/resources/sql/winagg.iq
@@ -16,7 +16,7 @@
# limitations under the License.
#
!use post
-!set outputformat psql
+!set outputformat mysql
# Multiple window functions sharing a single window
select count(*) over(partition by gender order by ename) as count1,
@@ -25,17 +25,19 @@ select count(*) over(partition by gender order by ename) as count1,
sum(deptno) over(partition by deptno order by ename) as sum2
from emp
order by sum1, sum2;
- COUNT1 | COUNT2 | SUM1 | SUM2
---------+--------+------+------
- 1 | 1 | 30 | 30
- 1 | 1 | 50 | 50
- 2 | 1 | 60 | 10
- 3 | 1 | 80 | 20
- 2 | 2 | 80 | 100
- 3 | 1 | 140 | 60
- 4 | 2 | 150 | 20
- 5 | 2 | 180 | 60
- 6 | 1 | 180 |
++--------+--------+------+------+
+| COUNT1 | COUNT2 | SUM1 | SUM2 |
++--------+--------+------+------+
+| 1 | 1 | 30 | 30 |
+| 1 | 1 | 50 | 50 |
+| 2 | 1 | 60 | 10 |
+| 3 | 1 | 80 | 20 |
+| 2 | 2 | 80 | 100 |
+| 3 | 1 | 140 | 60 |
+| 4 | 2 | 150 | 20 |
+| 5 | 2 | 180 | 60 |
+| 6 | 1 | 180 | |
++--------+--------+------+------+
(9 rows)
!ok
@@ -154,34 +156,38 @@ select *, count(*) over (order by deptno) as c from emp;
!ok
!}
select *, rank() over (order by deptno) as c from emp;
- ENAME | DEPTNO | GENDER | C
--------+--------+--------+---
- Jane | 10 | F | 1
- Bob | 10 | M | 1
- Eric | 20 | M | 3
- Susan | 30 | F | 4
- Alice | 30 | F | 4
- Adam | 50 | M | 6
- Eve | 50 | F | 6
- Grace | 60 | F | 8
- Wilma | | F | 9
++-------+--------+--------+---+
+| ENAME | DEPTNO | GENDER | C |
++-------+--------+--------+---+
+| Adam | 50 | M | 6 |
+| Alice | 30 | F | 4 |
+| Bob | 10 | M | 1 |
+| Eric | 20 | M | 3 |
+| Eve | 50 | F | 6 |
+| Grace | 60 | F | 8 |
+| Jane | 10 | F | 1 |
+| Susan | 30 | F | 4 |
+| Wilma | | F | 9 |
++-------+--------+--------+---+
(9 rows)
!ok
# Calcite does not yet generate tied ranks
select *, dense_rank() over (order by deptno) as c from emp;
- ENAME | DEPTNO | GENDER | C
--------+--------+--------+---
- Jane | 10 | F | 1
- Bob | 10 | M | 1
- Eric | 20 | M | 2
- Susan | 30 | F | 3
- Alice | 30 | F | 3
- Adam | 50 | M | 4
- Eve | 50 | F | 4
- Grace | 60 | F | 5
- Wilma | | F | 6
++-------+--------+--------+---+
+| ENAME | DEPTNO | GENDER | C |
++-------+--------+--------+---+
+| Adam | 50 | M | 4 |
+| Alice | 30 | F | 3 |
+| Bob | 10 | M | 1 |
+| Eric | 20 | M | 2 |
+| Eve | 50 | F | 4 |
+| Grace | 60 | F | 5 |
+| Jane | 10 | F | 1 |
+| Susan | 30 | F | 3 |
+| Wilma | | F | 6 |
++-------+--------+--------+---+
(9 rows)
!ok
@@ -199,17 +205,19 @@ select *,
row_number() over (partition by gender) as r4,
row_number() over () as r
from emp;
- ENAME | DEPTNO | GENDER | R1 | R2 | R3 | R4 | R
--------+--------+--------+----+----+----+----+---
- Wilma | | F | 9 | 1 | 1 | 1 | 1
- Eve | 50 | F | 7 | 2 | 1 | 2 | 2
- Jane | 10 | F | 1 | 2 | 1 | 3 | 3
- Grace | 60 | F | 8 | 1 | 1 | 4 | 4
- Susan | 30 | F | 4 | 1 | 1 | 5 | 5
- Alice | 30 | F | 5 | 2 | 2 | 6 | 6
- Adam | 50 | M | 6 | 1 | 2 | 1 | 7
- Eric | 20 | M | 3 | 1 | 1 | 2 | 8
- Bob | 10 | M | 2 | 1 | 2 | 3 | 9
++-------+--------+--------+----+----+----+----+---+
+| ENAME | DEPTNO | GENDER | R1 | R2 | R3 | R4 | R |
++-------+--------+--------+----+----+----+----+---+
+| Adam | 50 | M | 6 | 1 | 2 | 1 | 7 |
+| Alice | 30 | F | 5 | 2 | 2 | 6 | 6 |
+| Bob | 10 | M | 2 | 1 | 2 | 3 | 9 |
+| Eric | 20 | M | 3 | 1 | 1 | 2 | 8 |
+| Eve | 50 | F | 7 | 2 | 1 | 2 | 2 |
+| Grace | 60 | F | 8 | 1 | 1 | 4 | 4 |
+| Jane | 10 | F | 1 | 2 | 1 | 3 | 3 |
+| Susan | 30 | F | 4 | 1 | 1 | 5 | 5 |
+| Wilma | | F | 9 | 1 | 1 | 1 | 1 |
++-------+--------+--------+----+----+----+----+---+
(9 rows)
!ok
@@ -221,14 +229,16 @@ select deptno,
row_number() over (partition by deptno) as r
from emp
where gender = 'F';
- DEPTNO | ENAME | R
---------+-------+---
- 10 | Jane | 1
- 30 | Alice | 2
- 30 | Susan | 1
- 50 | Eve | 1
- 60 | Grace | 1
- | Wilma | 1
++--------+-------+---+
+| DEPTNO | ENAME | R |
++--------+-------+---+
+| 10 | Jane | 1 |
+| 30 | Alice | 2 |
+| 30 | Susan | 1 |
+| 50 | Eve | 1 |
+| 60 | Grace | 1 |
+| | Wilma | 1 |
++--------+-------+---+
(6 rows)
!ok
@@ -242,17 +252,19 @@ select *, count(*) over (order by deptno), first_value(ename) over (order by dep
# Without ORDER BY
select *, count(*) over (partition by deptno) as c from emp;
- ENAME | DEPTNO | GENDER | C
--------+--------+--------+---
- Adam | 50 | M | 2
- Alice | 30 | F | 2
- Bob | 10 | M | 2
- Eric | 20 | M | 1
- Eve | 50 | F | 2
- Grace | 60 | F | 1
- Jane | 10 | F | 2
- Susan | 30 | F | 2
- Wilma | | F | 1
++-------+--------+--------+---+
+| ENAME | DEPTNO | GENDER | C |
++-------+--------+--------+---+
+| Adam | 50 | M | 2 |
+| Alice | 30 | F | 2 |
+| Bob | 10 | M | 2 |
+| Eric | 20 | M | 1 |
+| Eve | 50 | F | 2 |
+| Grace | 60 | F | 1 |
+| Jane | 10 | F | 2 |
+| Susan | 30 | F | 2 |
+| Wilma | | F | 1 |
++-------+--------+--------+---+
(9 rows)
!ok
@@ -262,17 +274,19 @@ select deptno, gender, min(gender) over w1 as a, min(gender) over w2 as d
from emp
window w1 as (),
w2 as (partition by deptno);
- DEPTNO | GENDER | A | D
---------+--------+---+---
- 10 | F | F | F
- 10 | M | F | F
- 20 | M | F | M
- 30 | F | F | F
- 30 | F | F | F
- 50 | F | F | F
- 50 | M | F | F
- 60 | F | F | F
- | F | F | F
++--------+--------+---+---+
+| DEPTNO | GENDER | A | D |
++--------+--------+---+---+
+| 10 | F | F | F |
+| 10 | M | F | F |
+| 20 | M | F | M |
+| 30 | F | F | F |
+| 30 | F | F | F |
+| 50 | F | F | F |
+| 50 | M | F | F |
+| 60 | F | F | F |
+| | F | F | F |
++--------+--------+---+---+
(9 rows)
!ok
@@ -281,17 +295,19 @@ window w1 as (),
select deptno, gender, count(gender, deptno) over w1 as a
from emp
window w1 as ();
- DEPTNO | GENDER | A
---------+--------+---
- 10 | F | 8
- 10 | M | 8
- 20 | M | 8
- 30 | F | 8
- 30 | F | 8
- 50 | F | 8
- 50 | M | 8
- 60 | F | 8
- | F | 8
++--------+--------+---+
+| DEPTNO | GENDER | A |
++--------+--------+---+
+| 10 | F | 8 |
+| 10 | M | 8 |
+| 20 | M | 8 |
+| 30 | F | 8 |
+| 30 | F | 8 |
+| 50 | F | 8 |
+| 50 | M | 8 |
+| 60 | F | 8 |
+| | F | 8 |
++--------+--------+---+
(9 rows)
!ok
http://git-wip-us.apache.org/repos/asf/calcite/blob/eadc6766/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index ddaba57..723b39c 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -381,7 +381,7 @@ $ sudo make install
Then, re-generate the compiled code:
{% highlight bash %}
-$ cd avatica
+$ cd avatica/core
$ ./src/main/scripts/generate-protobuf.sh
{% endhighlight %}