You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by nh...@apache.org on 2015/12/01 18:28:07 UTC
[7/7] incubator-hawq git commit: HAWQ-185. Remove unused PXF
regression tests
HAWQ-185. Remove unused PXF regression tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/7eeeec9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/7eeeec9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/7eeeec9d
Branch: refs/heads/master
Commit: 7eeeec9d4c14ede20380b6ef07616aa5cc7d9607
Parents: 8575d70
Author: Noa Horn <nh...@pivotal.io>
Authored: Tue Nov 24 11:54:31 2015 -0800
Committer: Noa Horn <nh...@pivotal.io>
Committed: Tue Dec 1 08:52:55 2015 -0800
----------------------------------------------------------------------
src/test/regress/GNUmakefile | 3 -
src/test/regress/data/pxf/CustomWritable.class | Bin 6717 -> 0 bytes
.../data/pxf/CustomWritableWithChar.class | Bin 1485 -> 0 bytes
.../data/pxf/CustomWritableWithCircle.class | Bin 1864 -> 0 bytes
src/test/regress/data/pxf/DummyAccessor.class | Bin 2020 -> 0 bytes
src/test/regress/data/pxf/DummyAnalyzer.class | Bin 524 -> 0 bytes
src/test/regress/data/pxf/DummyFragmenter.class | Bin 1349 -> 0 bytes
src/test/regress/data/pxf/DummyResolver.class | Bin 1883 -> 0 bytes
.../regress/data/pxf/avro_inside_sequence.tbl | Bin 4825 -> 0 bytes
.../data/pxf/avroformat_inside_avrofile.avro | Bin 8834 -> 0 bytes
.../regress/data/pxf/customwritable_data.txt | 50 -
.../data/pxf/customwritable_recordkey_data.txt | 50 -
src/test/regress/data/pxf/empty.tbl | 0
src/test/regress/data/pxf/hive_collections.txt | 4 -
src/test/regress/data/pxf/hive_small_data.txt | 10 -
src/test/regress/data/pxf/hive_types.txt | 19 -
.../data/pxf/regress PXF Custom Avro1.avsc | 21 -
.../regress/data/pxf/regressPXFCustomAvro.avsc | 21 -
src/test/regress/data/pxf/small.csv | 3 -
src/test/regress/data/pxf/text_data.csv | 30 -
.../data/pxf/writable_inside_sequence1.tbl | Bin 1414 -> 0 bytes
.../data/pxf/writable_inside_sequence2.tbl | Bin 2928 -> 0 bytes
src/test/regress/expected/.gitignore | 5 -
src/test/regress/helpers/.gitignore | 1 -
src/test/regress/helpers/CustomAvroFile.java | 300 ----
.../regress/helpers/CustomAvroRecInFile.java | 385 -----
.../helpers/CustomAvroRecInSequence.java | 407 -----
.../regress/helpers/CustomAvroSequence.java | 203 ---
src/test/regress/helpers/CustomWritable.java | 430 ------
.../regress/helpers/CustomWritableSequence.java | 238 ---
src/test/regress/helpers/DummyAccessor.java | 75 -
src/test/regress/helpers/DummyAnalyzer.java | 31 -
src/test/regress/helpers/DummyFragmenter.java | 38 -
src/test/regress/helpers/DummyResolver.java | 49 -
.../regress/helpers/HBaseChangeLookupTable.java | 175 ---
src/test/regress/helpers/HBaseCreateTables.java | 255 ----
src/test/regress/helpers/HBaseDropTables.java | 100 --
src/test/regress/helpers/Makefile | 33 -
src/test/regress/helpers/README.txt | 42 -
src/test/regress/helpers/create_table_file.sh | 13 -
src/test/regress/input/pxf_hbase.source | 202 ---
src/test/regress/input/pxf_hdfs.source | 560 -------
src/test/regress/input/pxf_hdfs_ext.source | 76 -
src/test/regress/input/pxf_hdfs_writable.source | 811 ----------
src/test/regress/input/pxf_hive.source | 251 ----
src/test/regress/output/pxf_hbase.source | 993 -------------
src/test/regress/output/pxf_hdfs.source | 1157 ---------------
src/test/regress/output/pxf_hdfs_ext.source | 113 --
.../regress/output/pxf_hdfs_writable.source | 1395 ------------------
src/test/regress/output/pxf_hive.source | 438 ------
src/test/regress/pxf_schedule | 5 -
src/test/regress/sql/.gitignore | 5 -
52 files changed, 8997 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/GNUmakefile
----------------------------------------------------------------------
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index e6bc3bc..7b3f51d 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -145,9 +145,6 @@ installcheck-parallel: all upg2-setup ugpart-setup
installcheck-good: all ./current_good_schedule upg2-setup ugpart-setup
$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=./current_good_schedule --srcdir=$(abs_srcdir)
-installcheck-pxf: all upg2-setup ugpart-setup
- $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=./pxf_schedule --srcdir=$(abs_srcdir)
-
installcheck-goh: all ./goh_schedule upg2-setup ugpart-setup
$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=./goh_schedule --srcdir=$(abs_srcdir) --tablespace=hdfs_ts
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/CustomWritable.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/CustomWritable.class b/src/test/regress/data/pxf/CustomWritable.class
deleted file mode 100644
index 9160ea3..0000000
Binary files a/src/test/regress/data/pxf/CustomWritable.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/CustomWritableWithChar.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/CustomWritableWithChar.class b/src/test/regress/data/pxf/CustomWritableWithChar.class
deleted file mode 100644
index c95096a..0000000
Binary files a/src/test/regress/data/pxf/CustomWritableWithChar.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/CustomWritableWithCircle.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/CustomWritableWithCircle.class b/src/test/regress/data/pxf/CustomWritableWithCircle.class
deleted file mode 100644
index 39f7e8c..0000000
Binary files a/src/test/regress/data/pxf/CustomWritableWithCircle.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/DummyAccessor.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/DummyAccessor.class b/src/test/regress/data/pxf/DummyAccessor.class
deleted file mode 100644
index 4ae8ed3..0000000
Binary files a/src/test/regress/data/pxf/DummyAccessor.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/DummyAnalyzer.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/DummyAnalyzer.class b/src/test/regress/data/pxf/DummyAnalyzer.class
deleted file mode 100644
index 6a1545a..0000000
Binary files a/src/test/regress/data/pxf/DummyAnalyzer.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/DummyFragmenter.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/DummyFragmenter.class b/src/test/regress/data/pxf/DummyFragmenter.class
deleted file mode 100644
index 98bb84f..0000000
Binary files a/src/test/regress/data/pxf/DummyFragmenter.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/DummyResolver.class
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/DummyResolver.class b/src/test/regress/data/pxf/DummyResolver.class
deleted file mode 100644
index 7b7b6b4..0000000
Binary files a/src/test/regress/data/pxf/DummyResolver.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/avro_inside_sequence.tbl
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/avro_inside_sequence.tbl b/src/test/regress/data/pxf/avro_inside_sequence.tbl
deleted file mode 100644
index cae01cd..0000000
Binary files a/src/test/regress/data/pxf/avro_inside_sequence.tbl and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/avroformat_inside_avrofile.avro
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/avroformat_inside_avrofile.avro b/src/test/regress/data/pxf/avroformat_inside_avrofile.avro
deleted file mode 100644
index cf61fe9..0000000
Binary files a/src/test/regress/data/pxf/avroformat_inside_avrofile.avro and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/customwritable_data.txt
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/customwritable_data.txt b/src/test/regress/data/pxf/customwritable_data.txt
deleted file mode 100644
index 7ff5e44..0000000
--- a/src/test/regress/data/pxf/customwritable_data.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Sep 11 10:00:00.0 2013 100 101 102 103 one_CPGWB two_CPGWB three_CPGWB four_CPGWB five_CPGWB six_CPGWB 0.2 0.15 0.6 22.22 1.1 11.11 2000 30000 18000 Rooney true false true
-Sep 11 10:00:00.1 2013 101 102 103 104 one_VQEPV two_VQEPV three_VQEPV four_VQEPV five_VQEPV six_VQEPV 0.21 0.16 0.4 15.15 21.21 17.17 21000 32000 12000 Rooney false true true
-Sep 11 10:00:00.2 2013 102 103 104 105 one_WQDHY two_WQDHY three_WQDHY four_WQDHY five_WQDHY six_WQDHY 0.22 0.16 0.3 7.7 24.24 20.20 22000 32000 9000 Rooney true true false
-Sep 11 10:00:00.3 2013 103 104 105 106 one_JTBNE two_JTBNE three_JTBNE four_JTBNE five_JTBNE six_JTBNE 0.9 0.19 0.1 13.13 4.4 12.12 9000 38000 3000 Rooney false false false
-Sep 11 10:00:00.4 2013 104 105 106 107 one_GHTMX two_GHTMX three_GHTMX four_GHTMX five_GHTMX six_GHTMX 0.6 0.7 0.19 12.12 23.23 10.10 6000 14000 57000 Rooney true false false
-Sep 11 10:00:00.5 2013 105 106 107 108 one_NAQAW two_NAQAW three_NAQAW four_NAQAW five_NAQAW six_NAQAW 0.13 0.0 0.16 0.0 22.22 1.1 13000 0 48000 Rooney false true true
-Sep 11 10:00:00.6 2013 106 107 108 109 one_DDTCG two_DDTCG three_DDTCG four_DDTCG five_DDTCG six_DDTCG 0.3 0.3 0.19 2.2 6.6 12.12 3000 6000 57000 Rooney false false false
-Sep 11 10:00:00.7 2013 107 108 109 110 one_DXXOU two_DXXOU three_DXXOU four_DXXOU five_DXXOU six_DXXOU 0.3 0.23 0.23 14.14 20.20 9.9 3000 46000 69000 Rooney false false false
-Sep 11 10:00:00.8 2013 108 109 110 111 one_JNMAR two_JNMAR three_JNMAR four_JNMAR five_JNMAR six_JNMAR 0.9 0.13 0.12 0.0 17.17 7.7 9000 26000 36000 Rooney false false true
-Sep 11 10:00:00.9 2013 109 110 111 112 one_AOFNS two_AOFNS three_AOFNS four_AOFNS five_AOFNS six_AOFNS 0.0 0.14 0.5 13.13 18.18 24.24 0 28000 15000 Rooney true true false
-Sep 11 10:00:00.10 2013 110 111 112 113 one_ICCPS two_ICCPS three_ICCPS four_ICCPS five_ICCPS six_ICCPS 0.8 0.2 0.2 15.15 18.18 0.0 8000 4000 6000 Rooney true true true
-Sep 11 10:00:00.11 2013 111 112 113 114 one_VMUVC two_VMUVC three_VMUVC four_VMUVC five_VMUVC six_VMUVC 0.21 0.12 0.20 21.21 2.2 23.23 21000 24000 60000 Rooney false true true
-Sep 11 10:00:00.12 2013 112 113 114 115 one_IGRJV two_IGRJV three_IGRJV four_IGRJV five_IGRJV six_IGRJV 0.8 0.6 0.17 9.9 21.21 9.9 8000 12000 51000 Rooney true true false
-Sep 11 10:00:00.13 2013 113 114 115 116 one_HXRRY two_HXRRY three_HXRRY four_HXRRY five_HXRRY six_HXRRY 0.7 0.23 0.17 17.17 24.24 0.0 7000 46000 51000 Rooney false false false
-Sep 11 10:00:00.14 2013 114 115 116 117 one_JMXNN two_JMXNN three_JMXNN four_JMXNN five_JMXNN six_JMXNN 0.9 0.12 0.23 13.13 13.13 2.2 9000 24000 69000 Rooney false true false
-Sep 11 10:00:00.15 2013 115 116 117 118 one_SWKIQ two_SWKIQ three_SWKIQ four_SWKIQ five_SWKIQ six_SWKIQ 0.18 0.22 0.10 8.8 16.16 2.2 18000 44000 30000 Rooney true true true
-Sep 11 10:00:00.16 2013 116 117 118 119 one_DNIVJ two_DNIVJ three_DNIVJ four_DNIVJ five_DNIVJ six_DNIVJ 0.3 0.13 0.8 21.21 9.9 7.7 3000 26000 24000 Rooney false false true
-Sep 11 10:00:00.17 2013 117 118 119 120 one_QTOUV two_QTOUV three_QTOUV four_QTOUV five_QTOUV six_QTOUV 0.16 0.19 0.14 20.20 21.21 9.9 16000 38000 42000 Rooney true false true
-Sep 11 10:00:00.18 2013 118 119 120 121 one_WSXRT two_WSXRT three_WSXRT four_WSXRT five_WSXRT six_WSXRT 0.22 0.18 0.23 17.17 19.19 13.13 22000 36000 69000 Rooney true true false
-Sep 11 10:00:00.19 2013 119 120 121 122 one_MWVEW two_MWVEW three_MWVEW four_MWVEW five_MWVEW six_MWVEW 0.12 0.22 0.21 4.4 22.22 0.0 12000 44000 63000 Rooney true true false
-Sep 11 10:00:00.20 2013 120 121 122 123 one_GASAC two_GASAC three_GASAC four_GASAC five_GASAC six_GASAC 0.6 0.0 0.18 0.0 2.2 4.4 6000 0 54000 Rooney true true true
-Sep 11 10:00:00.21 2013 121 122 123 124 one_JTHNW two_JTHNW three_JTHNW four_JTHNW five_JTHNW six_JTHNW 0.9 0.19 0.7 13.13 22.22 5.5 9000 38000 21000 Rooney false false false
-Sep 11 10:00:00.22 2013 122 123 124 125 one_VUWUB two_VUWUB three_VUWUB four_VUWUB five_VUWUB six_VUWUB 0.21 0.20 0.22 20.20 1.1 0.0 21000 40000 66000 Rooney false true true
-Sep 11 10:00:00.23 2013 123 124 125 126 one_KIRJY two_KIRJY three_KIRJY four_KIRJY five_KIRJY six_KIRJY 0.10 0.8 0.17 9.9 24.24 1.1 10000 16000 51000 Rooney true true false
-Sep 11 10:00:00.24 2013 124 125 126 127 one_PIDCI two_PIDCI three_PIDCI four_PIDCI five_PIDCI six_PIDCI 0.15 0.8 0.3 2.2 8.8 24.24 15000 16000 9000 Rooney false true false
-Sep 11 10:00:00.25 2013 125 126 127 128 one_UAYGY two_UAYGY three_UAYGY four_UAYGY five_UAYGY six_UAYGY 0.20 0.0 0.24 6.6 24.24 17.17 20000 0 72000 Rooney true true true
-Sep 11 10:00:00.26 2013 126 127 128 129 one_QMOXW two_QMOXW three_QMOXW four_QMOXW five_QMOXW six_QMOXW 0.16 0.12 0.14 23.23 22.22 13.13 16000 24000 42000 Rooney true true true
-Sep 11 10:00:00.27 2013 127 128 129 130 one_BFERO two_BFERO three_BFERO four_BFERO five_BFERO six_BFERO 0.1 0.5 0.4 17.17 14.14 12.12 1000 10000 12000 Rooney false false true
-Sep 11 10:00:00.28 2013 128 129 130 131 one_WHDWR two_WHDWR three_WHDWR four_WHDWR five_WHDWR six_WHDWR 0.22 0.7 0.3 22.22 17.17 15.15 22000 14000 9000 Rooney true false false
-Sep 11 10:00:00.29 2013 129 130 131 132 one_NLGQV two_NLGQV three_NLGQV four_NLGQV five_NLGQV six_NLGQV 0.13 0.11 0.6 16.16 21.21 19.19 13000 22000 18000 Rooney false false true
-Sep 11 10:00:00.30 2013 130 131 132 133 one_QLUTA two_QLUTA three_QLUTA four_QLUTA five_QLUTA six_QLUTA 0.16 0.11 0.20 19.19 0.0 14.14 16000 22000 60000 Rooney true false true
-Sep 11 10:00:00.31 2013 131 132 133 134 one_HPNGM two_HPNGM three_HPNGM four_HPNGM five_HPNGM six_HPNGM 0.7 0.15 0.13 6.6 12.12 16.16 7000 30000 39000 Rooney false false false
-Sep 11 10:00:00.32 2013 132 133 134 135 one_KXDKY two_KXDKY three_KXDKY four_KXDKY five_KXDKY six_KXDKY 0.10 0.23 0.3 10.10 24.24 11.11 10000 46000 9000 Rooney true false false
-Sep 11 10:00:00.33 2013 133 134 135 136 one_LYMCX two_LYMCX three_LYMCX four_LYMCX five_LYMCX six_LYMCX 0.11 0.24 0.12 2.2 23.23 3.3 11000 48000 36000 Rooney false true true
-Sep 11 10:00:00.34 2013 134 135 136 137 one_WTAKY two_WTAKY three_WTAKY four_WTAKY five_WTAKY six_WTAKY 0.22 0.19 0.0 10.10 24.24 4.4 22000 38000 0 Rooney true false true
-Sep 11 10:00:00.35 2013 135 136 137 138 one_UEKYJ two_UEKYJ three_UEKYJ four_UEKYJ five_UEKYJ six_UEKYJ 0.20 0.4 0.10 24.24 9.9 9.9 20000 8000 30000 Rooney true true true
-Sep 11 10:00:00.36 2013 136 137 138 139 one_OPMXN two_OPMXN three_OPMXN four_OPMXN five_OPMXN six_OPMXN 0.14 0.15 0.12 23.23 13.13 5.5 14000 30000 36000 Rooney true false true
-Sep 11 10:00:00.37 2013 137 138 139 140 one_CFERM two_CFERM three_CFERM four_CFERM five_CFERM six_CFERM 0.2 0.5 0.4 17.17 12.12 13.13 2000 10000 12000 Rooney true false true
-Sep 11 10:00:00.38 2013 138 139 140 141 one_SXVUH two_SXVUH three_SXVUH four_SXVUH five_SXVUH six_SXVUH 0.18 0.23 0.21 20.20 7.7 17.17 18000 46000 63000 Rooney true false false
-Sep 11 10:00:00.39 2013 139 140 141 142 one_HBODD two_HBODD three_HBODD four_HBODD five_HBODD six_HBODD 0.7 0.1 0.14 3.3 3.3 11.11 7000 2000 42000 Rooney false false true
-Sep 11 10:00:00.40 2013 140 141 142 143 one_ULXUR two_ULXUR three_ULXUR four_ULXUR five_ULXUR six_ULXUR 0.20 0.11 0.23 20.20 17.17 11.11 20000 22000 69000 Rooney true false false
-Sep 11 10:00:00.41 2013 141 142 143 144 one_NUYWV two_NUYWV three_NUYWV four_NUYWV five_NUYWV six_NUYWV 0.13 0.20 0.24 22.22 21.21 16.16 13000 40000 72000 Rooney false true true
-Sep 11 10:00:00.42 2013 142 143 144 145 one_SULQK two_SULQK three_SULQK four_SULQK five_SULQK six_SULQK 0.18 0.20 0.11 16.16 10.10 13.13 18000 40000 33000 Rooney true true false
-Sep 11 10:00:00.43 2013 143 144 145 146 one_SXGHX two_SXGHX three_SXGHX four_SXGHX five_SXGHX six_SXGHX 0.18 0.23 0.6 7.7 23.23 16.16 18000 46000 18000 Rooney true false true
-Sep 11 10:00:00.44 2013 144 145 146 147 one_TKKSO two_TKKSO three_TKKSO four_TKKSO five_TKKSO six_TKKSO 0.19 0.10 0.10 18.18 14.14 18.18 19000 20000 30000 Rooney false true true
-Sep 11 10:00:00.45 2013 145 146 147 148 one_WNITJ two_WNITJ three_WNITJ four_WNITJ five_WNITJ six_WNITJ 0.22 0.13 0.8 19.19 9.9 17.17 22000 26000 24000 Rooney true false true
-Sep 11 10:00:00.46 2013 146 147 148 149 one_VNIKA two_VNIKA three_VNIKA four_VNIKA five_VNIKA six_VNIKA 0.21 0.13 0.8 10.10 0.0 11.11 21000 26000 24000 Rooney false false true
-Sep 11 10:00:00.47 2013 147 148 149 150 one_SOPMI two_SOPMI three_SOPMI four_SOPMI five_SOPMI six_SOPMI 0.18 0.14 0.15 12.12 8.8 18.18 18000 28000 45000 Rooney true true false
-Sep 11 10:00:00.48 2013 148 149 150 151 one_BHTWJ two_BHTWJ three_BHTWJ four_BHTWJ five_BHTWJ six_BHTWJ 0.1 0.7 0.19 22.22 9.9 9.9 1000 14000 57000 Rooney false false false
-Sep 11 10:00:00.49 2013 149 150 151 152 one_GEQDT two_GEQDT three_GEQDT four_GEQDT five_GEQDT six_GEQDT 0.6 0.4 0.16 3.3 19.19 3.3 6000 8000 48000 Rooney true true true
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/customwritable_recordkey_data.txt
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/customwritable_recordkey_data.txt b/src/test/regress/data/pxf/customwritable_recordkey_data.txt
deleted file mode 100644
index 6c63ea5..0000000
--- a/src/test/regress/data/pxf/customwritable_recordkey_data.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-1000 Sep 11 10:00:00.0 2013 20 21 22 23 one_EOTQT two_EOTQT three_EOTQT four_EOTQT five_EOTQT six_EOTQT 0.4 0.14 0.19 16.16 19.19 15.15 4000 28000 57000 Rooney true true false
-NotANumber! Sep 11 10:00:00.1 2013 21 22 23 24 one_FFIFK two_FFIFK three_FFIFK four_FFIFK five_FFIFK six_FFIFK 0.5 0.5 0.8 5.5 10.10 7.7 5000 10000 24000 Rooney false false true
-3000 Sep 11 10:00:00.2 2013 22 23 24 25 one_TQXCQ two_TQXCQ three_TQXCQ four_TQXCQ five_TQXCQ six_TQXCQ 0.19 0.16 0.23 2.2 16.16 1.1 19000 32000 69000 Rooney false true false
-4000 Sep 11 10:00:00.3 2013 23 24 25 26 one_JQLMU two_JQLMU three_JQLMU four_JQLMU five_JQLMU six_JQLMU 0.9 0.16 0.11 12.12 20.20 11.11 9000 32000 33000 Rooney false true false
-5000 Sep 11 10:00:00.4 2013 24 25 26 27 one_AYEUM two_AYEUM three_AYEUM four_AYEUM five_AYEUM six_AYEUM 0.0 0.24 0.4 20.20 12.12 23.23 0 48000 12000 Rooney true true true
-1000 Sep 11 10:00:00.5 2013 25 26 27 28 one_WQYWN two_WQYWN three_WQYWN four_WQYWN five_WQYWN six_WQYWN 0.22 0.16 0.24 22.22 13.13 24.24 22000 32000 72000 Rooney true true true
-2000 Sep 11 10:00:00.6 2013 26 27 28 29 one_FSRQP two_FSRQP three_FSRQP four_FSRQP five_FSRQP six_FSRQP 0.5 0.18 0.17 16.16 15.15 4.4 5000 36000 51000 Rooney false true false
-3000 Sep 11 10:00:00.7 2013 27 28 29 30 one_JTMWG two_JTMWG three_JTMWG four_JTMWG five_JTMWG six_JTMWG 0.9 0.19 0.12 22.22 6.6 23.23 9000 38000 36000 Rooney false false true
-4000 Sep 11 10:00:00.8 2013 28 29 30 31 one_EHVID two_EHVID three_EHVID four_EHVID five_EHVID six_EHVID 0.4 0.7 0.21 8.8 3.3 20.20 4000 14000 63000 Rooney true false false
-5000 Sep 11 10:00:00.9 2013 29 30 31 32 one_WJNKA two_WJNKA three_WJNKA four_WJNKA five_WJNKA six_WJNKA 0.22 0.9 0.13 10.10 0.0 12.12 22000 18000 39000 Rooney true false false
-1000 Sep 11 10:00:00.10 2013 30 31 32 33 one_WEKDV two_WEKDV three_WEKDV four_WEKDV five_WEKDV six_WEKDV 0.22 0.4 0.10 3.3 21.21 5.5 22000 8000 30000 Rooney true true true
-2000 Sep 11 10:00:00.11 2013 31 32 33 34 one_IUMGR two_IUMGR three_IUMGR four_IUMGR five_IUMGR six_IUMGR 0.8 0.20 0.12 6.6 17.17 22.22 8000 40000 36000 Rooney true true true
-3000 Sep 11 10:00:00.12 2013 32 33 34 35 one_LTTLN two_LTTLN three_LTTLN four_LTTLN five_LTTLN six_LTTLN 0.11 0.19 0.19 11.11 13.13 21.21 11000 38000 57000 Rooney false false false
-4000 Sep 11 10:00:00.13 2013 33 34 35 36 one_VLYAA two_VLYAA three_VLYAA four_VLYAA five_VLYAA six_VLYAA 0.21 0.11 0.24 0.0 0.0 3.3 21000 22000 72000 Rooney false false true
-5000 Sep 11 10:00:00.14 2013 34 35 36 37 one_UGDHB two_UGDHB three_UGDHB four_UGDHB five_UGDHB six_UGDHB 0.20 0.6 0.3 7.7 1.1 14.14 20000 12000 9000 Rooney true true false
-1000 Sep 11 10:00:00.15 2013 35 36 37 38 one_CVYVA two_CVYVA three_CVYVA four_CVYVA five_CVYVA six_CVYVA 0.2 0.21 0.24 21.21 0.0 22.22 2000 42000 72000 Rooney true false true
-2000 Sep 11 10:00:00.16 2013 36 37 38 39 one_ECGCH two_ECGCH three_ECGCH four_ECGCH five_ECGCH six_ECGCH 0.4 0.2 0.6 2.2 7.7 19.19 4000 4000 18000 Rooney true true true
-3000 Sep 11 10:00:00.17 2013 37 38 39 40 one_JVUBP two_JVUBP three_JVUBP four_JVUBP five_JVUBP six_JVUBP 0.9 0.21 0.20 1.1 15.15 8.8 9000 42000 60000 Rooney false false true
-4000 Sep 11 10:00:00.18 2013 38 39 40 41 one_UXNTF two_UXNTF three_UXNTF four_UXNTF five_UXNTF six_UXNTF 0.20 0.23 0.13 19.19 5.5 15.15 20000 46000 39000 Rooney true false false
-5000 Sep 11 10:00:00.19 2013 39 40 41 42 one_BILBB two_BILBB three_BILBB four_BILBB five_BILBB six_BILBB 0.1 0.8 0.11 1.1 1.1 23.23 1000 16000 33000 Rooney false true false
-1000 Sep 11 10:00:00.20 2013 40 41 42 43 one_LYBPI two_LYBPI three_LYBPI four_LYBPI five_LYBPI six_LYBPI 0.11 0.24 0.1 15.15 8.8 10.10 11000 48000 3000 Rooney false true false
-2000 Sep 11 10:00:00.21 2013 41 42 43 44 one_BYHRC two_BYHRC three_BYHRC four_BYHRC five_BYHRC six_BYHRC 0.1 0.24 0.7 17.17 2.2 14.14 1000 48000 21000 Rooney false true false
-3000 Sep 11 10:00:00.22 2013 42 43 44 45 one_TVIWR two_TVIWR three_TVIWR four_TVIWR five_TVIWR six_TVIWR 0.19 0.21 0.8 22.22 17.17 14.14 19000 42000 24000 Rooney false false true
-4000 Sep 11 10:00:00.23 2013 43 44 45 46 one_FQQNX two_FQQNX three_FQQNX four_FQQNX five_FQQNX six_FQQNX 0.5 0.16 0.16 13.13 23.23 13.13 5000 32000 48000 Rooney false true true
-5000 Sep 11 10:00:00.24 2013 44 45 46 47 one_VBJSK two_VBJSK three_VBJSK four_VBJSK five_VBJSK six_VBJSK 0.21 0.1 0.9 18.18 10.10 24.24 21000 2000 27000 Rooney false false false
-1000 Sep 11 10:00:00.25 2013 45 46 47 48 one_YJAEA two_YJAEA three_YJAEA four_YJAEA five_YJAEA six_YJAEA 0.24 0.9 0.0 4.4 0.0 12.12 24000 18000 0 Rooney true false true
-2000 Sep 11 10:00:00.26 2013 46 47 48 49 one_DDQJA two_DDQJA three_DDQJA four_DDQJA five_DDQJA six_DDQJA 0.3 0.3 0.16 9.9 0.0 14.14 3000 6000 48000 Rooney false false true
-3000 Sep 11 10:00:00.27 2013 47 48 49 50 one_DEPMQ two_DEPMQ three_DEPMQ four_DEPMQ five_DEPMQ six_DEPMQ 0.3 0.4 0.15 12.12 16.16 13.13 3000 8000 45000 Rooney false true false
-4000 Sep 11 10:00:00.28 2013 48 49 50 51 one_JYUTQ two_JYUTQ three_JYUTQ four_JYUTQ five_JYUTQ six_JYUTQ 0.9 0.24 0.20 19.19 16.16 10.10 9000 48000 60000 Rooney false true true
-5000 Sep 11 10:00:00.29 2013 49 50 51 52 one_CWHMI two_CWHMI three_CWHMI four_CWHMI five_CWHMI six_CWHMI 0.2 0.22 0.7 12.12 8.8 0.0 2000 44000 21000 Rooney true true false
-1000 Sep 11 10:00:00.30 2013 50 51 52 53 one_YORNW two_YORNW three_YORNW four_YORNW five_YORNW six_YORNW 0.24 0.14 0.17 13.13 22.22 13.13 24000 28000 51000 Rooney true true false
-2000 Sep 11 10:00:00.31 2013 51 52 53 54 one_CUBYA two_CUBYA three_CUBYA four_CUBYA five_CUBYA six_CUBYA 0.2 0.20 0.1 24.24 0.0 10.10 2000 40000 3000 Rooney true true false
-3000 Sep 11 10:00:00.32 2013 52 53 54 55 one_MJMOO two_MJMOO three_MJMOO four_MJMOO five_MJMOO six_MJMOO 0.12 0.9 0.12 14.14 14.14 21.21 12000 18000 36000 Rooney true false true
-4000 Sep 11 10:00:00.33 2013 53 54 55 56 one_MWONL two_MWONL three_MWONL four_MWONL five_MWONL six_MWONL 0.12 0.22 0.14 13.13 11.11 21.21 12000 44000 42000 Rooney true true true
-5000 Sep 11 10:00:00.34 2013 54 55 56 57 one_CNSEO two_CNSEO three_CNSEO four_CNSEO five_CNSEO six_CNSEO 0.2 0.13 0.18 4.4 14.14 1.1 2000 26000 54000 Rooney true false true
-1000 Sep 11 10:00:00.35 2013 55 56 57 58 one_VKHHV two_VKHHV three_VKHHV four_VKHHV five_VKHHV six_VKHHV 0.21 0.10 0.7 7.7 21.21 11.11 21000 20000 21000 Rooney false true false
-2000 Sep 11 10:00:00.36 2013 56 57 58 59 one_PJIDF two_PJIDF three_PJIDF four_PJIDF five_PJIDF six_PJIDF 0.15 0.9 0.8 3.3 5.5 0.0 15000 18000 24000 Rooney false false true
-3000 Sep 11 10:00:00.37 2013 57 58 59 60 one_RUOOK two_RUOOK three_RUOOK four_RUOOK five_RUOOK six_RUOOK 0.17 0.20 0.14 14.14 10.10 17.17 17000 40000 42000 Rooney false true true
-4000 Sep 11 10:00:00.38 2013 58 59 60 61 one_ILTSU two_ILTSU three_ILTSU four_ILTSU five_ILTSU six_ILTSU 0.8 0.11 0.19 18.18 20.20 12.12 8000 22000 57000 Rooney true false false
-5000 Sep 11 10:00:00.39 2013 59 60 61 62 one_EOHVJ two_EOHVJ three_EOHVJ four_EOHVJ five_EOHVJ six_EOHVJ 0.4 0.14 0.7 21.21 9.9 18.18 4000 28000 21000 Rooney true true false
-1000 Sep 11 10:00:00.40 2013 60 61 62 63 one_DRSIN two_DRSIN three_DRSIN four_DRSIN five_DRSIN six_DRSIN 0.3 0.17 0.18 8.8 13.13 14.14 3000 34000 54000 Rooney false false true
-2000 Sep 11 10:00:00.41 2013 61 62 63 64 one_GPYML two_GPYML three_GPYML four_GPYML five_GPYML six_GPYML 0.6 0.15 0.24 12.12 11.11 4.4 6000 30000 72000 Rooney true false true
-3000 Sep 11 10:00:00.42 2013 62 63 64 65 one_KAOII two_KAOII three_KAOII four_KAOII five_KAOII six_KAOII 0.10 0.0 0.14 8.8 8.8 24.24 10000 0 42000 Rooney true true true
-4000 Sep 11 10:00:00.43 2013 63 64 65 66 one_URTKF two_URTKF three_URTKF four_URTKF five_URTKF six_URTKF 0.20 0.17 0.19 10.10 5.5 21.21 20000 34000 57000 Rooney true false false
-5000 Sep 11 10:00:00.44 2013 64 65 66 67 one_DBUOB two_DBUOB three_DBUOB four_DBUOB five_DBUOB six_DBUOB 0.3 0.1 0.20 14.14 1.1 0.0 3000 2000 60000 Rooney false false true
-1000 Sep 11 10:00:00.45 2013 65 66 67 68 one_EEUAJ two_EEUAJ three_EEUAJ four_EEUAJ five_EEUAJ six_EEUAJ 0.4 0.4 0.20 0.0 9.9 20.20 4000 8000 60000 Rooney true true true
-2000 Sep 11 10:00:00.46 2013 66 67 68 69 one_CBMVO two_CBMVO three_CBMVO four_CBMVO five_CBMVO six_CBMVO 0.2 0.1 0.12 21.21 14.14 15.15 2000 2000 36000 Rooney true false true
-3000 Sep 11 10:00:00.47 2013 67 68 69 70 one_NTVNO two_NTVNO three_NTVNO four_NTVNO five_NTVNO six_NTVNO 0.13 0.19 0.21 13.13 14.14 23.23 13000 38000 63000 Rooney false false false
-4000 Sep 11 10:00:00.48 2013 68 69 70 71 one_SQTAA two_SQTAA three_SQTAA four_SQTAA five_SQTAA six_SQTAA 0.18 0.16 0.19 0.0 0.0 20.20 18000 32000 57000 Rooney true true false
-5000 Sep 11 10:00:00.49 2013 69 70 71 72 one_LVLWW two_LVLWW three_LVLWW four_LVLWW five_LVLWW six_LVLWW 0.11 0.21 0.11 22.22 22.22 9.9 11000 42000 33000 Rooney false false false
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/empty.tbl
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/empty.tbl b/src/test/regress/data/pxf/empty.tbl
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/hive_collections.txt
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/hive_collections.txt b/src/test/regress/data/pxf/hive_collections.txt
deleted file mode 100644
index 56608e0..0000000
--- a/src/test/regress/data/pxf/hive_collections.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-zebra2TanzaniaKenyaCongoheight2wheight50zoharavivisrael56303
-panther2SomaliaKenyaCongoheight1wheight40herzogavivisrael56303
-lion2ZanzibarKenyaCongoheight2wheight90horcanusavivisrael56303
-giraffe2NigeKenyaCongoheight4wheight100agripasavivisrael56303
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/hive_small_data.txt
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/hive_small_data.txt b/src/test/regress/data/pxf/hive_small_data.txt
deleted file mode 100644
index a1597ef..0000000
--- a/src/test/regress/data/pxf/hive_small_data.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-row1,s_6,1,6
-row2,s_7,2,7
-row3,s_8,3,8
-row4,s_9,4,9
-row5,s_10,5,10
-row6,s_11,6,11
-row7,s_12,7,12
-row8,s_13,8,13
-row9,s_14,9,14
-row10,s_15,10,15
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/hive_types.txt
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/hive_types.txt b/src/test/regress/data/pxf/hive_types.txt
deleted file mode 100644
index 5cc36d9..0000000
--- a/src/test/regress/data/pxf/hive_types.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-row1,s_6,1,6,1.23456,2013-07-13 21:00:05,7.7,23456789,false
-row2,s_7,2,7,+1.23456,2013-07-13 21:00:05,8.7,23456789,true
-row3,s_8,3,8,-1.23456,2013-07-15 21:00:05,9.7,23456789,false
-row4,s_9,4,9,123456789.123456789,2013-07-16 21:00:05,10.7,23456789,true
-row5,s_10,5,10,0.000000000001,2013-07-17 21:00:05,11.7,23456789,false
-row6,s_11,6,11,00001234.8889999111,2013-07-18 21:00:05,12.7,23456789,true
-row7,s_12,7,12,0.0001,2013-07-19 21:00:05,7.7,23456789,false
-row8,s_13,8,13,45678.00002340089,2013-07-20 21:00:05,7.7,23456789,true
-row9,s_14,9,14,23457.1,2013-07-21 21:00:05,7.7,23456789,false
-row10,s_15,10,15,+45678.00002340089,2013-07-22 21:00:05,7.7,23456789,true
-row11,s_16,11,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,23456789,false
-row12_text_null,\N,11,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,23456789,false
-row13_int_null,s_16,\N,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,23456789,false
-row14_double_null,s_16,11,\N,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,23456789,false
-row15_decimal_null,s_17,12,38,0.12345678901234567890123456789012345678,2013-07-24 21:00:05,7.7,23456789,false
-row16_timestamp_null,s_16,11,37,0.1234567890123456789012345678901234567,\N,7.7,23456789,false
-row17_real_null,s_16,11,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,\N,23456789,false
-row18_bigint_null,s_16,11,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,\N,false
-row19_bool_null,s_16,11,37,0.1234567890123456789012345678901234567,2013-07-23 21:00:05,7.7,23456789,\N
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/regress PXF Custom Avro1.avsc
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/regress PXF Custom Avro1.avsc b/src/test/regress/data/pxf/regress PXF Custom Avro1.avsc
deleted file mode 100644
index 819cf02..0000000
--- a/src/test/regress/data/pxf/regress PXF Custom Avro1.avsc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "type": "record",
- "name": "CustomAvro",
- "doc": "CustomAvro record",
- "fields": [
- {"name": "tms", "type": "string"},
- {"name": "num", "type": {"type": "array", "items": "int"}},
- {"name": "int1", "type": "int"},
- {"name": "int2", "type": "int"},
- {"name": "strings", "type": {"type": "array", "items": "string"}},
- {"name": "st1", "type": "string"},
- {"name": "dubs", "type": {"type": "array", "items": "double"}},
- {"name": "db", "type": "double"},
- {"name": "fts", "type": {"type": "array", "items": "float"}},
- {"name": "ft", "type": "float"},
- {"name": "lngs", "type": {"type": "array", "items": "long"}},
- {"name": "lng", "type": "long"},
- {"name": "bts", "type": "bytes"},
- {"name": "bl", "type": "boolean"}
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/regressPXFCustomAvro.avsc
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/regressPXFCustomAvro.avsc b/src/test/regress/data/pxf/regressPXFCustomAvro.avsc
deleted file mode 100644
index 819cf02..0000000
--- a/src/test/regress/data/pxf/regressPXFCustomAvro.avsc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "type": "record",
- "name": "CustomAvro",
- "doc": "CustomAvro record",
- "fields": [
- {"name": "tms", "type": "string"},
- {"name": "num", "type": {"type": "array", "items": "int"}},
- {"name": "int1", "type": "int"},
- {"name": "int2", "type": "int"},
- {"name": "strings", "type": {"type": "array", "items": "string"}},
- {"name": "st1", "type": "string"},
- {"name": "dubs", "type": {"type": "array", "items": "double"}},
- {"name": "db", "type": "double"},
- {"name": "fts", "type": {"type": "array", "items": "float"}},
- {"name": "ft", "type": "float"},
- {"name": "lngs", "type": {"type": "array", "items": "long"}},
- {"name": "lng", "type": "long"},
- {"name": "bts", "type": "bytes"},
- {"name": "bl", "type": "boolean"}
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/small.csv
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/small.csv b/src/test/regress/data/pxf/small.csv
deleted file mode 100644
index 1bcd843..0000000
--- a/src/test/regress/data/pxf/small.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-1,"aaa",2
-2,"ab
-c",4
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/text_data.csv
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/text_data.csv b/src/test/regress/data/pxf/text_data.csv
deleted file mode 100644
index ccc47d2..0000000
--- a/src/test/regress/data/pxf/text_data.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-s_1,s_10,s_100,2011-06-01 12:30:30,1,10,100,100,100,100,100,s_1,s_10,s_100,2011-06-01 12:30:30,1,10,100,100,100,100,100
-s_2,s_20,s_200,2011-06-01 12:30:30,2,20,200,200,200,200,200,s_2,s_20,s_200,2011-06-01 12:30:30,2,20,200,200,200,200,200
-s_3,s_30,s_300,2011-06-01 12:30:30,3,30,300,300,300,300,300,s_3,s_30,s_300,2011-06-01 12:30:30,3,30,300,300,300,300,300
-s_4,s_40,s_400,2011-06-01 12:30:30,4,40,400,400,400,400,400,s_4,s_40,s_400,2011-06-01 12:30:30,4,40,400,400,400,400,400
-s_5,s_50,s_500,2011-06-01 12:30:30,5,50,500,500,500,500,500,s_5,s_50,s_500,2011-06-01 12:30:30,5,50,500,500,500,500,500
-s_6,s_60,s_600,2011-06-01 12:30:30,6,60,600,600,600,600,600,s_6,s_60,s_600,2011-06-01 12:30:30,6,60,600,600,600,600,600
-s_7,s_70,s_700,2011-06-01 12:30:30,7,70,700,700,700,700,700,s_7,s_70,s_700,2011-06-01 12:30:30,7,70,700,700,700,700,700
-s_8,s_80,s_800,2011-06-01 12:30:30,8,80,800,800,800,800,800,s_8,s_80,s_800,2011-06-01 12:30:30,8,80,800,800,800,800,800
-s_9,s_90,s_900,2011-06-01 12:30:30,9,90,900,900,900,900,900,s_9,s_90,s_900,2011-06-01 12:30:30,9,90,900,900,900,900,900
-s_10,s_100,s_1000,2011-06-01 12:30:30,10,100,1000,1000,1000,1000,1000,s_10,s_100,s_1000,2011-06-01 12:30:30,10,100,1000,1000,1000,1000,1000
-s_11,s_110,s_1100,2011-06-01 12:30:30,11,110,1100,1100,1100,1100,1100,s_11,s_110,s_1100,2011-06-01 12:30:30,11,110,1100,1100,1100,1100,1100
-s_12,s_120,s_1200,2011-06-01 12:30:30,12,120,1200,1200,1200,1200,1200,s_12,s_120,s_1200,2011-06-01 12:30:30,12,120,1200,1200,1200,1200,1200
-s_13,s_130,s_1300,2011-06-01 12:30:30,13,130,1300,1300,1300,1300,1300,s_13,s_130,s_1300,2011-06-01 12:30:30,13,130,1300,1300,1300,1300,1300
-s_14,s_140,s_1400,2011-06-01 12:30:30,14,140,1400,1400,1400,1400,1400,s_14,s_140,s_1400,2011-06-01 12:30:30,14,140,1400,1400,1400,1400,1400
-s_15,s_150,s_1500,2011-06-01 12:30:30,15,150,1500,1500,1500,1500,1500,s_15,s_150,s_1500,2011-06-01 12:30:30,15,150,1500,1500,1500,1500,1500
-s_16,s_160,s_1600,2011-06-01 12:30:30,16,160,1600,1600,1600,1600,1600,s_16,s_160,s_1600,2011-06-01 12:30:30,16,160,1600,1600,1600,1600,1600
-s_17,s_170,s_1700,2011-06-01 12:30:30,17,170,1700,1700,1700,1700,1700,s_17,s_170,s_1700,2011-06-01 12:30:30,17,170,1700,1700,1700,1700,1700
-s_18,s_180,s_1800,2011-06-01 12:30:30,18,180,1800,1800,1800,1800,1800,s_18,s_180,s_1800,2011-06-01 12:30:30,18,180,1800,1800,1800,1800,1800
-s_19,s_190,s_1900,2011-06-01 12:30:30,19,190,1900,1900,1900,1900,1900,s_19,s_190,s_1900,2011-06-01 12:30:30,19,190,1900,1900,1900,1900,1900
-s_20,s_200,s_2000,2011-06-01 12:30:30,20,200,2000,2000,2000,2000,2000,s_20,s_200,s_2000,2011-06-01 12:30:30,20,200,2000,2000,2000,2000,2000
-s_21,s_210,s_2100,2011-06-01 12:30:30,21,210,2100,2100,2100,2100,2100,s_21,s_210,s_2100,2011-06-01 12:30:30,21,210,2100,2100,2100,2100,2100
-s_22,s_220,s_2200,2011-06-01 12:30:30,22,220,2200,2200,2200,2200,2200,s_22,s_220,s_2200,2011-06-01 12:30:30,22,220,2200,2200,2200,2200,2200
-s_23,s_230,s_2300,2011-06-01 12:30:30,23,230,2300,2300,2300,2300,2300,s_23,s_230,s_2300,2011-06-01 12:30:30,23,230,2300,2300,2300,2300,2300
-s_24,s_240,s_2400,2011-06-01 12:30:30,24,240,2400,2400,2400,2400,2400,s_24,s_240,s_2400,2011-06-01 12:30:30,24,240,2400,2400,2400,2400,2400
-s_25,s_250,s_2500,2011-06-01 12:30:30,25,250,2500,2500,2500,2500,2500,s_25,s_250,s_2500,2011-06-01 12:30:30,25,250,2500,2500,2500,2500,2500
-s_26,s_260,s_2600,2011-06-01 12:30:30,26,260,2600,2600,2600,2600,2600,s_26,s_260,s_2600,2011-06-01 12:30:30,26,260,2600,2600,2600,2600,2600
-s_27,s_270,s_2700,2011-06-01 12:30:30,27,270,2700,2700,2700,2700,2700,s_27,s_270,s_2700,2011-06-01 12:30:30,27,270,2700,2700,2700,2700,2700
-s_28,s_280,s_2800,2011-06-01 12:30:30,28,280,2800,2800,2800,2800,2800,s_28,s_280,s_2800,2011-06-01 12:30:30,28,280,2800,2800,2800,2800,2800
-s_29,s_290,s_2900,2011-06-01 12:30:30,29,290,2900,2900,2900,2900,2900,s_29,s_290,s_2900,2011-06-01 12:30:30,29,290,2900,2900,2900,2900,2900
-s_30,s_300,s_3000,2011-06-01 12:30:30,30,300,3000,3000,3000,3000,3000,s_30,s_300,s_3000,2011-06-01 12:30:30,30,300,3000,3000,3000,3000,3000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/writable_inside_sequence1.tbl
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/writable_inside_sequence1.tbl b/src/test/regress/data/pxf/writable_inside_sequence1.tbl
deleted file mode 100644
index c85b683..0000000
Binary files a/src/test/regress/data/pxf/writable_inside_sequence1.tbl and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/data/pxf/writable_inside_sequence2.tbl
----------------------------------------------------------------------
diff --git a/src/test/regress/data/pxf/writable_inside_sequence2.tbl b/src/test/regress/data/pxf/writable_inside_sequence2.tbl
deleted file mode 100644
index a0fbdbf..0000000
Binary files a/src/test/regress/data/pxf/writable_inside_sequence2.tbl and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/expected/.gitignore
----------------------------------------------------------------------
diff --git a/src/test/regress/expected/.gitignore b/src/test/regress/expected/.gitignore
index d1eb70c..4230dcb 100644
--- a/src/test/regress/expected/.gitignore
+++ b/src/test/regress/expected/.gitignore
@@ -10,11 +10,6 @@ filesystem.out
goh_copy.out
goh_create_function_1.out
goh_prepare.out
-pxf_hbase.out
-pxf_hdfs.out
-pxf_hdfs_ext.out
-pxf_hdfs_writable.out
-pxf_hive.out
resource_queue_function.out
table_functions.out
table_functions_optimizer.out
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/.gitignore
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/.gitignore b/src/test/regress/helpers/.gitignore
deleted file mode 100644
index 6b468b6..0000000
--- a/src/test/regress/helpers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomAvroFile.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomAvroFile.java b/src/test/regress/helpers/CustomAvroFile.java
deleted file mode 100644
index 9b5cce1..0000000
--- a/src/test/regress/helpers/CustomAvroFile.java
+++ /dev/null
@@ -1,300 +0,0 @@
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.*;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.InputSplit;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.lang.UnsupportedOperationException;
-
-
-import java.io.IOException;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.FileInputStream;
-import java.io.OutputStream;
-import java.util.Calendar;
-import java.sql.Timestamp;
-
-import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.Counters;
-import org.apache.hadoop.mapred.Counters.Counter;
-
-import org.apache.avro.Schema;
-import org.apache.avro.file.DataFileReader;
-import org.apache.avro.file.DataFileWriter;
-import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.io.DatumReader;
-import org.apache.avro.io.DatumWriter;
-import org.apache.avro.mapred.FsInput;
-import org.apache.avro.mapred.AvroInputFormat;
-import org.apache.avro.mapred.AvroRecordReader;
-import org.apache.avro.mapred.AvroWrapper;
-import org.apache.avro.mapred.AvroJob;
-
-import java.io.DataInput;
-
-class AvroReporter implements Reporter
-{
- private Counters counters;
- AvroReporter()
- {
- counters = new Counters();
- }
-
- public void progress()
- {
- }
-
- public float getProgress()
- {
- throw new RuntimeException("not implemented");
- }
-
- public void write(DataOutput out) throws IOException
- {
- }
-
- public void readFields(DataInput in) throws IOException
- {
- }
-
- public void setStatus (String status) {}
-
- public Counters.Counter getCounter(Enum<?> name)
- {
- return counters.findCounter(name);
- }
-
- public Counters.Counter getCounter(String group, String name)
- {
- return counters.findCounter(group, name);
- }
-
- public void incrCounter(Enum<?> key, long amont) {}
-
- public void incrCounter(String group, String counter,long amont) {}
-
- public InputSplit getInputSplit() throws UnsupportedOperationException {
- return new InputSplit ()
- {
- public void write(DataOutput out) throws IOException {}
- public void readFields(DataInput in) throws IOException {}
- public long getLength() { return 0; }
- public String[] getLocations() { return new String [2]; }
- };
- }
-}
-
-/*
- * Parameters:
- * <outdir> <outfile> <0/1> <schema>
- * outdir - directory for output
- * outfile - name of output file
- * 0 - read
- * 1 - write
- * schema - path for schema
- */
-public class CustomAvroFile
-{
- private Configuration conf;
-
- private String outPath;
- private String outFile;
-
- private String fullPath;
- static private int do_write; // 1 - Write, 0 - read
- static private String schemaName = "CustomAvro.avsc";
- AvroReporter reporter;
-
- public CustomAvroFile(String[] args)
- {
- conf = new Configuration();
- conf.set("fs.defaultFS", "file://./");
-
- outPath = args[0];
- outFile = args[1];
- do_write = Integer.parseInt(args[2]);
- schemaName = args[3];
-
- URI outputURI = null;
- try
- {
- outputURI = new URI(outPath);
- } catch (URISyntaxException e)
- {
- }
-
- fullPath = outputURI.getPath() + Path.SEPARATOR + outFile;
- System.out.println(fullPath);
-
- reporter = new AvroReporter();
- }
-
- void WriteFile() throws Exception
- {
- System.out.println("WriteFile");
-
- FileSystem fs = FileSystem.get(URI.create(fullPath), conf);
- Path path = new Path(outPath + Path.SEPARATOR + outFile);
- OutputStream outStream = fs.create(path);
-
- Schema schema = Schema.parse(new FileInputStream(schemaName));
- DatumWriter<GenericRecord> writer = new GenericDatumWriter<GenericRecord>(schema);
- DataFileWriter<GenericRecord> dataFileWriter = new DataFileWriter<GenericRecord>(writer);
- dataFileWriter.create(schema, outStream);
-
- for (int i=20; i<50; i++)
- {
- int num1 = i;
-
- Timestamp tms = new Timestamp(Calendar.getInstance().getTime().getTime());
- CustomAvroRecInFile cust = new CustomAvroRecInFile(schemaName, tms, num1, 10*num1, 20*num1, (i % 2) == 0);
- GenericRecord datum = cust.serialize();
- dataFileWriter.append(datum);
- }
-
- dataFileWriter.close();
- }
-
- void ReadFile() throws Exception
- {
- System.out.println("ReadFile\n");
-
- /*
- Path p = new Path(outPath + Path.SEPARATOR + outFile);
- FsInput inStream = new FsInput(p, conf);
- DatumReader<GenericRecord> reader = new GenericDatumReader<GenericRecord>();
- DataFileReader<GenericRecord> dataFileReader = new DataFileReader<GenericRecord>(inStream, reader);
- GenericRecord record = null;
- */
-
- String path = outPath + Path.SEPARATOR + outFile;
- System.out.println(path);
-
- // Get the schema
- Path p = new Path(path);
- FsInput inStream = new FsInput(p, conf);
- DatumReader<GenericRecord> dummyReader = new GenericDatumReader<GenericRecord>();
- DataFileReader<GenericRecord> dummyFileReader = new DataFileReader<GenericRecord>(inStream, dummyReader);
- Schema schema = dummyFileReader.getSchema();
-
-
- JobConf jobConf = new JobConf(conf, CustomAvroFile.class);
- AvroInputFormat<GenericRecord> fformat = new org.apache.avro.mapred.AvroInputFormat<GenericRecord>();
- fformat.addInputPath(jobConf, new Path(path));
- Path[] dirs = fformat.getInputPaths(jobConf);
- System.out.println("dirs length: " + dirs.length);
- InputSplit[] splits = fformat.getSplits(jobConf, 4);
- System.out.println("splits length: " + splits.length);
- AvroJob.setInputSchema(jobConf, schema);
- //AvroRecordReader<GenericRecord> reader = new AvroRecordReader(jobConf, (FileSplit)splits[0]);
- AvroRecordReader<GenericRecord> reader =
- (AvroRecordReader<GenericRecord>)fformat.getRecordReader(splits[0], jobConf, reporter);
- AvroWrapper<GenericRecord> avroWrapper = new AvroWrapper<GenericRecord>();
-
-
- CustomAvroRecInFile cust = new CustomAvroRecInFile(schemaName);
- //while( dataFileReader.hasNext() )
- while ( reader.next(avroWrapper, NullWritable.get()) )
- {
- //record = dataFileReader.next(record);
- GenericRecord record = avroWrapper.datum();
- cust.deserialize(record);
-
- // 0. the timestamp
- String tms= cust.GetTimestamp();
- System.out.println(tms);
-
- // 1. the integers
- int [] num = cust.GetNum();
- for (int i = 0; i < num.length; i++)
- {
- Integer n = num[i];
- System.out.println(n.toString());
- }
-
- Integer int1 = cust.GetInt1();
- Integer int2 = cust.GetInt2();
-
- System.out.println(int1.toString());
- System.out.println(int2.toString());
-
- // 2. the strings
- String [] strings = cust.GetStrings();
- for (int i = 0; i < strings.length; i++)
- {
- System.out.println(strings[i]);
- }
-
-
- String st1 = cust.GetSt1();
- System.out.println(st1);
-
- // 3. the doubles
- double [] dubs = cust.GetDoubles();
- for (int i = 0; i < dubs.length; i++)
- {
- System.out.println(Double.toString(dubs[i]));
- }
-
- double db = cust.GetDb();
- System.out.println(Double.toString(db));
-
- // 4. the floats
- float [] fts = cust.GetFloats();
- for (int i = 0; i < fts.length; i++)
- {
- System.out.println(Float.toString(fts[i]));
- }
-
- float ft = cust.GetFt();
- System.out.println(Float.toString(ft));
-
- // 5. the longs
- long [] lngs = cust.GetLongs();
- for (int i = 0; i < lngs.length; i++)
- {
- System.out.println(Long.toString(lngs[i]));
- }
-
- long lng = cust.GetLong();
- System.out.println(Long.toString(lng));
-
- // 6. the bytes
- byte [] bts = cust.GetBytes();
-
- System.out.println("bts length: " + bts.length);
- String sb = new String("");
- for (int i =0; i < bts.length; i++)
- {
- sb = sb + " " + bts[i];
- }
- System.out.println(sb);
- System.out.println(new String(bts));
-
- // 7. the boolean
- System.out.println(Boolean.toString(cust.GetBool()));
-
- System.out.println("#############################################################################################");
- }
- }
-
- public static void main(String[] args) throws Exception
- {
-
- CustomAvroFile mgr = new CustomAvroFile(args);
- if (do_write == 0)
- {
- mgr.ReadFile();
- }
- else
- {
- mgr.WriteFile();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomAvroRecInFile.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomAvroRecInFile.java b/src/test/regress/helpers/CustomAvroRecInFile.java
deleted file mode 100644
index 2f8dc6c..0000000
--- a/src/test/regress/helpers/CustomAvroRecInFile.java
+++ /dev/null
@@ -1,385 +0,0 @@
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.util.Utf8;
-
-import java.io.FileInputStream;
-import java.nio.ByteBuffer;
-
-public class CustomAvroRecInFile
-{
- public String tms;
- public int [] num;
- public int int1;
- public int int2;
- public String [] strings;
- public String st1;
- public double [] dubs;
- public double db;
- public float [] fts;
- public float ft;
- public long [] lngs;
- public long lng;
- public byte [] bts;
- public boolean bl;
-
- // Avro variables
- private String schema_name;
- private Schema schema;
- private GenericRecord datum;
-
- private void initAvro() throws Exception
- {
- schema = Schema.parse(new FileInputStream(schema_name));
- datum = new GenericData.Record(schema);
- }
-
- public CustomAvroRecInFile(String parSchema) throws Exception
- {
- // 0.
- schema_name = parSchema;
- initAvro();
-
- // 1. Timestamp
- tms = new Timestamp(Calendar.getInstance().getTime().getTime()).toString();
-
- // 2. num array, int1, int2
- initNumArray();
- for (int i=0; i<num.length; i++)
- num[i] = 0;
-
- int1 = 0;
- int2 = 0;
-
- // 3. Init strings
- initStringsArray();
- for (int i=0; i<strings.length; i++)
- strings[i] = new String("");
-
- st1 = new String("");
-
- // 4. Init doubles
- initDoublesArray();
- for (int i=0; i<dubs.length; i++)
- dubs[i] = 0.0;
- db = 0.0;
-
- // 5. Init floats
- initFloatsArray();
- for (int i=0; i<fts.length; i++)
- fts[i] = 0.f;
- ft = 0.f;
-
- // 6. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = 0;
- lng = 0;
-
- // 7. Init bytes
- initBytesArray();
- bts = "Sarkozy".getBytes();
-
- // 8. boolean
- bl = false;
- }
-
- public CustomAvroRecInFile(String parSchema, Timestamp tm, int i1, int i2, int i3, boolean b) throws Exception
- {
- // 0. Schema
- schema_name = parSchema;
- initAvro();
-
- // 1. Timestamp
- tms = tm.toString();
-
- // 2. num array, int1, int2
- initNumArray();
- for (int k = 0; k < num.length; k++)
- num[k] = i1 * 10 * (k + 1);
-
- int1 = i2;
- int2 = i3;
-
- // 3. Init strings
- initStringsArray();
- for (int k = 0; k < strings.length; k++)
- strings[k] = "strings_array_member_number___" + (k + 1);
-
- st1 = new String("short_string___" + i1);
-
- // 4. Init doubles
- initDoublesArray();
- for (int k = 0; k < dubs.length; k++)
- dubs[k] = i1 * 10.0 * (k + 1);
- db = (i1 + 5) * 10.0;
-
- // 5. Init floats
- initFloatsArray();
- for (int k = 0; k < fts.length; k++)
- fts[k] = i1 * 10.f * 2.3f * (k + 1);
- ft = i1 * 10.f * 2.3f;
-
- // 6. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = i1 * 10 * (i + 3);
- lng = i1 * 10 + 5;
-
- // 7. Init bytes
- initBytesArray();
- bts = "AvroDude".getBytes();
-
- // 8. boolean
- bl = b;
- }
-
- void initNumArray()
- {
- num = new int[2];
- }
-
- void initStringsArray()
- {
- strings = new String[5];
- }
-
- void initDoublesArray()
- {
- dubs = new double[2];
- }
-
- void initFloatsArray()
- {
- fts = new float[2];
- }
-
- void initLongsArray()
- {
- lngs = new long[2];
- }
-
- void initBytesArray()
- {
- bts = new byte[10];
- }
-
- String GetTimestamp()
- {
- return tms;
- }
-
- int[] GetNum()
- {
- return num;
- }
-
- int GetInt1()
- {
- return int1;
- }
-
- int GetInt2()
- {
- return int2;
- }
-
- String [] GetStrings()
- {
- return strings;
- }
-
- String GetSt1()
- {
- return st1;
- }
-
- double [] GetDoubles()
- {
- return dubs;
- }
-
- double GetDb()
- {
- return db;
- }
-
- float [] GetFloats()
- {
- return fts;
- }
-
- float GetFt()
- {
- return ft;
- }
-
- long [] GetLongs()
- {
- return lngs;
- }
-
- long GetLong()
- {
- return lng;
- }
-
- byte [] GetBytes()
- {
- return bts;
- }
-
- boolean GetBool()
- {
- return bl;
- }
-
- public GenericRecord serialize() throws IOException
- {
- // 0. Timestamp
- datum.put("tms", tms);
-
- // 1. num, int1, int2
- Schema.Field field = schema.getField("num");
- Schema fieldSchema = field.schema();
- GenericData.Array<Integer> intArray = new GenericData.Array<Integer>(num.length, fieldSchema);
- for (int i = 0; i < num.length; i++)
- {
- intArray.add(new Integer(num[i]));
- }
- datum.put("num", intArray);
-
- datum.put("int1", int1);
- datum.put("int2", int2);
-
- // 2. st1
- field = schema.getField("strings");
- fieldSchema = field.schema();
- GenericData.Array<Utf8> stringArray = new GenericData.Array<Utf8>(strings.length, fieldSchema);
- for (int i = 0; i < strings.length; i++)
- {
- stringArray.add(new Utf8(strings[i]));
- }
- datum.put("strings", stringArray);
-
- datum.put("st1", st1);
-
- // 3. doubles
- field = schema.getField("dubs");
- fieldSchema = field.schema();
- GenericData.Array<Double> doubleArray = new GenericData.Array<Double>(dubs.length, fieldSchema);
- for (int i = 0; i < dubs.length; i++)
- {
- doubleArray.add(new Double(dubs[i]));
- }
- datum.put("dubs", doubleArray);
- datum.put("db", db);
-
- // 4. floats
- field = schema.getField("fts");
- fieldSchema = field.schema();
- GenericData.Array<Float> floatArray = new GenericData.Array<Float>(fts.length, fieldSchema);
- for (int i = 0; i < fts.length; i++)
- {
- floatArray.add(new Float(fts[i]));
- }
- datum.put("fts", floatArray);
- datum.put("ft", ft);
-
- // 5. longs
- field = schema.getField("lngs");
- fieldSchema = field.schema();
- GenericData.Array<Long> longArray = new GenericData.Array<Long>(lngs.length, fieldSchema);
- for (int i = 0; i < lngs.length; i++)
- {
- longArray.add(lngs[i]);
- }
- datum.put("lngs", longArray);
- datum.put("lng", lng);
-
- // 6. bytes
- ByteBuffer byteBuffer = ByteBuffer.wrap(bts);
- datum.put("bts", byteBuffer);
-
- // 7. boolean
- datum.put("bl", bl);
-
- return datum;
- }
-
- public void deserialize(GenericRecord record) throws IOException
- {
- // 0. Timestamp
- tms = record.get("tms").toString();
-
- // 1. integers
- GenericData.Array<Integer> intArray = (GenericData.Array<Integer>)record.get("num");
- for (int i = 0; i < intArray.size(); i++)
- {
- num[i] = intArray.get(i).intValue();
- }
-
- int1 = ((Integer)record.get("int1")).intValue();
- int2 = ((Integer)record.get("int2")).intValue();
-
- // 2. strings
- GenericData.Array<Utf8> stringArray = (GenericData.Array<Utf8>)record.get("strings");
- for (int i = 0; i < stringArray.size(); i++)
- {
- strings[i] = stringArray.get(i).toString();
- }
-
- st1 = record.get("st1").toString();
-
- // 3. doubles
- GenericData.Array<Double> doubleArray = (GenericData.Array<Double>)record.get("dubs");
- for (int i = 0; i < doubleArray.size(); i++)
- {
- dubs[i] = doubleArray.get(i).doubleValue();
- }
-
- db = ((Double)record.get("db")).doubleValue();
-
- // 4. floats
- GenericData.Array<Float> floatArray = (GenericData.Array<Float>)record.get("fts");
- for (int i = 0; i < floatArray.size(); i++)
- {
- fts[i] = floatArray.get(i).floatValue();
- }
-
- ft = ((Float)record.get("ft")).floatValue();
-
- // 5. longs
- GenericData.Array<Long> longArray = (GenericData.Array<Long>)record.get("lngs");
- for (int i = 0; i < longArray.size(); i++)
- {
-
- lngs[i] = longArray.get(i).longValue();
- }
-
- lng = ((Long)record.get("lng")).longValue();
-
- // 6. bytes
- ByteBuffer bytesBuffer = (ByteBuffer)record.get("bts");
- bts = bytesBuffer.array();
-
- // 7. boolean
- bl = ((Boolean)record.get("bl")).booleanValue();
- }
-
- public void printFieldTypes()
- {
- Class myClass = this.getClass();
- Field[] fields = myClass.getDeclaredFields();
-
- for (int i = 0; i < fields.length; i++)
- {
- System.out.println(fields[i].getType().getName());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomAvroRecInSequence.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomAvroRecInSequence.java b/src/test/regress/helpers/CustomAvroRecInSequence.java
deleted file mode 100644
index 58b32ff..0000000
--- a/src/test/regress/helpers/CustomAvroRecInSequence.java
+++ /dev/null
@@ -1,407 +0,0 @@
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.io.DatumReader;
-import org.apache.avro.io.DatumWriter;
-import org.apache.avro.io.Decoder;
-import org.apache.avro.io.DecoderFactory;
-import org.apache.avro.io.Encoder;
-import org.apache.avro.io.EncoderFactory;
-import org.apache.avro.util.Utf8;
-
-
-public class CustomAvroRecInSequence
-{
- public String tms;
- public int [] num;
- public int int1;
- public int int2;
- public String [] strings;
- public String st1;
- public double [] dubs;
- public double db;
- public float [] fts;
- public float ft;
- public long [] lngs;
- public long lng;
- public byte [] bts;
- public boolean bl;
-
- // Avro variables
- private String schema_name;
- private Schema schema;
- private GenericRecord datum;
- private DatumWriter<GenericRecord> writer;
- private DatumReader<GenericRecord> reader;
- private EncoderFactory fct_en;
-
- private void initAvro() throws Exception
- {
- schema = Schema.parse(new FileInputStream(schema_name));
- datum = new GenericData.Record(schema);
- writer = new GenericDatumWriter<GenericRecord>(schema);
- reader = new GenericDatumReader<GenericRecord>(schema);
- fct_en = EncoderFactory.get();
- }
-
- public CustomAvroRecInSequence(String parSchema) throws Exception
- {
- // 0.
- schema_name = parSchema;
- initAvro();
-
- // 1. Timestamp
- tms = new Timestamp(Calendar.getInstance().getTime().getTime()).toString();
-
- // 2. num array, int1, int2
- initNumArray();
- for (int i=0; i<num.length; i++)
- num[i] = 0;
-
- int1 = 0;
- int2 = 0;
-
- // 3. Init strings
- initStringsArray();
- for (int i=0; i<strings.length; i++)
- strings[i] = new String("");
-
- st1 = new String("");
-
- // 4. Init doubles
- initDoublesArray();
- for (int i=0; i<dubs.length; i++)
- dubs[i] = 0.0;
- db = 0.0;
-
- // 5. Init floats
- initFloatsArray();
- for (int i=0; i<fts.length; i++)
- fts[i] = 0.f;
- ft = 0.f;
-
- // 6. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = 0;
- lng = 0;
-
- // 7. Init bytes
- initBytesArray();
- bts = "Sarkozy".getBytes();
-
- // 8. boolean
- bl = false;
- }
-
- public CustomAvroRecInSequence(String parSchema, Timestamp tm, int i1, int i2, int i3) throws Exception
- {
- // 0. Schema
- schema_name = parSchema;
- initAvro();
-
- // 1. Timestamp
- tms = tm.toString();
-
- // 2. num array, int1, int2
- initNumArray();
- for (int k = 0; k < num.length; k++)
- num[k] = i1 * 10 * (k + 1);
-
- int1 = i2;
- int2 = i3;
-
- // 3. Init strings
- initStringsArray();
- for (int k = 0; k < strings.length; k++)
- strings[k] = "strings_array_member_number___" + (k + 1);
-
- st1 = new String("short_string___" + i1);
-
- // 4. Init doubles
- initDoublesArray();
- for (int k = 0; k < dubs.length; k++)
- dubs[k] = i1 * 10.0 * (k + 1);
- db = (i1 + 5) * 10.0;
-
- // 5. Init floats
- initFloatsArray();
- for (int k = 0; k < fts.length; k++)
- fts[k] = i1 * 10.f * 2.3f * (k + 1);
- ft = i1 * 10.f * 2.3f;
-
- // 6. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = i1 * 10 * (i + 3);
- lng = i1 * 10 + 5;
-
- // 7. Init bytes
- initBytesArray();
- bts = "AvroDude".getBytes();
-
- // 8. Init boolean
- bl = true;
- }
-
- void initNumArray()
- {
- num = new int[2];
- }
-
- void initStringsArray()
- {
- strings = new String[5];
- }
-
- void initDoublesArray()
- {
- dubs = new double[2];
- }
-
- void initFloatsArray()
- {
- fts = new float[2];
- }
-
- void initLongsArray()
- {
- lngs = new long[2];
- }
-
- void initBytesArray()
- {
- bts = new byte[10];
- }
-
- String GetTimestamp()
- {
- return tms;
- }
-
- int[] GetNum()
- {
- return num;
- }
-
- int GetInt1()
- {
- return int1;
- }
-
- int GetInt2()
- {
- return int2;
- }
-
- String [] GetStrings()
- {
- return strings;
- }
-
- String GetSt1()
- {
- return st1;
- }
-
- double [] GetDoubles()
- {
- return dubs;
- }
-
- double GetDb()
- {
- return db;
- }
-
- float [] GetFloats()
- {
- return fts;
- }
-
- float GetFt()
- {
- return ft;
- }
-
- long [] GetLongs()
- {
- return lngs;
- }
-
- long GetLong()
- {
- return lng;
- }
-
- byte [] GetBytes()
- {
- return bts;
- }
-
- boolean GetBool()
- {
- return bl;
- }
-
- public void serialize(ByteArrayOutputStream out) throws IOException
- {
- // 0. Timestamp
- datum.put("tms", tms);
-
- // 1. num, int1, int2
- Schema.Field field = schema.getField("num");
- Schema fieldSchema = field.schema();
- GenericData.Array<Integer> intArray = new GenericData.Array<Integer>(num.length, fieldSchema);
- for (int i = 0; i < num.length; i++)
- {
- intArray.add(new Integer(num[i]));
- }
- datum.put("num", intArray);
-
- datum.put("int1", int1);
- datum.put("int2", int2);
-
- // 2. st1
- field = schema.getField("strings");
- fieldSchema = field.schema();
- GenericData.Array<Utf8> stringArray = new GenericData.Array<Utf8>(strings.length, fieldSchema);
- for (int i = 0; i < strings.length; i++)
- {
- stringArray.add(new Utf8(strings[i]));
- }
- datum.put("strings", stringArray);
-
- datum.put("st1", st1);
-
- // 3. doubles
- field = schema.getField("dubs");
- fieldSchema = field.schema();
- GenericData.Array<Double> doubleArray = new GenericData.Array<Double>(dubs.length, fieldSchema);
- for (int i = 0; i < dubs.length; i++)
- {
- doubleArray.add(new Double(dubs[i]));
- }
- datum.put("dubs", doubleArray);
- datum.put("db", db);
-
- // 4. floats
- field = schema.getField("fts");
- fieldSchema = field.schema();
- GenericData.Array<Float> floatArray = new GenericData.Array<Float>(fts.length, fieldSchema);
- for (int i = 0; i < fts.length; i++)
- {
- floatArray.add(new Float(fts[i]));
- }
- datum.put("fts", floatArray);
- datum.put("ft", ft);
-
- // 5. longs
- field = schema.getField("lngs");
- fieldSchema = field.schema();
- GenericData.Array<Long> longArray = new GenericData.Array<Long>(lngs.length, fieldSchema);
- for (int i = 0; i < lngs.length; i++)
- {
- longArray.add(lngs[i]);
- }
- datum.put("lngs", longArray);
- datum.put("lng", lng);
-
- // 6. bytes
- ByteBuffer byteBuffer = ByteBuffer.wrap(bts);
- datum.put("bts", byteBuffer);
-
- // 7. boolean
- datum.put("bl", bl);
-
- Encoder encoder = fct_en.binaryEncoder(out, null);
- writer.write(datum,encoder);
- encoder.flush();
- out.close();
- }
-
- public void deserialize(byte [] bytes) throws IOException
- {
- Decoder decoder = DecoderFactory.defaultFactory().createBinaryDecoder(bytes, null);
- GenericRecord record = reader.read(null, decoder);
-
- // 0. Timestamp
- tms = record.get("tms").toString();
-
- // 1. integers
- GenericData.Array<Integer> intArray = (GenericData.Array<Integer>)record.get("num");
- for (int i = 0; i < intArray.size(); i++)
- {
- num[i] = intArray.get(i).intValue();
- }
-
- int1 = ((Integer)record.get("int1")).intValue();
- int2 = ((Integer)record.get("int2")).intValue();
-
- // 2. strings
- GenericData.Array<Utf8> stringArray = (GenericData.Array<Utf8>)record.get("strings");
- for (int i = 0; i < stringArray.size(); i++)
- {
- strings[i] = stringArray.get(i).toString();
- }
-
- st1 = record.get("st1").toString();
-
- // 3. doubles
- GenericData.Array<Double> doubleArray = (GenericData.Array<Double>)record.get("dubs");
- for (int i = 0; i < doubleArray.size(); i++)
- {
- dubs[i] = doubleArray.get(i).doubleValue();
- }
-
- db = ((Double)record.get("db")).doubleValue();
-
- // 4. floats
- GenericData.Array<Float> floatArray = (GenericData.Array<Float>)record.get("fts");
- for (int i = 0; i < floatArray.size(); i++)
- {
- fts[i] = floatArray.get(i).floatValue();
- }
-
- ft = ((Float)record.get("ft")).floatValue();
-
- // 5. longs
- GenericData.Array<Long> longArray = (GenericData.Array<Long>)record.get("lngs");
- for (int i = 0; i < longArray.size(); i++)
- {
-
- lngs[i] = longArray.get(i).longValue();
- }
-
- lng = ((Long)record.get("lng")).longValue();
-
- // 6. bytes
- ByteBuffer bytesBuffer = (ByteBuffer)record.get("bts");
- bts = bytesBuffer.array();
-
- // 7. boolean
- bl = ((Boolean)record.get("bl")).booleanValue();
-
- }
-
- public void printFieldTypes()
- {
- Class myClass = this.getClass();
- Field[] fields = myClass.getDeclaredFields();
-
- for (int i = 0; i < fields.length; i++)
- {
- System.out.println(fields[i].getType().getName());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomAvroSequence.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomAvroSequence.java b/src/test/regress/helpers/CustomAvroSequence.java
deleted file mode 100644
index 460564b..0000000
--- a/src/test/regress/helpers/CustomAvroSequence.java
+++ /dev/null
@@ -1,203 +0,0 @@
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.io.*;
-import org.apache.hadoop.util.ReflectionUtils;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Calendar;
-import java.sql.Timestamp;
-
-/*
- * Parameters:
- * <outdir> <outfile> <0/1> <schema>
- * outdir - directory for output
- * outfile - name of output file
- * 0 - read
- * 1 - write
- * schema - path for schema
- */
-public class CustomAvroSequence
-{
- private Configuration conf;
-
- private String outPath;
- private String outFile;
-
- private String fullPath;
- static private int do_write; // 1 - Write, 0 - read
- static private String schema = "CustomAvro.avsc";
-
-
- public CustomAvroSequence(String[] args)
- {
- conf = new Configuration();
- conf.set("fs.defaultFS", "file://./");
-
- outPath = args[0];
- outFile = args[1];
- do_write = Integer.parseInt(args[2]);
- schema = args[3];
-
- URI outputURI = null;
- try
- {
- outputURI = new URI(outPath);
- } catch (URISyntaxException e)
- {
- }
-
- fullPath = outputURI.getPath() + Path.SEPARATOR + outFile;
- System.out.println(fullPath);
- }
-
- void WriteFile() throws Exception
- {
- System.out.println("WriteFile");
-
- FileSystem fs = null;
-
- fs = FileSystem.get(URI.create(fullPath), conf);
-
- IntWritable key = new IntWritable();
- BytesWritable val = new BytesWritable();
- Path path = new Path(outPath + Path.SEPARATOR + outFile);
- SequenceFile.Writer writer = SequenceFile.createWriter(fs, conf, path, key.getClass(), val.getClass());
-
- for (int i=20; i<50; i++)
- {
- int num1 = i;
-
- Timestamp tms = new Timestamp(Calendar.getInstance().getTime().getTime());
- CustomAvroRecInSequence cust = new CustomAvroRecInSequence(schema, tms, num1, 10*num1, 20*num1);
-
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- cust.serialize(stream);
- val = new BytesWritable(stream.toByteArray());
- writer.append(key, val);
- }
-
- IOUtils.closeStream(writer);
-
- }
-
- void ReadFile() throws Exception
- {
- System.out.println("ReadFile\n");
-
- FileSystem fs = null;
- FSDataInputStream inp = null;
-
- fs = FileSystem.get(URI.create(fullPath), conf);
- Path p = new Path(outPath + Path.SEPARATOR + outFile);
-
- SequenceFile.Reader reader = new SequenceFile.Reader(fs, p, conf);
- IntWritable key = (IntWritable)ReflectionUtils.newInstance(reader.getKeyClass(), conf);
- BytesWritable val = (BytesWritable)ReflectionUtils.newInstance(reader.getValueClass(), conf);
-
- System.out.println("The class field types are:");
- System.out.println("\n\n");
-
- CustomAvroRecInSequence cust = new CustomAvroRecInSequence(schema);
- while(reader.next(key,val))
- {
- cust.deserialize(val.getBytes());
-
- // 0. the timestamp
- String tms= cust.GetTimestamp();
- System.out.println(tms);
-
- // 1. the integers
- int [] num = cust.GetNum();
- for (int i = 0; i < num.length; i++)
- {
- Integer n = num[i];
- System.out.println(n.toString());
- }
-
- Integer int1 = cust.GetInt1();
- Integer int2 = cust.GetInt2();
-
- System.out.println(int1.toString());
- System.out.println(int2.toString());
-
- // 2. the strings
- String [] strings = cust.GetStrings();
- for (int i = 0; i < strings.length; i++)
- {
- System.out.println(strings[i]);
- }
-
-
- String st1 = cust.GetSt1();
- System.out.println(st1);
-
- // 3. the doubles
- double [] dubs = cust.GetDoubles();
- for (int i = 0; i < dubs.length; i++)
- {
- System.out.println(Double.toString(dubs[i]));
- }
-
- double db = cust.GetDb();
- System.out.println(Double.toString(db));
-
- // 4. the floats
- float [] fts = cust.GetFloats();
- for (int i = 0; i < fts.length; i++)
- {
- System.out.println(Float.toString(fts[i]));
- }
-
- float ft = cust.GetFt();
- System.out.println(Float.toString(ft));
-
- // 5. the longs
- long [] lngs = cust.GetLongs();
- for (int i = 0; i < lngs.length; i++)
- {
- System.out.println(Long.toString(lngs[i]));
- }
-
- long lng = cust.GetLong();
- System.out.println(Long.toString(lng));
-
- // 6. the bytes
- byte [] bts = cust.GetBytes();
-
- System.out.println("bts length: " + bts.length);
- String sb = new String("");
- for (int i =0; i < bts.length; i++)
- {
- sb = sb + " " + bts[i];
- }
- System.out.println(sb);
- System.out.println(new String(bts));
-
- // 7. boolean
- boolean bl = cust.GetBool();
-
- System.out.println("bl: " + Boolean.toString(bl));
-
- System.out.println("#############################################################################################");
- }
- }
-
- public static void main(String[] args) throws Exception
- {
-
- CustomAvroSequence mgr = new CustomAvroSequence(args);
- if (do_write == 0)
- {
- mgr.ReadFile();
- }
- else
- {
- mgr.WriteFile();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomWritable.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomWritable.java b/src/test/regress/helpers/CustomWritable.java
deleted file mode 100644
index 47a7d01..0000000
--- a/src/test/regress/helpers/CustomWritable.java
+++ /dev/null
@@ -1,430 +0,0 @@
-import org.apache.hadoop.io.*;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-/*
- * CustomWritable class used to serialize and deserialize
- * data with the below public data types
- *
- * TODO: This should be dynamically compiled and used in data/pxf instead
- * of checked-in .class file
- */
-public class CustomWritable implements Writable
-{
- public String tms;
- public int [] num;
- public int int1;
- public int int2;
- public String [] strings;
- public String st1;
- public double [] dubs;
- public double db;
- public float [] fts;
- public float ft;
- public long [] lngs;
- public long lng;
- public byte [] bts;
- public boolean bool;
- public boolean[] bools;
-
- public CustomWritable()
- {
- // 0. Timestamp
- tms = new Timestamp(Calendar.getInstance().getTime().getTime()).toString();
-
- // 1. num array, int1, int2
- initNumArray();
- for (int i=0; i<num.length; i++)
- num[i] = 0;
-
- int1 = 0;
- int2 = 0;
-
- // 2. Init strings
- initStringsArray();
- for (int i=0; i<strings.length; i++)
- strings[i] = new String("");
-
- st1 = new String("");
-
- // 3. Init doubles
- initDoublesArray();
- for (int i=0; i<dubs.length; i++)
- dubs[i] = 0.0;
- db = 0.0;
-
- // 4. Init floats
- initFloatsArray();
- for (int i=0; i<fts.length; i++)
- fts[i] = 0.f;
- ft = 0.f;
-
- // 5. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = 0;
- lng = 0;
-
- // 6. Init bytes
- initBytesArray();
- bts = "Sarkozy".getBytes();
-
- // 7. Init booleans
- initBoolsArray();
- for (int i=0; i < bools.length; ++i)
- bools[i] = ((i % 2) == 0);
- bool = true;
- }
-
- public CustomWritable(Timestamp tm, int i1, int i2, int i3)
- {
- // 0. Timestamp
- tms = tm.toString();
-
- // 1. num array, int1, int2
- initNumArray();
- for (int k = 0; k < num.length; k++)
- num[k] = i1 * 10 * (k + 1);
-
- int1 = i2;
- int2 = i3;
-
- // 2. Init strings
- initStringsArray();
- for (int k = 0; k < strings.length; k++)
- strings[k] = "strings_array_member_number___" + (k + 1);
-
- st1 = new String("short_string___" + i1);
-
- // 3. Init doubles
- initDoublesArray();
- for (int k = 0; k < dubs.length; k++)
- dubs[k] = i1 * 10.0 * (k + 1);
- db = (i1 + 5) * 10.0;
-
- // 4. Init floats
- initFloatsArray();
- for (int k = 0; k < fts.length; k++)
- fts[k] = i1 * 10.f * 2.3f * (k + 1);
- ft = i1 * 10.f * 2.3f;
-
- // 5. Init longs
- initLongsArray();
- for (int i=0; i < lngs.length; i++)
- lngs[i] = i1 * 10 * (i + 3);
- lng = i1 * 10 + 5;
-
- // 6. Init bytes
- initBytesArray();
- bts = "Writable".getBytes();
-
- // 7. Init booleans
- initBoolsArray();
- for (int i=0; i < bools.length; ++i)
- bools[i] = ((i % 2) != 0);
- bool = false;
- }
-
- void initNumArray()
- {
- num = new int[2];
- }
-
- void initStringsArray()
- {
- strings = new String[5];
- }
-
- void initDoublesArray()
- {
- dubs = new double[2];
- }
-
- void initFloatsArray()
- {
- fts = new float[2];
- }
-
- void initLongsArray()
- {
- lngs = new long[2];
- }
-
- void initBytesArray()
- {
- //bts = new byte[10];
- }
-
- void initBoolsArray()
- {
- bools = new boolean[2];
- }
-
- String GetTimestamp()
- {
- return tms;
- }
-
- int[] GetNum()
- {
- return num;
- }
-
- int GetInt1()
- {
- return int1;
- }
-
- int GetInt2()
- {
- return int2;
- }
-
- String [] GetStrings()
- {
- return strings;
- }
-
- String GetSt1()
- {
- return st1;
- }
-
- double [] GetDoubles()
- {
- return dubs;
- }
-
- double GetDb()
- {
- return db;
- }
-
- float [] GetFloats()
- {
- return fts;
- }
-
- float GetFt()
- {
- return ft;
- }
-
- long [] GetLongs()
- {
- return lngs;
- }
-
- long GetLong()
- {
- return lng;
- }
-
- byte [] GetBytes()
- {
- return bts;
- }
-
- boolean GetBool()
- {
- return bool;
- }
-
- boolean[] GetBools()
- {
- return bools;
- }
-
- public void write(DataOutput out) throws IOException
- {
- // 0. Timestamp
- Text tms_text = new Text(tms);
- tms_text.write(out);
-
- // 1. num, int1, int2
- IntWritable intw = new IntWritable();
-
- for (int i = 0; i < num.length; i++)
- {
- intw.set(num[i]);
- intw.write(out);
- }
-
- intw.set(int1);
- intw.write(out);
-
- intw.set(int2);
- intw.write(out);
-
- // 2. st1
- Text txt = new Text();
-
- for (int i = 0; i < strings.length; i++)
- {
- txt.set(strings[i]);
- txt.write(out);
- }
-
- txt.set(st1);
- txt.write(out);
-
- // 3. doubles
- DoubleWritable dw = new DoubleWritable();
- for (int i = 0; i < dubs.length; i++)
- {
- dw.set(dubs[i]);
- dw.write(out);
- }
-
- dw.set(db);
- dw.write(out);
-
- // 4. floats
- FloatWritable fw = new FloatWritable();
- for (int i = 0; i < fts.length; i++)
- {
- fw.set(fts[i]);
- fw.write(out);
- }
-
- fw.set(ft);
- fw.write(out);
-
- // 5. longs
- LongWritable lw = new LongWritable();
- for (int i = 0; i < lngs.length; i++)
- {
- lw.set(lngs[i]);
- lw.write(out);
- }
-
- lw.set(lng);
- lw.write(out);
-
- // 6. bytes
- //BytesWritable btsw = new BytesWritable(bts);
- //btsw.write(out);
- BytesWritable btsw = new BytesWritable();
- btsw.setCapacity(bts.length);
- btsw.setSize(bts.length);
- btsw.set(bts,0, bts.length );
- btsw.write(out);
-
- // 7. booleans
- BooleanWritable bw = new BooleanWritable();
- for (int i = 0; i < bools.length; ++i)
- {
- bw.set(bools[i]);
- bw.write(out);
- }
-
- bw.set(bool);
- bw.write(out);
- }
-
- public void readFields(DataInput in) throws IOException
- {
- // 0. Timestamp
- Text tms_text = new Text(tms);
- tms_text.readFields(in);
- tms = tms_text.toString();
-
-
- // 1. integers
- IntWritable intw = new IntWritable();
-
- for (int i = 0; i < num.length; i++)
- {
- intw.readFields(in);
- num[i] = intw.get();
- }
-
- intw.readFields(in);
- int1 = intw.get();
-
- intw.readFields(in);
- int2 = intw.get();
-
- // 2. strings
- Text txt = new Text();
-
- for (int i = 0; i < strings.length; i++)
- {
- txt.readFields(in);
- strings[i] = txt.toString();
- }
-
- txt.readFields(in);
- st1 = txt.toString();
-
- // 3. doubles
- DoubleWritable dw = new DoubleWritable();
- for (int i = 0; i < dubs.length; i++)
- {
- dw.readFields(in);
- dubs[i] = dw.get();
- }
-
- dw.readFields(in);
- db = dw.get();
-
- // 4. floats
- FloatWritable fw = new FloatWritable();
- for (int i = 0; i < fts.length; i++)
- {
- fw.readFields(in);
- fts[i] = fw.get();
- }
-
- fw.readFields(in);
- ft = fw.get();
-
- // 5. longs
- LongWritable lw = new LongWritable();
- for (int i = 0; i < lngs.length; i++)
- {
- lw.readFields(in);
- lngs[i] = lw.get();
- }
-
- lw.readFields(in);
- lng = lw.get();
-
- // 6. bytes
- BytesWritable btsw = new BytesWritable();
- btsw.readFields(in);
- byte[] buffer = btsw.getBytes();
- bts = new byte[btsw.getLength()];
- for (int i = 0; i < btsw.getLength(); i++)
- {
- bts[i] = buffer[i];
- }
-
- // 7. booleans
- BooleanWritable bw = new BooleanWritable();
- for (int i = 0; i < bools.length; ++i)
- {
- bw.readFields(in);
- bools[i] = bw.get();
- }
-
- bw.readFields(in);
- bool = bw.get();
- }
-
- public void printFieldTypes()
- {
- Class myClass = this.getClass();
- Field[] fields = myClass.getDeclaredFields();
-
- for (int i = 0; i < fields.length; i++)
- {
- System.out.println(fields[i].getType().getName());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/CustomWritableSequence.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/CustomWritableSequence.java b/src/test/regress/helpers/CustomWritableSequence.java
deleted file mode 100644
index b1635f0..0000000
--- a/src/test/regress/helpers/CustomWritableSequence.java
+++ /dev/null
@@ -1,238 +0,0 @@
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.*;
-import org.apache.hadoop.util.ReflectionUtils;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.net.URI;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/*
- * This will read/write sequence files using CustomWritable class
- *
- * Usage:
- * export CLASSPATH=\
- * .:\
- * $HADOOP_ROOT/share/hadoop/mapreduce/\*:\
- * $HADOOP_ROOT/share/hadoop/common/\*:\
- * $HADOOP_ROOT/share/hadoop/common/lib/\*:\
- * $HADOOP_ROOT/share/hadoop/hdfs/\*:\
- *
- * To read:
- * java CustomWritableSequence <outdir> <filename> 0
- *
- * To Write:
- * java CustomWritableSequence <outdir> <filename> 1
- *
- * TODO: Dynamically compile this and create content for regressions
- */
-public class CustomWritableSequence
-{
- private Configuration conf;
-
- private String outPath;
- private String outFile;
-
- private String fullPath;
- private boolean doPrint;
- static private int do_write; // 1 - Write, 0 - read
-
-
- public CustomWritableSequence(String[] args) throws Exception
- {
- conf = new Configuration();
- conf.set("fs.defaultFS", "file://./");
-
- outPath = args[0];
- outFile = args[1];
- do_write = Integer.parseInt(args[2]);
- doPrint = true;
-
- URI outputURI = null;
- outputURI = new URI(outPath);
- fullPath = outputURI.getPath() + Path.SEPARATOR + outFile;
- System.out.println(fullPath);
- }
-
- void WriteFile() throws IOException
- {
- System.out.println("WriteFile");
-
- FileSystem fs = null;
- fs = FileSystem.get(URI.create(fullPath), conf);
-
- IntWritable key = new IntWritable();
- CustomWritable val = new CustomWritable();
- Path path = new Path(outPath + Path.SEPARATOR + outFile);
- SequenceFile.Writer writer = SequenceFile.createWriter(fs, conf, path, key.getClass(), val.getClass());
-
- for (int i=1; i<20; i++)
- {
- int num1 = i;
-
- Timestamp tms = new Timestamp(Calendar.getInstance().getTime().getTime());
- CustomWritable cust = new CustomWritable(tms, num1, 10*num1, 20*num1);
- //if (i == 1)
- //cust.SetErrMode(false);
-
- writer.append(key, cust);
- }
-
- IOUtils.closeStream(writer);
- }
-
- void printField(String fld)
- {
- if (doPrint)
- System.out.println(fld);
- }
-
- void ReadFile() throws Exception
- {
- System.out.println("ReadFile\n");
-
- FileSystem fs = null;
- FSDataInputStream inp = null;
-
- fs = FileSystem.get(URI.create(fullPath), conf);
- Path p = new Path(outPath + Path.SEPARATOR + outFile);
-
- SequenceFile.Reader reader = new SequenceFile.Reader(fs, p, conf);
- IntWritable key = (IntWritable)ReflectionUtils.newInstance(reader.getKeyClass(), conf);
- CustomWritable cust = (CustomWritable)ReflectionUtils.newInstance(reader.getValueClass(), conf);
-
- System.out.println("The class field types are:");
- cust.printFieldTypes();
- System.out.println("\n\n");
-
- SimpleDateFormat form = new SimpleDateFormat("EEE dd MMM yyyy HH:mm:ss.SSS");
- Date z = new Date();
- System.out.println(form.format(z).toString());
-
- try
- {
- int sizo = 1000;
- long length = fs.getLength(p);
- System.out.println("length: " + length);
- FSDataInputStream strm = fs.open(p);
- byte [] buf = new byte[sizo];
- long total = 0;
- int rd = 0;
- while ( (rd = strm.read(total, buf, 0, sizo)) != -1 )
- total +=rd;
-
- System.out.println("read: " + total);
-
-
- while(reader.next(key,cust))
- {
- // 0. the timestamp
- String tms= cust.GetTimestamp();
- printField(tms);
-
- // 1. the integers
- int [] num = cust.GetNum();
- for (int i = 0; i < num.length; i++)
- {
- Integer n = num[i];
- printField(n.toString());
- }
-
- Integer int1 = cust.GetInt1();
- Integer int2 = cust.GetInt2();
-
- printField(int1.toString());
- printField(int2.toString());
-
- // 2. the strings
- String [] strings = cust.GetStrings();
- for (int i = 0; i < strings.length; i++)
- {
- printField(strings[i]);
- }
-
-
- String st1 = cust.GetSt1();
- printField(st1);
-
- // 3. the doubles
- double [] dubs = cust.GetDoubles();
- for (int i = 0; i < dubs.length; i++)
- {
- printField(Double.toString(dubs[i]));
- }
-
- double db = cust.GetDb();
- printField(Double.toString(db));
-
- // 4. the floats
- float [] fts = cust.GetFloats();
- for (int i = 0; i < fts.length; i++)
- {
- printField(Float.toString(fts[i]));
- }
-
- float ft = cust.GetFt();
- printField(Float.toString(ft));
-
- // 5. the longs
- long [] lngs = cust.GetLongs();
- for (int i = 0; i < lngs.length; i++)
- {
- printField(Long.toString(lngs[i]));
- }
-
- long lng = cust.GetLong();
- printField(Long.toString(lng));
-
- // 6. the bytes
- byte [] bts = cust.GetBytes();
-
- printField("bts length: " + bts.length);
- String sb = new String("");
- for (int i =0; i < bts.length; i++)
- {
- sb = sb + " " + bts[i];
- }
- printField(sb);
- printField(new String(bts));
-
- // 7. the boolean
- boolean[] bools = cust.GetBools();
- for (int i = 0; i < bools.length; ++i)
- {
- printField(Boolean.toString(bools[i]));
- }
- boolean bool = cust.GetBool();
- printField(Boolean.toString(bool));
-
- printField("#############################################################################################");
- }
-
- }
- catch (EOFException e)
- {}
-
- z = new Date();
- System.out.println(form.format(z).toString());
- }
-
- public static void main(String[] args) throws Exception
- {
- CustomWritableSequence mgr = new CustomWritableSequence(args);
- if (do_write == 0)
- {
- mgr.ReadFile();
- }
- else
- {
- mgr.WriteFile();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7eeeec9d/src/test/regress/helpers/DummyAccessor.java
----------------------------------------------------------------------
diff --git a/src/test/regress/helpers/DummyAccessor.java b/src/test/regress/helpers/DummyAccessor.java
deleted file mode 100644
index 52eabec..0000000
--- a/src/test/regress/helpers/DummyAccessor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-import com.pivotal.pxf.api.OneRow;
-import com.pivotal.pxf.api.ReadAccessor;
-import com.pivotal.pxf.api.WriteAccessor;
-import com.pivotal.pxf.api.utilities.InputData;
-import com.pivotal.pxf.api.utilities.Plugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/*
- * Internal interface that defines the access to a file on HDFS. All classes
- * that implement actual access to an HDFS file (sequence file, avro file,...)
- * must respect this interface
- * Dummy implementation, for documentation
- */
-public class DummyAccessor extends Plugin implements ReadAccessor, WriteAccessor {
- private static final Log LOG = LogFactory.getLog(DummyAccessor.class);
- private int rowNumber;
- private int fragmentNumber;
-
- public DummyAccessor(InputData metaData) {
- super(metaData);
- }
-
- @Override
- public boolean openForRead() throws Exception {
- /* fopen or similar */
- return true;
- }
-
- @Override
- public OneRow readNextObject() throws Exception {
- /* return next row , <key=fragmentNo.rowNo, val=rowNo,text,fragmentNo>*/
- /* check for EOF */
- if (fragmentNumber > 0) {
- return null; /* signal EOF, close will be called */
- }
-
- int fragment = inputData.getDataFragment();
- String fragmentMetadata = new String(inputData.getFragmentMetadata());
- /* generate row */
- OneRow row = new OneRow(fragment + "." + rowNumber, /* key */
- rowNumber + "," + fragmentMetadata + "," + fragment /* value */);
- /* advance */
- rowNumber += 1;
- if (rowNumber == 2) {
- rowNumber = 0;
- fragmentNumber += 1;
- }
- /* return data */
- return row;
- }
-
- @Override
- public void closeForRead() throws Exception {
- /* fclose or similar */
- }
-
- @Override
- public boolean openForWrite() throws Exception {
- /* fopen or similar */
- return true;
- }
-
- @Override
- public boolean writeNextObject(OneRow onerow) throws Exception {
-
- LOG.info(onerow.getData());
- return true;
- }
-
- @Override
- public void closeForWrite() throws Exception {
- /* fclose or similar */
- }
-}