From c364443e5cb615e4c67cdb38a989674d5419a659 Mon Sep 17 00:00:00 2001 From: Reid Chan Date: Thu, 6 May 2021 11:39:33 +0800 Subject: [PATCH] HBASE-25831 [branch-1] remove thrift examples out of hbase-examples module for bypassing the thrift version check (#3212) --- hbase-examples/pom.xml | 8 -------- hbase-thrift/pom.xml | 8 ++++---- .../src/main/cpp/DemoClient.cpp | 0 {hbase-examples => hbase-thrift}/src/main/cpp/Makefile | 0 .../src/main/cpp/gen-cpp/Hbase.cpp | 0 .../src/main/cpp/gen-cpp/Hbase.h | 0 .../src/main/cpp/gen-cpp/Hbase_constants.cpp | 0 .../src/main/cpp/gen-cpp/Hbase_constants.h | 0 .../src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp | 0 .../src/main/cpp/gen-cpp/Hbase_types.cpp | 0 .../src/main/cpp/gen-cpp/Hbase_types.h | 0 .../java/org/apache/hadoop/hbase/thrift/DemoClient.java | 0 .../org/apache/hadoop/hbase/thrift/HttpDoAsClient.java | 0 .../java/org/apache/hadoop/hbase/thrift2/DemoClient.java | 0 .../src/main/perl/DemoClient.pl | 0 .../src/main/perl/gen-perl/Hbase/Constants.pm | 0 .../src/main/perl/gen-perl/Hbase/Hbase.pm | 0 .../src/main/perl/gen-perl/Hbase/Types.pm | 0 .../src/main/php/DemoClient.php | 0 .../src/main/php/gen-php/Hbase/Hbase.php | 0 .../src/main/php/gen-php/Hbase/Types.php | 0 .../src/main/python/thrift1/DemoClient.py | 0 .../src/main/python/thrift1/gen-py/hbase/Hbase-remote | 0 .../src/main/python/thrift1/gen-py/hbase/Hbase.py | 0 .../src/main/python/thrift1/gen-py/hbase/__init__.py | 0 .../src/main/python/thrift1/gen-py/hbase/constants.py | 0 .../src/main/python/thrift1/gen-py/hbase/ttypes.py | 0 .../src/main/python/thrift2/DemoClient.py | 0 .../main/python/thrift2/gen-py/hbase/THBaseService-remote | 0 .../src/main/python/thrift2/gen-py/hbase/THBaseService.py | 0 .../src/main/python/thrift2/gen-py/hbase/__init__.py | 0 .../src/main/python/thrift2/gen-py/hbase/constants.py | 0 .../src/main/python/thrift2/gen-py/hbase/ttypes.py | 0 .../src/main/ruby/DemoClient.rb | 0 .../src/main/ruby/gen-rb/hbase.rb | 0 .../src/main/ruby/gen-rb/hbase_constants.rb | 0 .../src/main/ruby/gen-rb/hbase_types.rb | 0 .../src/main/ruby/index-builder-setup.rb | 0 38 files changed, 4 insertions(+), 12 deletions(-) rename {hbase-examples => hbase-thrift}/src/main/cpp/DemoClient.cpp (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/Makefile (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase.cpp (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase.h (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase_constants.cpp (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase_constants.h (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase_types.cpp (100%) rename {hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase_types.h (100%) rename {hbase-examples => hbase-thrift}/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java (100%) rename {hbase-examples => hbase-thrift}/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java (100%) rename {hbase-examples => hbase-thrift}/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java (100%) rename {hbase-examples => hbase-thrift}/src/main/perl/DemoClient.pl (100%) rename {hbase-examples => hbase-thrift}/src/main/perl/gen-perl/Hbase/Constants.pm (100%) rename {hbase-examples => hbase-thrift}/src/main/perl/gen-perl/Hbase/Hbase.pm (100%) rename {hbase-examples => hbase-thrift}/src/main/perl/gen-perl/Hbase/Types.pm (100%) rename {hbase-examples => hbase-thrift}/src/main/php/DemoClient.php (100%) rename {hbase-examples => hbase-thrift}/src/main/php/gen-php/Hbase/Hbase.php (100%) rename {hbase-examples => hbase-thrift}/src/main/php/gen-php/Hbase/Types.php (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/DemoClient.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/gen-py/hbase/Hbase-remote (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/gen-py/hbase/Hbase.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/gen-py/hbase/__init__.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/gen-py/hbase/constants.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift1/gen-py/hbase/ttypes.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/DemoClient.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/gen-py/hbase/THBaseService-remote (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/gen-py/hbase/THBaseService.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/gen-py/hbase/__init__.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/gen-py/hbase/constants.py (100%) rename {hbase-examples => hbase-thrift}/src/main/python/thrift2/gen-py/hbase/ttypes.py (100%) rename {hbase-examples => hbase-thrift}/src/main/ruby/DemoClient.rb (100%) rename {hbase-examples => hbase-thrift}/src/main/ruby/gen-rb/hbase.rb (100%) rename {hbase-examples => hbase-thrift}/src/main/ruby/gen-rb/hbase_constants.rb (100%) rename {hbase-examples => hbase-thrift}/src/main/ruby/gen-rb/hbase_types.rb (100%) rename {hbase-examples => hbase-thrift}/src/main/ruby/index-builder-setup.rb (100%) diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 01d98a3cf7f..d902cfd97e2 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -183,20 +183,12 @@ - - org.apache.hbase - hbase-thrift - org.apache.hbase hbase-testing-util test - - org.apache.thrift - libthrift - commons-logging commons-logging diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 8b9baef1f5c..a752ba7ba0d 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -349,10 +349,10 @@ org.apache.thrift libthrift - - javax.annotation - javax.annotation-api - + + javax.annotation + javax.annotation-api + diff --git a/hbase-examples/src/main/cpp/DemoClient.cpp b/hbase-thrift/src/main/cpp/DemoClient.cpp similarity index 100% rename from hbase-examples/src/main/cpp/DemoClient.cpp rename to hbase-thrift/src/main/cpp/DemoClient.cpp diff --git a/hbase-examples/src/main/cpp/Makefile b/hbase-thrift/src/main/cpp/Makefile similarity index 100% rename from hbase-examples/src/main/cpp/Makefile rename to hbase-thrift/src/main/cpp/Makefile diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase.cpp b/hbase-thrift/src/main/cpp/gen-cpp/Hbase.cpp similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase.cpp rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase.cpp diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase.h b/hbase-thrift/src/main/cpp/gen-cpp/Hbase.h similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase.h rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase.h diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.cpp b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.cpp similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.cpp rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.cpp diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.h b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.h similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.h rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.h diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_types.cpp b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.cpp similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_types.cpp rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.cpp diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_types.h b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.h similarity index 100% rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_types.h rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.h diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java similarity index 100% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java rename to hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java similarity index 100% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java rename to hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java similarity index 100% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java rename to hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java diff --git a/hbase-examples/src/main/perl/DemoClient.pl b/hbase-thrift/src/main/perl/DemoClient.pl similarity index 100% rename from hbase-examples/src/main/perl/DemoClient.pl rename to hbase-thrift/src/main/perl/DemoClient.pl diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Constants.pm b/hbase-thrift/src/main/perl/gen-perl/Hbase/Constants.pm similarity index 100% rename from hbase-examples/src/main/perl/gen-perl/Hbase/Constants.pm rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Constants.pm diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Hbase.pm b/hbase-thrift/src/main/perl/gen-perl/Hbase/Hbase.pm similarity index 100% rename from hbase-examples/src/main/perl/gen-perl/Hbase/Hbase.pm rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Hbase.pm diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Types.pm b/hbase-thrift/src/main/perl/gen-perl/Hbase/Types.pm similarity index 100% rename from hbase-examples/src/main/perl/gen-perl/Hbase/Types.pm rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Types.pm diff --git a/hbase-examples/src/main/php/DemoClient.php b/hbase-thrift/src/main/php/DemoClient.php similarity index 100% rename from hbase-examples/src/main/php/DemoClient.php rename to hbase-thrift/src/main/php/DemoClient.php diff --git a/hbase-examples/src/main/php/gen-php/Hbase/Hbase.php b/hbase-thrift/src/main/php/gen-php/Hbase/Hbase.php similarity index 100% rename from hbase-examples/src/main/php/gen-php/Hbase/Hbase.php rename to hbase-thrift/src/main/php/gen-php/Hbase/Hbase.php diff --git a/hbase-examples/src/main/php/gen-php/Hbase/Types.php b/hbase-thrift/src/main/php/gen-php/Hbase/Types.php similarity index 100% rename from hbase-examples/src/main/php/gen-php/Hbase/Types.php rename to hbase-thrift/src/main/php/gen-php/Hbase/Types.php diff --git a/hbase-examples/src/main/python/thrift1/DemoClient.py b/hbase-thrift/src/main/python/thrift1/DemoClient.py similarity index 100% rename from hbase-examples/src/main/python/thrift1/DemoClient.py rename to hbase-thrift/src/main/python/thrift1/DemoClient.py diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase-remote b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase-remote similarity index 100% rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase-remote rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase-remote diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase.py b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase.py similarity index 100% rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase.py rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase.py diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/__init__.py b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/__init__.py similarity index 100% rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/__init__.py rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/__init__.py diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/constants.py b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/constants.py similarity index 100% rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/constants.py rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/constants.py diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/ttypes.py b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/ttypes.py similarity index 100% rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/ttypes.py rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/ttypes.py diff --git a/hbase-examples/src/main/python/thrift2/DemoClient.py b/hbase-thrift/src/main/python/thrift2/DemoClient.py similarity index 100% rename from hbase-examples/src/main/python/thrift2/DemoClient.py rename to hbase-thrift/src/main/python/thrift2/DemoClient.py diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService-remote b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService-remote similarity index 100% rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService-remote rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService-remote diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService.py b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService.py similarity index 100% rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService.py rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService.py diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/__init__.py b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/__init__.py similarity index 100% rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/__init__.py rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/__init__.py diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/constants.py b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/constants.py similarity index 100% rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/constants.py rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/constants.py diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/ttypes.py b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/ttypes.py similarity index 100% rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/ttypes.py rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/ttypes.py diff --git a/hbase-examples/src/main/ruby/DemoClient.rb b/hbase-thrift/src/main/ruby/DemoClient.rb similarity index 100% rename from hbase-examples/src/main/ruby/DemoClient.rb rename to hbase-thrift/src/main/ruby/DemoClient.rb diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase.rb b/hbase-thrift/src/main/ruby/gen-rb/hbase.rb similarity index 100% rename from hbase-examples/src/main/ruby/gen-rb/hbase.rb rename to hbase-thrift/src/main/ruby/gen-rb/hbase.rb diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase_constants.rb b/hbase-thrift/src/main/ruby/gen-rb/hbase_constants.rb similarity index 100% rename from hbase-examples/src/main/ruby/gen-rb/hbase_constants.rb rename to hbase-thrift/src/main/ruby/gen-rb/hbase_constants.rb diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase_types.rb b/hbase-thrift/src/main/ruby/gen-rb/hbase_types.rb similarity index 100% rename from hbase-examples/src/main/ruby/gen-rb/hbase_types.rb rename to hbase-thrift/src/main/ruby/gen-rb/hbase_types.rb diff --git a/hbase-examples/src/main/ruby/index-builder-setup.rb b/hbase-thrift/src/main/ruby/index-builder-setup.rb similarity index 100% rename from hbase-examples/src/main/ruby/index-builder-setup.rb rename to hbase-thrift/src/main/ruby/index-builder-setup.rb