hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcama...@apache.org
Subject hive git commit: HIVE-13973: Extend support for other primitive types in windowing expressions (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)
Date Thu, 09 Jun 2016 09:26:45 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 185d9c572 -> c6e7c18c5


HIVE-13973: Extend support for other primitive types in windowing expressions (Jesus Camacho
Rodriguez, reviewed by Ashutosh Chauhan)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c6e7c18c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c6e7c18c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c6e7c18c

Branch: refs/heads/branch-2.1
Commit: c6e7c18c51e8dcefa0e3c380469792bb92e8bf63
Parents: 185d9c5
Author: Jesus Camacho Rodriguez <jcamacho@apache.org>
Authored: Thu Jun 9 10:27:01 2016 +0100
Committer: Jesus Camacho Rodriguez <jcamacho@apache.org>
Committed: Thu Jun 9 10:27:01 2016 +0100

----------------------------------------------------------------------
 .../hadoop/hive/ql/parse/PTFTranslator.java     |   7 +-
 .../clientpositive/windowing_range_multiorder.q |   6 +
 .../windowing_range_multiorder.q.out            | 324 +++++++++++++++++++
 3 files changed, 335 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/c6e7c18c/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
index 018d8d0..f32d02b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
@@ -599,7 +599,7 @@ public class PTFTranslator {
     if (!OI.getCategory().equals(Category.PRIMITIVE)) {
       throw new SemanticException(
           String.format(
-              "Value Boundary expression must be of primitve type. Found: %s",
+              "Value Boundary expression must be of primitive type. Found: %s",
               OI.getTypeName()));
     }
 
@@ -608,6 +608,7 @@ public class PTFTranslator {
 
     switch (pC)
     {
+    case BOOLEAN:
     case BYTE:
     case DOUBLE:
     case FLOAT:
@@ -618,10 +619,12 @@ public class PTFTranslator {
     case TIMESTAMP:
     case DATE:
     case STRING:
+    case VARCHAR:
+    case CHAR:
       break;
     default:
       throw new SemanticException(
-          String.format("Primitve type %s not supported in Value Boundary expression",
+          String.format("Primitive type %s not supported in Value Boundary expression",
               pC));
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c6e7c18c/ql/src/test/queries/clientpositive/windowing_range_multiorder.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/windowing_range_multiorder.q b/ql/src/test/queries/clientpositive/windowing_range_multiorder.q
index d8ca4d6..24ea1e6 100644
--- a/ql/src/test/queries/clientpositive/windowing_range_multiorder.q
+++ b/ql/src/test/queries/clientpositive/windowing_range_multiorder.q
@@ -32,3 +32,9 @@ select s, si, i, min(i) over (partition by s order by si, i range between
unboun
 select s, si, i, avg(i) over (partition by s order by si, i desc range between unbounded
preceding and current row) from over10k limit 100;
 
 select si, bo, i, f, max(i) over (partition by si, bo order by i, f desc range between unbounded
preceding and current row) from over10k limit 100;
+
+select bo, rank() over (partition by i order by bo nulls first, b nulls last range between
unbounded preceding and unbounded following) from over10k limit 100;
+
+select CAST(s as CHAR(12)), rank() over (partition by i order by CAST(s as CHAR(12)) nulls
last range between unbounded preceding and unbounded following) from over10k limit 100;
+
+select CAST(s as VARCHAR(12)), rank() over (partition by i order by CAST(s as VARCHAR(12))
nulls last range between unbounded preceding and unbounded following) from over10k limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/c6e7c18c/ql/src/test/results/clientpositive/windowing_range_multiorder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_range_multiorder.q.out b/ql/src/test/results/clientpositive/windowing_range_multiorder.q.out
index 9910883..5f9c3d6 100644
--- a/ql/src/test/results/clientpositive/windowing_range_multiorder.q.out
+++ b/ql/src/test/results/clientpositive/windowing_range_multiorder.q.out
@@ -908,3 +908,327 @@ POSTHOOK: Input: default@over10k
 258	true	65568	13.57	65568
 258	true	65579	47.52	65579
 258	true	65603	2.61	65603
+PREHOOK: query: select bo, rank() over (partition by i order by bo nulls first, b nulls last
range between unbounded preceding and unbounded following) from over10k limit 100
+PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k
+#### A masked pattern was here ####
+POSTHOOK: query: select bo, rank() over (partition by i order by bo nulls first, b nulls
last range between unbounded preceding and unbounded following) from over10k limit 100
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k
+#### A masked pattern was here ####
+false	1
+false	2
+false	3
+false	4
+false	5
+false	6
+false	7
+false	8
+false	9
+false	10
+false	11
+false	11
+false	13
+false	14
+false	15
+false	16
+false	17
+false	18
+false	19
+false	20
+false	20
+false	22
+true	23
+true	24
+true	25
+true	26
+true	27
+true	28
+true	29
+true	30
+true	31
+true	32
+true	33
+true	34
+true	35
+true	36
+true	37
+true	37
+true	39
+true	40
+true	41
+true	42
+true	43
+true	44
+true	45
+false	1
+false	2
+false	3
+false	4
+false	5
+false	5
+false	5
+false	8
+false	9
+false	10
+false	11
+false	12
+false	13
+false	14
+false	15
+false	16
+false	17
+true	18
+true	19
+true	20
+true	21
+true	22
+true	23
+true	24
+true	25
+true	26
+true	27
+true	27
+true	29
+true	30
+true	31
+true	32
+true	33
+true	34
+true	35
+false	1
+false	2
+false	3
+false	4
+false	4
+false	6
+false	7
+false	8
+false	9
+false	10
+false	11
+false	12
+false	13
+false	14
+false	15
+false	16
+false	17
+false	18
+true	19
+true	20
+PREHOOK: query: select CAST(s as CHAR(12)), rank() over (partition by i order by CAST(s as
CHAR(12)) nulls last range between unbounded preceding and unbounded following) from over10k
limit 100
+PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k
+#### A masked pattern was here ####
+POSTHOOK: query: select CAST(s as CHAR(12)), rank() over (partition by i order by CAST(s
as CHAR(12)) nulls last range between unbounded preceding and unbounded following) from over10k
limit 100
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k
+#### A masked pattern was here ####
+alice ichabo	1
+alice robins	2
+bob robinson	3
+calvin thomp	4
+david johnso	5
+david laerte	6
+david nixon 	7
+david nixon 	7
+ethan johnso	9
+ethan ovid  	10
+ethan underh	11
+fred miller 	12
+fred miller 	12
+gabriella ga	14
+gabriella un	15
+holly white 	16
+irene johnso	17
+katie elliso	18
+luke allen  	19
+mike quirini	20
+mike white  	21
+nick davidso	22
+oscar allen 	23
+oscar garcia	24
+oscar ichabo	25
+oscar ovid  	26
+oscar steinb	27
+priscilla ga	28
+priscilla wh	29
+priscilla xy	30
+priscilla yo	31
+rachel brown	32
+rachel ichab	33
+rachel xylop	34
+sarah thomps	35
+sarah thomps	35
+tom johnson 	37
+tom steinbec	38
+ulysses polk	39
+victor johns	40
+wendy polk  	41
+xavier david	42
+yuri ellison	43
+zach allen  	44
+zach hernand	45
+alice elliso	1
+bob carson  	2
+calvin brown	3
+david xyloph	4
+ethan white 	5
+fred johnson	6
+fred van bur	7
+gabriella ic	8
+holly laerte	9
+holly quirin	10
+jessica hern	11
+katie robins	12
+katie thomps	13
+luke nixon  	14
+mike garcia 	15
+mike hernand	16
+nick carson 	17
+nick davidso	18
+oscar carson	19
+oscar robins	20
+priscilla wh	21
+sarah falkne	22
+sarah ichabo	23
+ulysses falk	24
+victor xylop	25
+wendy garcia	26
+wendy van bu	27
+xavier under	28
+yuri garcia 	29
+yuri quirini	30
+yuri white  	31
+zach falkner	32
+zach ichabod	33
+zach nixon  	34
+zach ovid   	35
+alice ichabo	1
+alice king  	2
+alice robins	3
+calvin allen	4
+gabriella jo	5
+gabriella ni	6
+holly falkne	7
+holly hernan	8
+holly thomps	9
+katie nixon 	10
+luke brown  	11
+luke davidso	12
+luke white  	13
+mike brown  	14
+nick quirini	15
+oscar white 	16
+priscilla xy	17
+quinn garcia	18
+quinn laerte	19
+rachel young	20
+PREHOOK: query: select CAST(s as VARCHAR(12)), rank() over (partition by i order by CAST(s
as VARCHAR(12)) nulls last range between unbounded preceding and unbounded following) from
over10k limit 100
+PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k
+#### A masked pattern was here ####
+POSTHOOK: query: select CAST(s as VARCHAR(12)), rank() over (partition by i order by CAST(s
as VARCHAR(12)) nulls last range between unbounded preceding and unbounded following) from
over10k limit 100
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k
+#### A masked pattern was here ####
+alice ichabo	1
+alice robins	2
+bob robinson	3
+calvin thomp	4
+david johnso	5
+david laerte	6
+david nixon	7
+david nixon	7
+ethan johnso	9
+ethan ovid	10
+ethan underh	11
+fred miller	12
+fred miller	12
+gabriella ga	14
+gabriella un	15
+holly white	16
+irene johnso	17
+katie elliso	18
+luke allen	19
+mike quirini	20
+mike white	21
+nick davidso	22
+oscar allen	23
+oscar garcia	24
+oscar ichabo	25
+oscar ovid	26
+oscar steinb	27
+priscilla ga	28
+priscilla wh	29
+priscilla xy	30
+priscilla yo	31
+rachel brown	32
+rachel ichab	33
+rachel xylop	34
+sarah thomps	35
+sarah thomps	35
+tom johnson	37
+tom steinbec	38
+ulysses polk	39
+victor johns	40
+wendy polk	41
+xavier david	42
+yuri ellison	43
+zach allen	44
+zach hernand	45
+alice elliso	1
+bob carson	2
+calvin brown	3
+david xyloph	4
+ethan white	5
+fred johnson	6
+fred van bur	7
+gabriella ic	8
+holly laerte	9
+holly quirin	10
+jessica hern	11
+katie robins	12
+katie thomps	13
+luke nixon	14
+mike garcia	15
+mike hernand	16
+nick carson	17
+nick davidso	18
+oscar carson	19
+oscar robins	20
+priscilla wh	21
+sarah falkne	22
+sarah ichabo	23
+ulysses falk	24
+victor xylop	25
+wendy garcia	26
+wendy van bu	27
+xavier under	28
+yuri garcia	29
+yuri quirini	30
+yuri white	31
+zach falkner	32
+zach ichabod	33
+zach nixon	34
+zach ovid	35
+alice ichabo	1
+alice king	2
+alice robins	3
+calvin allen	4
+gabriella jo	5
+gabriella ni	6
+holly falkne	7
+holly hernan	8
+holly thomps	9
+katie nixon	10
+luke brown	11
+luke davidso	12
+luke white	13
+mike brown	14
+nick quirini	15
+oscar white	16
+priscilla xy	17
+quinn garcia	18
+quinn laerte	19
+rachel young	20


Mime
View raw message