accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From John Vines <john.w.vi...@ugov.gov>
Subject Re: After pulling new trunk and compiling, thrift generated files show changes in 'svn status'
Date Thu, 26 Jul 2012 00:15:45 GMT
Ignore for now. I commented on this in the thrift .8 ticket and Keith
noticed it today as well.

Sent from my phone, so pardon the typos and brevity.
On Jul 25, 2012 6:46 PM, "David Medinets" <david.medinets@gmail.com> wrote:

> I pulled trunk into a new directory. Then ran 'mvn package -P
> assemble'. Then ran 'svn status'. Normally I see no changed files.
> However, this time I saw the following:
>
> $ svn status
> M
> core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
> M
> core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
> M
> core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
> M
> core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
> M
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
> M
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
> M
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
> M
> core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
> M
> core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
>
> I assume these are generated files? Here is a sample of the differences;
>
> medined@affy:~/workspace/accumulo_trunk$ svn diff
>
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
> Index:
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
> ===================================================================
> ---
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
>       (revision 1365779)
> +++
> core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
>       (working copy)
> @@ -601,7 +601,7 @@
>                  for (int _i45 = 0; _i45 < _map44.size; ++_i45)
>                  {
>                    String _key46; // required
> -                  String _val47; // optional
> +                  String _val47; // required
>                    _key46 = iprot.readString();
>                    _val47 = iprot.readString();
>                    struct.properties.put(_key46, _val47);
> @@ -729,7 +729,7 @@
>            for (int _i51 = 0; _i51 < _map50.size; ++_i51)
>            {
>              String _key52; // required
> -            String _val53; // optional
> +            String _val53; // required
>              _key52 = iprot.readString();
>              _val53 = iprot.readString();
>              struct.properties.put(_key52, _val53);
>
> Should these files be ignored? Checked back in? Recommendations?
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message