From commits-return-8846-archive-asf-public=cust-asf.ponee.io@trafodion.apache.org Mon Feb 11 19:25:56 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 31D63180648 for ; Mon, 11 Feb 2019 20:25:55 +0100 (CET) Received: (qmail 57583 invoked by uid 500); 11 Feb 2019 19:25:54 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 57574 invoked by uid 99); 11 Feb 2019 19:25:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2019 19:25:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B1E6C82940; Mon, 11 Feb 2019 19:25:53 +0000 (UTC) Date: Mon, 11 Feb 2019 19:25:52 +0000 To: "commits@trafodion.apache.org" Subject: [trafodion] branch master updated (1262fd9 -> edbcda0) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154991315216.2222.15883829695542142970@gitbox.apache.org> From: sbroeder@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: trafodion X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1262fd9c8eaab68154a6c7e007ec49e048895b24 X-Git-Newrev: edbcda08c81e880662b65c4bc4e0b3b7767b9212 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sbroeder pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 1262fd9 Merge pull request #1790 from apache/sean_traf_2.4 add 9aad245 Merge branch 'master' of github.com:apache/trafodion into sean_traf_2.4 add 097d52c Fix for [Trafodion-3244] Need to provide support for HDP 2.5.x and 2.6.x Various files needed to correctly build modified protos and remain backward compatible add 2c398b0 Adding apache license to generated protobuf files add 0ad7cf3 Added Apache license to new file copy_proto add 53a3e45 White space adjustment new edbcda0 Merge pull request #1792 from apache/sean_traf_2.4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/sqf/src/seatrans/hbase-trx/Makefile | 198 +- core/sqf/src/seatrans/hbase-trx/copy_proto | 35 + core/sqf/src/seatrans/hbase-trx/genvers | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../README.txt | 2 +- .../google/protobuf/HBaseZeroCopyByteString.java | 0 .../protobuf/generated/AccessControlProtos.java | 0 .../hbase/protobuf/generated/AdminProtos.java | 0 .../hbase/protobuf/generated/AggregateProtos.java | 0 .../protobuf/generated/AuthenticationProtos.java | 0 .../hbase/protobuf/generated/CellProtos.java | 0 .../hbase/protobuf/generated/ClientProtos.java | 0 .../hbase/protobuf/generated/ClusterIdProtos.java | 0 .../protobuf/generated/ClusterStatusProtos.java | 0 .../hbase/protobuf/generated/ComparatorProtos.java | 0 .../hbase/protobuf/generated/EncryptionProtos.java | 0 .../protobuf/generated/ErrorHandlingProtos.java | 0 .../hadoop/hbase/protobuf/generated/FSProtos.java | 0 .../hbase/protobuf/generated/FilterProtos.java | 0 .../hbase/protobuf/generated/HBaseProtos.java | 0 .../hbase/protobuf/generated/HFileProtos.java | 0 .../protobuf/generated/LoadBalancerProtos.java | 0 .../hbase/protobuf/generated/MapReduceProtos.java | 0 .../hbase/protobuf/generated/MasterProtos.java | 0 .../protobuf/generated/MultiRowMutationProtos.java | 0 .../hadoop/hbase/protobuf/generated/RPCProtos.java | 0 .../generated/RegionServerStatusProtos.java | 0 .../protobuf/generated/RowProcessorProtos.java | 0 .../protobuf/generated/SecureBulkLoadProtos.java | 0 .../hbase/protobuf/generated/TracingProtos.java | 0 .../protobuf/generated/VisibilityLabelsProtos.java | 0 .../hadoop/hbase/protobuf/generated/WALProtos.java | 0 .../hbase/protobuf/generated/ZooKeeperProtos.java | 0 .../src/main/protobuf/AccessControl.proto | 0 .../src/main/protobuf/Admin.proto | 0 .../src/main/protobuf/Aggregate.proto | 0 .../src/main/protobuf/Authentication.proto | 0 .../src/main/protobuf/Cell.proto | 0 .../src/main/protobuf/Client.proto | 0 .../src/main/protobuf/ClusterId.proto | 0 .../src/main/protobuf/ClusterStatus.proto | 0 .../src/main/protobuf/Comparator.proto | 0 .../src/main/protobuf/Encryption.proto | 0 .../src/main/protobuf/ErrorHandling.proto | 0 .../src/main/protobuf/FS.proto | 0 .../src/main/protobuf/Filter.proto | 0 .../src/main/protobuf/HBase.proto | 0 .../src/main/protobuf/HFile.proto | 0 .../src/main/protobuf/LoadBalancer.proto | 0 .../src/main/protobuf/MapReduce.proto | 0 .../src/main/protobuf/Master.proto | 0 .../src/main/protobuf/MultiRowMutation.proto | 0 .../src/main/protobuf/RPC.proto | 0 .../src/main/protobuf/RegionServerStatus.proto | 0 .../src/main/protobuf/RowProcessor.proto | 0 .../src/main/protobuf/SecureBulkLoad.proto | 0 .../src/main/protobuf/Tracing.proto | 0 .../src/main/protobuf/VisibilityLabels.proto | 0 .../src/main/protobuf/WAL.proto | 0 .../src/main/protobuf/ZooKeeper.proto | 0 core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 29 + core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 31 +- core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 31 + core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 30 + core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 30 + core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 113 +- core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 29 + .../hbase-trx/{pom.xml.hdp => pom.xml.hdp263} | 44 +- core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 14 + core/sqf/src/seatrans/hbase-trx/pom.xml.sscc | 15 + core/sqf/src/seatrans/hbase-trx/pp.awk | 21 + core/sqf/src/seatrans/hbase-trx/reinstate_orig | 2 +- .../hbase/client/PatchClientScanner.java.tmpl | 5 +- .../transactional/SplitBalanceHelper.java | 142 +- ...nceHelper.java => SplitBalanceHelper.java.tmpl} | 142 +- .../transactional/SsccRegionEndpoint.java.tmpl | 36 +- .../transactional/TrxRegionEndpoint.java.tmpl | 28 +- .../transactional/TrxRegionObserver.java.tmpl | 47 +- .../transactional/generated/SsccRegionProtos.java | 1 - ...egionProtos.java => SsccRegionProtos.java.nopb} | 1 - ...cRegionProtos.java => SsccRegionProtos.java.pb} | 1657 +++++++------- .../transactional/generated/TrxRegionProtos.java | 1 - ...RegionProtos.java => TrxRegionProtos.java.nopb} | 1 - ...rxRegionProtos.java => TrxRegionProtos.java.pb} | 2383 ++++++++++---------- .../transactional/KeyValueListScanner.java.tmpl | 3 +- .../{SsccRegion.proto => SsccRegion_pb.proto} | 2 + .../{TrxRegion.proto => TrxRegion_pb.proto} | 2 + core/sqf/src/seatrans/hbase-trx/uncomment_string | 3 +- 88 files changed, 2842 insertions(+), 2238 deletions(-) create mode 100755 core/sqf/src/seatrans/hbase-trx/copy_proto copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/.settings/org.eclipse.jdt.core.prefs (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/README.txt (95%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/AccessControl.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Admin.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Aggregate.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Authentication.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Cell.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Client.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ClusterId.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ClusterStatus.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Comparator.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Encryption.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ErrorHandling.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/FS.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Filter.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/HBase.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/HFile.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/LoadBalancer.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/MapReduce.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Master.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/MultiRowMutation.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RPC.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RegionServerStatus.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RowProcessor.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/SecureBulkLoad.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Tracing.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/VisibilityLabels.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/WAL.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ZooKeeper.proto (100%) copy core/sqf/src/seatrans/hbase-trx/{pom.xml.hdp => pom.xml.hdp263} (90%) mode change 100755 => 100644 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/{SplitBalanceHelper.java => SplitBalanceHelper.java.tmpl} (64%) copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{SsccRegionProtos.java => SsccRegionProtos.java.nopb} (99%) copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{SsccRegionProtos.java => SsccRegionProtos.java.pb} (95%) copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{TrxRegionProtos.java => TrxRegionProtos.java.nopb} (99%) copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{TrxRegionProtos.java => TrxRegionProtos.java.pb} (95%) copy core/sqf/src/seatrans/hbase-trx/src/main/protobuf/{SsccRegion.proto => SsccRegion_pb.proto} (99%) copy core/sqf/src/seatrans/hbase-trx/src/main/protobuf/{TrxRegion.proto => TrxRegion_pb.proto} (99%)