ADBDEV-6065: Improve logic of fragment distribution

automation/pom.xml

@@ -32,7 +32,6 @@
         </repository>
     </repositories>
 
-
     <build>
         <extensions>
             <extension>
@@ -173,6 +172,7 @@
             <artifactId>jsystemCore</artifactId>
             <version>6.1.05</version>
             <exclusions>
+                <!--  javax.comm provides applications access to RS-232 hardware - not needed -->
                 <exclusion>
                     <groupId>javax.comm</groupId>
                     <artifactId>comm</artifactId>
@@ -184,12 +184,12 @@
             </exclusions>
         </dependency>
 
-
         <dependency>
             <groupId>org.jsystemtest.systemobjects</groupId>
             <artifactId>cli</artifactId>
             <version>6.1.05</version>
             <exclusions>
+                <!--  javax.comm provides applications access to RS-232 hardware - not needed -->
                 <exclusion>
                     <groupId>javax.comm</groupId>
                     <artifactId>comm</artifactId>
@@ -201,7 +201,6 @@
             </exclusions>
         </dependency>
 
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

automation/sqlrepo/arenadata/fragment-distribution/hdfs-2-as-policy/expected/query01.ans

@@ -0,0 +1,16 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using active-segment policy
+SELECT * FROM fd_2_active_segment_hdfs_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+(8 rows)
+

automation/sqlrepo/arenadata/fragment-distribution/hdfs-2-as-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using active-segment policy
+SELECT * FROM fd_2_active_segment_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-seg-limit/expected/query01.ans → automation/sqlrepo/arenadata/fragment-distribution/hdfs-4-as-policy/expected/query01.ans

@@ -1,13 +1,13 @@
 -- start_ignore
 -- end_ignore
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_seg_limit_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_4_active_segment_hdfs_ext_table ORDER BY 1;
  id | descr
 ----+-------
   1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-(5 rows)
-
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+(6 rows)

automation/sqlrepo/arenadata/fragment-distribution/hdfs-seg-limit/sql/query01.sql → automation/sqlrepo/arenadata/fragment-distribution/hdfs-4-as-policy/sql/query01.sql

@@ -1,2 +1,2 @@
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_seg_limit_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_4_active_segment_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-even-policy/expected/query01.ans

@@ -0,0 +1,19 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments HDFS profile when fragment count is equal to an even number of segments.
+SELECT * FROM fd_improved_round_robin_even_hdfs_ext_table ORDER BY 1;
+ id | descr
+----+--------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+  9 | text9
+ 10 | text10
+ 11 | text11
+ 12 | text12
+(12 rows)

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-even-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments HDFS profile when fragment count is equal to an even number of segments.
+SELECT * FROM fd_improved_round_robin_even_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-less-policy/expected/query01.ans

@@ -0,0 +1,10 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using improved-round-robin policy when fragment count is less
+-- than segment count.
+SELECT * FROM fd_improved_round_robin_less_hdfs_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+(2 rows)

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-less-policy/sql/query01.sql

@@ -0,0 +1,3 @@
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using improved-round-robin policy when fragment count is less
+-- than segment count.
+SELECT * FROM fd_improved_round_robin_less_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-more-policy/expected/query01.ans

@@ -0,0 +1,16 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using improved-round-robin policy when fragment count is more
+-- than segment count but not equal to an even number of segments.
+SELECT * FROM fd_improved_round_robin_more_hdfs_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+(8 rows)

automation/sqlrepo/arenadata/fragment-distribution/hdfs-irr-more-policy/sql/query01.sql

@@ -0,0 +1,3 @@
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using improved-round-robin policy when fragment count is more
+-- than segment count but not equal to an even number of segments.
+SELECT * FROM fd_improved_round_robin_more_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-limit/expected/query01.ans

@@ -1,13 +1,14 @@
 -- start_ignore
 -- end_ignore
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_limit_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_hdfs_limit_ext_table ORDER BY 1;
  id | descr
 ----+-------
   1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-(5 rows)
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+(6 rows)
 

automation/sqlrepo/arenadata/fragment-distribution/hdfs-limit/sql/query01.sql

@@ -1,2 +1,2 @@
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_limit_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_hdfs_limit_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs-random-policy/expected/query01.ans

@@ -0,0 +1,15 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using random policy
+SELECT * FROM fd_random_hdfs_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+(8 rows)

automation/sqlrepo/arenadata/fragment-distribution/hdfs-random-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments with HDFS profile using random policy
+SELECT * FROM fd_random_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/hdfs/expected/query01.ans

@@ -1,13 +1,14 @@
 -- start_ignore
 -- end_ignore
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_hdfs_ext_table ORDER BY 1;
  id | descr
 ----+-------
   1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-  1 | text1
-(5 rows)
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+(6 rows)
 

automation/sqlrepo/arenadata/fragment-distribution/hdfs/sql/query01.sql

@@ -1,2 +1,2 @@
 -- @description query01 for PXF test to check fragments distribution across segments with HDFS profile
-SELECT * FROM fragment_distribution_hdfs_ext_table ORDER BY 1 LIMIT 5;
+SELECT * FROM fd_hdfs_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc-as-policy/expected/query01.ans

@@ -0,0 +1,28 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using active-segment policy
+SELECT * FROM fd_active_segment_jdbc_limit_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+  9 | text9
+  10 | text10
+  11 | text11
+  12 | text12
+  13 | text13
+  14 | text14
+  15 | text15
+  16 | text16
+  17 | text17
+  18 | text18
+  19 | text19
+  20 | text20
+(20 rows)
+

automation/sqlrepo/arenadata/fragment-distribution/jdbc-as-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using active-segment policy
+SELECT * FROM fd_active_segment_jdbc_limit_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc-failed-as-policy/expected/query01.ans

@@ -0,0 +1,8 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using active-segment policy
+-- but without parameter ACTIVE_SEGMENT_COUNT
+SELECT * FROM fd_failed_active_segment_jdbc_limit_ext_table ORDER BY 1;
+ERROR:  PXF server error : The parameter ACTIVE_SEGMENT_COUNT is not define while the fragment distribution policy is active-segment. Add the parameter ACTIVE_SEGMENT_COUNT to the external table DDL
+HINT:  Check the PXF logs located in the '/usr/local/greenplum-db-devel/pxf/logs' directory on host 'localhost' or 'set client_min_messages=LOG' for additional details.
+CONTEXT:  External table fd_failed_active_segment_jdbc_limit_ext_table

automation/sqlrepo/arenadata/fragment-distribution/jdbc-failed-as-policy/sql/query01.sql

@@ -0,0 +1,3 @@
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using active-segment policy
+-- but without parameter ACTIVE_SEGMENT_COUNT
+SELECT * FROM fd_failed_active_segment_jdbc_limit_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc-irr-policy/expected/query01.ans

@@ -0,0 +1,27 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using improved-round-robin policy
+SELECT * FROM fd_improved_round_robin_jdbc_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+  9 | text9
+  10 | text10
+  11 | text11
+  12 | text12
+  13 | text13
+  14 | text14
+  15 | text15
+  16 | text16
+  17 | text17
+  18 | text18
+  19 | text19
+  20 | text20
+(20 rows)

automation/sqlrepo/arenadata/fragment-distribution/jdbc-irr-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using improved-round-robin policy
+SELECT * FROM fd_improved_round_robin_jdbc_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc-limit/expected/query01.ans

@@ -1,7 +1,7 @@
 -- start_ignore
 -- end_ignore
 -- @description query01 for PXF test to check fragments distribution across segments with JDBC profile
-SELECT * FROM fragment_distribution_jdbc_limit_ext_table ORDER BY 1;
+SELECT * FROM fd_jdbc_limit_ext_table ORDER BY 1;
  id | descr
 ----+-------
   1 | text1

automation/sqlrepo/arenadata/fragment-distribution/jdbc-limit/sql/query01.sql

@@ -1,2 +1,2 @@
 -- @description query01 for PXF test to check fragments distribution across segments with JDBC profile
-SELECT * FROM fragment_distribution_jdbc_limit_ext_table ORDER BY 1;
+SELECT * FROM fd_jdbc_limit_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc-random-policy/expected/query01.ans

@@ -0,0 +1,27 @@
+-- start_ignore
+-- end_ignore
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using random policy
+SELECT * FROM fd_random_jdbc_ext_table ORDER BY 1;
+ id | descr
+----+-------
+  1 | text1
+  2 | text2
+  3 | text3
+  4 | text4
+  5 | text5
+  6 | text6
+  7 | text7
+  8 | text8
+  9 | text9
+  10 | text10
+  11 | text11
+  12 | text12
+  13 | text13
+  14 | text14
+  15 | text15
+  16 | text16
+  17 | text17
+  18 | text18
+  19 | text19
+  20 | text20
+(20 rows)

automation/sqlrepo/arenadata/fragment-distribution/jdbc-random-policy/sql/query01.sql

@@ -0,0 +1,2 @@
+-- @description query01 for PXF test to check fragments distribution across segments with JDBC profile using random policy
+SELECT * FROM fd_random_jdbc_ext_table ORDER BY 1;

automation/sqlrepo/arenadata/fragment-distribution/jdbc/expected/query01.ans

@@ -1,7 +1,7 @@
 -- start_ignore
 -- end_ignore
 -- @description query01 for PXF test to check fragments distribution across segments with JDBC profile
-SELECT * FROM fragment_distribution_jdbc_ext_table ORDER BY 1;
+SELECT * FROM fd_jdbc_ext_table ORDER BY 1;
  id | descr
 ----+-------
   1 | text1

automation/sqlrepo/arenadata/fragment-distribution/jdbc/sql/query01.sql

@@ -1,2 +1,2 @@
 -- @description query01 for PXF test to check fragments distribution across segments with JDBC profile
-SELECT * FROM fragment_distribution_jdbc_ext_table ORDER BY 1;
+SELECT * FROM fd_jdbc_ext_table ORDER BY 1;