Skip to content
Permalink
Browse files
DRILL-6925: Unable to generate Protobuf
- use ${maven.multiModuleProjectDirectory}/header to find header file from any submodule
- suppress UnresolvedMavenProperty, since IDE expects that property should be set explicitly
- update "kr.motd.maven:os-maven-plugin" github.com/trustin/os-maven-plugin to the latest 1.6.1 version
- correction of ${user.name} propery for "maven-jar-plugin" <Built-By>
- update "apache-rat-plugin" to solve undefined "excludeSubprojects" in IDE
- regenerate Java and C++ protobuf files

closes #1585
  • Loading branch information
vdiravka committed Dec 24, 2018
1 parent af3977a commit 4a771d0af83beccbb0a7fc9f03b22966c1292724
Show file tree
Hide file tree
Showing 7 changed files with 133 additions and 17 deletions.
@@ -22,6 +22,6 @@ under the License.
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.5.0.Final</version>
<version>1.6.1</version>
</extension>
</extensions>

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -67,9 +67,9 @@ public SSLConfigClient(Properties properties) throws DrillException {
// the dependency on netty-tcnative with the correct classifier for the platform you use.
// This can be done by enabling the openssl profile.
// If the IDE is Eclipse, it requires you to install an additional Eclipse plugin available here:
// http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
// http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
// or from your local maven repository:
// ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
// ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
// Note that installing this plugin may require you to start with a new workspace
provider = getStringProperty(DrillProperties.TLS_PROVIDER, DEFAULT_SSL_PROVIDER);
}
@@ -95,9 +95,9 @@ public SSLConfigServer(DrillConfig config, Configuration hadoopConfig) throws Dr
// the dependency on netty-tcnative with the correct classifier for the platform you use.
// This can be done by enabling the openssl profile.
// If the IDE is Eclipse, it requires you to install an additional Eclipse plugin available here:
// http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
// http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
// or from your local maven repository:
// ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
// ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
// Note that installing this plugin may require you to start with a new workspace
provider = getConfigParamWithDefault(ExecConstants.SSL_PROVIDER, DEFAULT_SSL_PROVIDER);
}
10 pom.xml
@@ -320,6 +320,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.13</version>
<executions>
<execution>
<id>rat-checks</id>
@@ -446,7 +447,7 @@
</manifest>
<manifestEntries>
<Extension-Name>org.apache.drill</Extension-Name>
<Built-By>${username}</Built-By>
<Built-By>${user.name}</Built-By>
<url>http://drill.apache.org/</url>
</manifestEntries>
</archive>
@@ -587,7 +588,8 @@
<version>3.0</version>
<configuration>
<aggregate>true</aggregate>
<header>header</header>
<!--suppress UnresolvedMavenProperty -->
<header>${maven.multiModuleProjectDirectory}/header</header>
<excludes>
<exclude>**/clientlib/y2038/*.c</exclude> <!-- All the files here should have MIT License -->
<exclude>**/clientlib/y2038/*.h</exclude> <!-- All the files here should have MIT License -->
@@ -3349,9 +3351,9 @@
<profile>
<!--
If the IDE is Eclipse, it requires you to install an additional Eclipse plugin available here:
http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
or from your local maven repository:
~/.m2/repository/kr/motd/maven/os-maven-plugin/1.5.0.Final/os-maven-plugin-1.5.0.Final.jar
~/.m2/repository/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
Note that installing this plugin may require you to start with a new workspace
-->
<id>openssl</id>
@@ -6800,10 +6800,20 @@ org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder getFieldOrBui
// optional int32 affected_rows_count = 4;
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
boolean hasAffectedRowsCount();
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
int getAffectedRowsCount();
}
@@ -6997,12 +7007,22 @@ public boolean getCarriesTwoByteSelectionVector() {
private int affectedRowsCount_;
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public boolean hasAffectedRowsCount() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public int getAffectedRowsCount() {
return affectedRowsCount_;
@@ -7629,18 +7649,33 @@ public Builder clearCarriesTwoByteSelectionVector() {
private int affectedRowsCount_ ;
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public boolean hasAffectedRowsCount() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public int getAffectedRowsCount() {
return affectedRowsCount_;
}
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public Builder setAffectedRowsCount(int value) {
bitField0_ |= 0x00000008;
@@ -7650,6 +7685,11 @@ public Builder setAffectedRowsCount(int value) {
}
/**
* <code>optional int32 affected_rows_count = 4;</code>
*
* <pre>
* The value is set when result set is disabled and its value corresponds to number
* of rows affected by query (see JDBC java.sql.ResultSet#getUpdateCount())
* </pre>
*/
public Builder clearAffectedRowsCount() {
bitField0_ = (bitField0_ & ~0x00000008);

0 comments on commit 4a771d0

Please sign in to comment.