You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/03 11:57:43 UTC
[03/58] [abbrv] lucene-solr:jira/solr-10879: SOLR-10123: Upgraded the
Analytics Component to version 2.0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml b/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml
deleted file mode 100644
index 4a596f7..0000000
--- a/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/rangeFacets.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<analyticsRequestEnvelope stats="true" olap="true">
- <analyticsRequest>
- <name>regular int</name>
-
- <statistic>
- <expression>mean(int(int_id))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(int(int_id))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(int(int_id))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(int(int_id))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(int(int_id))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="false">
- <field>long_ld</field>
- <start>5</start>
- <end>30</end>
- <gap>5</gap>
- <includeBoundary>lower</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>double_dd</field>
- <start>3</start>
- <end>39</end>
- <gap>7</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>date_dtd</field>
- <start>1007-01-01T23:59:59Z</start>
- <end>1044-01-01T23:59:59Z</end>
- <gap>+7YEARS</gap>
- <includeBoundary>lower</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
- <analyticsRequest>
- <name>regular float</name>
-
- <statistic>
- <expression>mean(float(float_fd))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(float(float_fd))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(float(float_fd))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(float(float_fd))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(float(float_fd))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="false">
- <field>long_ld</field>
- <start>0</start>
- <end>29</end>
- <gap>4</gap>
- <includeBoundary>all</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>double_dd</field>
- <start>4</start>
- <end>47</end>
- <gap>11</gap>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>date_dtd</field>
- <start>1004-01-01T23:59:59Z</start>
- <end>1046-01-01T23:59:59Z</end>
- <gap>+5YEARS</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
- <analyticsRequest>
- <name>hardend int</name>
-
- <statistic>
- <expression>mean(int(int_id))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(int(int_id))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(int(int_id))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(int(int_id))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(int(int_id))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="true">
- <field>long_ld</field>
- <start>5</start>
- <end>30</end>
- <gap>5</gap>
- <includeBoundary>lower</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="true">
- <field>double_dd</field>
- <start>3</start>
- <end>39</end>
- <gap>7</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="true">
- <field>date_dtd</field>
- <start>1007-01-01T23:59:59Z</start>
- <end>1044-01-01T23:59:59Z</end>
- <gap>+7YEARS</gap>
- <includeBoundary>lower</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
- <analyticsRequest>
- <name>hardend float</name>
-
- <statistic>
- <expression>mean(float(float_fd))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(float(float_fd))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(float(float_fd))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(float(float_fd))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(float(float_fd))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="true">
- <field>long_ld</field>
- <start>0</start>
- <end>29</end>
- <gap>4</gap>
- <includeBoundary>all</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="true">
- <field>double_dd</field>
- <start>4</start>
- <end>47</end>
- <gap>11</gap>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="true">
- <field>date_dtd</field>
- <start>1004-01-01T23:59:59Z</start>
- <end>1046-01-01T23:59:59Z</end>
- <gap>+5YEARS</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
- <analyticsRequest>
- <name>multigap int</name>
-
- <statistic>
- <expression>mean(int(int_id))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(int(int_id))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(int(int_id))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(int(int_id))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(int(int_id))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="false">
- <field>long_ld</field>
- <start>5</start>
- <end>30</end>
- <gap>4</gap>
- <gap>2</gap>
- <gap>6</gap>
- <gap>3</gap>
- <includeBoundary>lower</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>double_dd</field>
- <start>3</start>
- <end>39</end>
- <gap>3</gap>
- <gap>1</gap>
- <gap>7</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>date_dtd</field>
- <start>1007-01-01T23:59:59Z</start>
- <end>1044-01-01T23:59:59Z</end>
- <gap>+2YEARS</gap>
- <gap>+7YEARS</gap>
- <includeBoundary>lower</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <includeBoundary>outer</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
- <analyticsRequest>
- <name>multigap float</name>
-
- <statistic>
- <expression>mean(float(float_fd))</expression>
- <name>mean</name>
- </statistic>
- <statistic>
- <expression>sum(float(float_fd))</expression>
- <name>sum</name>
- </statistic>
- <statistic>
- <expression>median(float(float_fd))</expression>
- <name>median</name>
- </statistic>
- <statistic>
- <expression>count(float(float_fd))</expression>
- <name>count</name>
- </statistic>
- <statistic>
- <expression>sumofsquares(float(float_fd))</expression>
- <name>sumOfSquares</name>
- </statistic>
-
- <rangeFacet hardend="false">
- <field>long_ld</field>
- <start>0</start>
- <end>29</end>
- <gap>1</gap>
- <gap>4</gap>
- <includeBoundary>all</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>double_dd</field>
- <start>4</start>
- <end>47</end>
- <gap>2</gap>
- <gap>3</gap>
- <gap>11</gap>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- <rangeFacet hardend="false">
- <field>date_dtd</field>
- <start>1004-01-01T23:59:59Z</start>
- <end>1046-01-01T23:59:59Z</end>
- <gap>+4YEARS</gap>
- <gap>+5YEARS</gap>
- <includeBoundary>upper</includeBoundary>
- <includeBoundary>edge</includeBoundary>
- <otherRange>all</otherRange>
- </rangeFacet>
- </analyticsRequest>
-</analyticsRequestEnvelope>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/expressions.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/expressions.txt b/solr/contrib/analytics/src/test-files/solr/analytics/expressions.txt
new file mode 100644
index 0000000..6f5c916
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/expressions.txt
@@ -0,0 +1,65 @@
+o.ar.s.sum=sum(int_id)
+o.ar.s.unique=unique(long_ld)
+o.ar.s.su=add(sum(int_id),unique(long_ld))
+o.ar.s.mean=mean(int_id)
+o.ar.s.count=count(long_ld)
+o.ar.s.median=median(int_id)
+o.ar.s.mcm=add(mean(int_id),count(long_ld),median(int_id))
+
+o.mr.s.sum=sum(int_id)
+o.mr.s.unique=unique(long_ld)
+o.mr.s.su=mult(sum(int_id),unique(long_ld))
+o.mr.s.mean=mean(int_id)
+o.mr.s.count=count(long_ld)
+o.mr.s.median=median(int_id)
+o.mr.s.mcm=mult(mean(int_id),count(long_ld),median(int_id))
+
+o.dr.s.sum=sum(int_id)
+o.dr.s.unique=unique(long_ld)
+o.dr.s.su=div(sum(int_id),unique(long_ld))
+o.dr.s.mean=mean(int_id)
+o.dr.s.count=count(long_ld)
+o.dr.s.mc=div(mean(int_id),count(long_ld))
+
+o.pr.s.sum=sum(int_id)
+o.pr.s.unique=unique(long_ld)
+o.pr.s.su=pow(sum(int_id),unique(long_ld))
+o.pr.s.mean=mean(int_id)
+o.pr.s.count=count(long_ld)
+o.pr.s.mc=pow(mean(int_id),count(long_ld))
+
+o.nr.s.sum=sum(int_id)
+o.nr.s.s=neg(sum(int_id))
+o.nr.s.count=count(long_ld)
+o.nr.s.c=neg(count(long_ld))
+
+o.avr.s.sum=sum(int_id)
+o.avr.s.s=abs(neg(sum(int_id)))
+o.avr.s.count=count(long_ld)
+o.avr.s.c=abs(neg(count(long_ld)))
+
+o.cnr.s.c8=8
+o.cnr.s.c10=10.0
+
+o.dmr.s.median=median(date_dtd)
+o.dmr.s.cme="+2YEARS"
+o.dmr.s.dmme=date_math(median(date_dtd),"+2YEARS")
+o.dmr.s.max=max(date_dtd)
+o.dmr.s.cma="+2MONTHS"
+o.dmr.s.dmma=date_math(max(date_dtd),"+2MONTHS")
+
+o.cdr.s.cd1=1800-12-31T23:59:59Z
+o.cdr.s.cs1="1800-12-31T23:59:59Z"
+o.cdr.s.cd2=1804-06-30T23:59:59Z
+o.cdr.s.cs2="1804-06-30T23:59:59Z"
+
+o.csr.s.cs1="this is the first"
+o.csr.s.cs2="this is the second"
+o.csr.s.cs3="this is the third"
+
+o.cr.s.csmin="this is the first"
+o.cr.s.min=min(string_sd)
+o.cr.s.ccmin=concat("this is the first",min(string_sd))
+o.cr.s.csmax="this is the second"
+o.cr.s.max=max(string_sd)
+o.cr.s.ccmax=concat("this is the second",max(string_sd))
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/facetSorting.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/facetSorting.txt b/solr/contrib/analytics/src/test-files/solr/analytics/facetSorting.txt
new file mode 100644
index 0000000..4663217
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/facetSorting.txt
@@ -0,0 +1,4 @@
+o.ar.s.min=min(double_dd)
+o.ar.s.max=max(long_ld)
+o.ar.ff=string_sd
+o.ar.ff.string_sd.sortstatistic=min
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacetExtras.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacetExtras.txt b/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacetExtras.txt
new file mode 100644
index 0000000..3979f57
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacetExtras.txt
@@ -0,0 +1,66 @@
+o.sr.s.mean=mean(int_id)
+o.sr.s.median=median(int_id)
+o.sr.s.count=count(int_id)
+o.sr.s.percentile_20=percentile(20,int_id)
+o.sr.ff=long_ld
+o.sr.ff.long_ld.ss=mean
+o.sr.ff.long_ld.sd=asc
+o.sr.ff=float_fd
+o.sr.ff.float_fd.ss=median
+o.sr.ff.float_fd.sd=desc
+o.sr.ff=double_dd
+o.sr.ff.double_dd.ss=count
+o.sr.ff.double_dd.sd=asc
+o.sr.ff=string_sd
+o.sr.ff.string_sd.ss=percentile_20
+o.sr.ff.string_sd.sd=desc
+
+o.lr.s.mean=mean(int_id)
+o.lr.s.median=median(int_id)
+o.lr.s.count=count(int_id)
+o.lr.s.percentile_20=percentile(20,int_id)
+o.lr.ff=long_ld
+o.lr.ff.long_ld.ss=mean
+o.lr.ff.long_ld.sd=asc
+o.lr.ff.long_ld.limit=5
+o.lr.ff=float_fd
+o.lr.ff.float_fd.ss=median
+o.lr.ff.float_fd.sd=desc
+o.lr.ff.float_fd.limit=3
+o.lr.ff=double_dd
+o.lr.ff.double_dd.ss=count
+o.lr.ff.double_dd.sd=asc
+o.lr.ff.double_dd.limit=7
+o.lr.ff=string_sd
+o.lr.ff.string_sd.ss=percentile_20
+o.lr.ff.string_sd.sd=desc
+o.lr.ff.string_sd.limit=1
+
+
+
+o.offAll.s.mean=mean(int_id)
+o.offAll.ff=long_ld
+o.offAll.ff.long_ld.ss=mean
+o.offAll.ff.long_ld.sd=asc
+o.offAll.ff.long_ld.limit=7
+
+o.off0.s.mean=mean(int_id)
+o.off0.ff=long_ld
+o.off0.ff.long_ld.ss=mean
+o.off0.ff.long_ld.sd=asc
+o.off0.ff.long_ld.limit=2
+o.off0.ff.long_ld.offset=0
+
+o.off1.s.mean=mean(int_id)
+o.off1.ff=long_ld
+o.off1.ff.long_ld.ss=mean
+o.off1.ff.long_ld.sd=asc
+o.off1.ff.long_ld.limit=2
+o.off1.ff.long_ld.offset=2
+
+o.off2.s.mean=mean(int_id)
+o.off2.ff=long_ld
+o.off2.ff.long_ld.ss=mean
+o.off2.ff.long_ld.sd=asc
+o.off2.ff.long_ld.limit=3
+o.off2.ff.long_ld.offset=4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacets.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacets.txt b/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacets.txt
new file mode 100644
index 0000000..5ba5953
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/fieldFacets.txt
@@ -0,0 +1,132 @@
+o.sum.s.int=sum(int_id)
+o.sum.s.long=sum(long_ld)
+o.sum.s.float=sum(float_fd)
+o.sum.s.double=sum(double_dd)
+o.sum.ff=string_sd
+o.sum.ff=date_dtd
+
+o.mean.s.int=mean(int_id)
+o.mean.s.long=mean(long_ld)
+o.mean.s.float=mean(float_fd)
+o.mean.s.double=mean(double_dd)
+o.mean.ff=string_sd
+o.mean.ff=date_dtd
+
+o.sumOfSquares.s.int=sumofsquares(int_id)
+o.sumOfSquares.s.long=sumofsquares(long_ld)
+o.sumOfSquares.s.float=sumofsquares(float_fd)
+o.sumOfSquares.s.double=sumofsquares(double_dd)
+o.sumOfSquares.ff=string_sd
+o.sumOfSquares.ff=date_dtd
+
+o.stddev.s.int=stddev(int_id)
+o.stddev.s.long=stddev(long_ld)
+o.stddev.s.float=stddev(float_fd)
+o.stddev.s.double=stddev(double_dd)
+o.stddev.ff=string_sd
+o.stddev.ff=date_dtd
+
+o.median.s.int=median(int_id)
+o.median.s.long=median(long_ld)
+o.median.s.float=median(float_fd)
+o.median.s.double=median(double_dd)
+o.median.ff=string_sd
+o.median.ff=date_dtd
+
+o.percentile_20n.s.int=percentile(20,int_id)
+o.percentile_20n.s.long=percentile(20,long_ld)
+o.percentile_20n.s.float=percentile(20,float_fd)
+o.percentile_20n.s.double=percentile(20,double_dd)
+o.percentile_20n.ff=string_sd
+o.percentile_20n.ff=date_dtd
+
+o.percentile_20.s.str=percentile(20,string_sd)
+o.percentile_20.s.date=percentile(20,date_dtd)
+o.percentile_20.ff=int_id
+o.percentile_20.ff=long_ld
+
+o.percentile_60n.s.int=percentile(60,int_id)
+o.percentile_60n.s.long=percentile(60,long_ld)
+o.percentile_60n.s.float=percentile(60,float_fd)
+o.percentile_60n.s.double=percentile(60,double_dd)
+o.percentile_60n.ff=string_sd
+o.percentile_60n.ff=date_dtd
+
+o.percentile_60.s.str=percentile(60,string_sd)
+o.percentile_60.s.date=percentile(60,date_dtd)
+o.percentile_60.ff=int_id
+o.percentile_60.ff=long_ld
+
+o.minn.s.int=min(int_id)
+o.minn.s.long=min(long_ld)
+o.minn.s.float=min(float_fd)
+o.minn.s.double=min(double_dd)
+o.minn.ff=string_sd
+o.minn.ff=date_dtd
+
+o.min.s.str=min(string_sd)
+o.min.s.date=min(date_dtd)
+o.min.ff=int_id
+o.min.ff=long_ld
+
+o.maxn.s.int=max(int_id)
+o.maxn.s.long=max(long_ld)
+o.maxn.s.float=max(float_fd)
+o.maxn.s.double=max(double_dd)
+o.maxn.ff=string_sd
+o.maxn.ff=date_dtd
+
+o.max.s.str=max(string_sd)
+o.max.s.date=max(date_dtd)
+o.max.ff=int_id
+o.max.ff=long_ld
+
+o.countn.s.int=count(int_id)
+o.countn.s.long=count(long_ld)
+o.countn.s.float=count(float_fd)
+o.countn.s.double=count(double_dd)
+o.countn.ff=string_sd
+o.countn.ff=date_dtd
+
+o.count.s.str=count(string_sd)
+o.count.s.date=count(date_dtd)
+o.count.ff=int_id
+o.count.ff=long_ld
+
+o.uniquen.s.int=unique(int_id)
+o.uniquen.s.long=unique(long_ld)
+o.uniquen.s.float=unique(float_fd)
+o.uniquen.s.double=unique(double_dd)
+o.uniquen.ff=string_sd
+o.uniquen.ff=date_dtd
+
+o.unique.s.str=unique(string_sd)
+o.unique.s.date=unique(date_dtd)
+o.unique.ff=int_id
+o.unique.ff=long_ld
+
+o.missingn.s.int=missing(int_id)
+o.missingn.s.long=missing(long_ld)
+o.missingn.s.float=missing(float_fd)
+o.missingn.s.double=missing(double_dd)
+o.missingn.ff=string_sd
+o.missingn.ff=date_dtd
+
+o.missing.s.str=missing(string_sd)
+o.missing.s.date=missing(date_dtd)
+o.missing.ff=int_id
+o.missing.ff=long_ld
+
+o.multivalued.s.mean=mean(int_id)
+o.multivalued.ff=long_ldm
+o.multivalued.ff=string_sdm
+o.multivalued.ff=date_dtdm
+
+o.missingf.s.mean=mean(int_id)
+o.missingf.ff=date_dtd
+o.missingf.ff.date_dtd.dim=true
+o.missingf.ff=string_sd
+o.missingf.ff.string_sd.dim=true
+o.missingf.ff.string_sd.sm=true
+o.missingf.ff=date_dtdm
+o.missingf.ff.date_dtdm.sm=true
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/functions.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/functions.txt b/solr/contrib/analytics/src/test-files/solr/analytics/functions.txt
new file mode 100644
index 0000000..ce73583
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/functions.txt
@@ -0,0 +1,57 @@
+o.ar.s.sum=sum(add(int_id,float_fd))
+o.ar.s.sumc=sum(add_if_dd)
+o.ar.s.mean=mean(add(long_ld,double_dd,float_fd))
+o.ar.s.meanc=mean(add_ldf_dd)
+
+o.mr.s.sum=sum(mult(int_id,float_fd))
+o.mr.s.sumc=sum(mult_if_dd)
+o.mr.s.mean=mean(mult(long_ld,double_dd,float_fd))
+o.mr.s.meanc=mean(mult_ldf_dd)
+
+o.dr.s.sum=sum(div(int_id,float_fd))
+o.dr.s.sumc=sum(div_if_dd)
+o.dr.s.mean=mean(div(long_ld,double_dd))
+o.dr.s.meanc=mean(div_ld_dd)
+
+o.pr.s.sum=sum(pow(int_id,float_fd))
+o.pr.s.sumc=sum(pow_if_dd)
+o.pr.s.mean=mean(pow(long_ld,double_dd))
+o.pr.s.meanc=mean(pow_ld_dd)
+
+o.nr.s.sum=sum(neg(int_id))
+o.nr.s.sumc=sum(neg_id)
+o.nr.s.mean=mean(neg(long_ld))
+o.nr.s.meanc=mean(neg_ld)
+
+o.avr.s.sum=sum(abs(neg(int_id)))
+o.avr.s.sumc=sum(int_id)
+o.avr.s.mean=mean(abs(neg(int_id)))
+o.avr.s.meanc=mean(int_id)
+
+o.cnr.s.sum=sum(8)
+o.cnr.s.sumc=sum(const_8_dd)
+o.cnr.s.mean=mean(10)
+o.cnr.s.meanc=mean(const_10_dd)
+
+o.dmr.s.median=median(date_math(date_dtd,"+2YEARS"))
+o.dmr.s.medianc=median(dm_2y_dtd)
+o.dmr.s.max=max(date_math(date_dtd,"+2MONTHS"))
+o.dmr.s.maxc=max(dm_2m_dtd)
+
+o.cdr.s.median=median(1800-06-30T23:59:59Z)
+o.cdr.s.medianc=median(const_00_dtd)
+o.cdr.s.max=max(1804-06-30T23:59:59Z)
+o.cdr.s.maxc=max(const_04_dtd)
+
+o.csr.s.min=min("this is the first")
+o.csr.s.minc=min(const_first_sd)
+o.csr.s.max=max("this is the second")
+o.csr.s.maxc=max(const_second_sd)
+
+o.cr.s.min=concat("this is the first",min(string_sd))
+o.cr.s.minc=min(concat_first_sd)
+o.cr.s.max=concat("this is the second",max(string_sd))
+o.cr.s.maxc=max(concat_second_sd)
+
+o.ms.s.min=min(miss_dd)
+o.ms.s.max=max(miss_dd)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/noFacets.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/noFacets.txt b/solr/contrib/analytics/src/test-files/solr/analytics/noFacets.txt
new file mode 100644
index 0000000..84e43eb
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/noFacets.txt
@@ -0,0 +1,74 @@
+o.sr.s.int_id=sum(int_id)
+o.sr.s.long_ld=sum(long_ld)
+o.sr.s.float_fd=sum(float_fd)
+o.sr.s.double_dd=sum(double_dd)
+
+o.sosr.s.int_id=sumofsquares(int_id)
+o.sosr.s.long_ld=sumofsquares(long_ld)
+o.sosr.s.float_fd=sumofsquares(float_fd)
+o.sosr.s.double_dd=sumofsquares(double_dd)
+
+o.mr.s.int_id=mean(int_id)
+o.mr.s.long_ld=mean(long_ld)
+o.mr.s.float_fd=mean(float_fd)
+o.mr.s.double_dd=mean(double_dd)
+
+o.str.s.int_id=stddev(int_id)
+o.str.s.long_ld=stddev(long_ld)
+o.str.s.float_fd=stddev(float_fd)
+o.str.s.double_dd=stddev(double_dd)
+
+o.medr.s.int_id=median(int_id)
+o.medr.s.long_ld=median(long_ld)
+o.medr.s.float_fd=median(float_fd)
+o.medr.s.double_dd=median(double_dd)
+o.medr.s.date_dtd=median(date_dtd)
+
+o.p2r.s.int_id=percentile(20,int_id)
+o.p2r.s.long_ld=percentile(20,long_ld)
+o.p2r.s.float_fd=percentile(20,float_fd)
+o.p2r.s.double_dd=percentile(20,double_dd)
+o.p2r.s.date_dtd=percentile(20,date_dtd)
+o.p2r.s.string_sd=percentile(20,string_sd)
+
+o.p6r.s.int_id=percentile(60,int_id)
+o.p6r.s.long_ld=percentile(60,long_ld)
+o.p6r.s.float_fd=percentile(60,float_fd)
+o.p6r.s.double_dd=percentile(60,double_dd)
+o.p6r.s.date_dtd=percentile(60,date_dtd)
+o.p6r.s.string_sd=percentile(60,string_sd)
+
+o.mir.s.int_id=min(int_id)
+o.mir.s.long_ld=min(long_ld)
+o.mir.s.float_fd=min(float_fd)
+o.mir.s.double_dd=min(double_dd)
+o.mir.s.date_dtd=min(date_dtd)
+o.mir.s.string_sd=min(string_sd)
+
+o.mar.s.int_id=max(int_id)
+o.mar.s.long_ld=max(long_ld)
+o.mar.s.float_fd=max(float_fd)
+o.mar.s.double_dd=max(double_dd)
+o.mar.s.date_dtd=max(date_dtd)
+o.mar.s.string_sd=max(string_sd)
+
+o.cr.s.int_id=count(int_id)
+o.cr.s.long_ld=count(long_ld)
+o.cr.s.float_fd=count(float_fd)
+o.cr.s.double_dd=count(double_dd)
+o.cr.s.date_dtd=count(date_dtd)
+o.cr.s.string_sd=count(string_sd)
+
+o.ur.s.int_id=unique(int_id)
+o.ur.s.long_ld=unique(long_ld)
+o.ur.s.float_fd=unique(float_fd)
+o.ur.s.double_dd=unique(double_dd)
+o.ur.s.date_dtd=unique(date_dtd)
+o.ur.s.string_sd=unique(string_sd)
+
+o.misr.s.int_id=missing(int_id)
+o.misr.s.long_ld=missing(long_ld)
+o.misr.s.float_fd=missing(float_fd)
+o.misr.s.double_dd=missing(double_dd)
+o.misr.s.date_dtd=missing(date_dtd)
+o.misr.s.string_sd=missing(string_sd)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/queryFacets.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/queryFacets.txt b/solr/contrib/analytics/src/test-files/solr/analytics/queryFacets.txt
new file mode 100644
index 0000000..84d8fc6
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/queryFacets.txt
@@ -0,0 +1,27 @@
+o.ir.s.sum=sum(int_id)
+o.ir.s.mean=mean(int_id)
+o.ir.s.median=median(int_id)
+o.ir.s.percentile_8=percentile(8,int_id)
+o.ir.ff=string_sd
+o.ir.ff.string_sd.h=true
+o.ir.qf=float1
+o.ir.qf.float1.q=float_fd:[* TO 50]
+o.ir.qf=float2
+o.ir.qf.float2.q=float_fd:[* TO 30]
+
+o.lr.s.sum=sum(long_ld)
+o.lr.s.mean=mean(long_ld)
+o.lr.s.median=median(long_ld)
+o.lr.s.percentile_8=percentile(8,long_ld)
+o.lr.qf=string
+o.lr.qf.string.q=string_sd:abc1
+o.lr.qf.string.q=string_sd:abc2
+
+o.fr.s.sum=sum(float_fd)
+o.fr.s.mean=mean(float_fd)
+o.fr.s.median=median(float_fd)
+o.fr.s.percentile_8=percentile(8,float_fd)
+o.fr.qf=lad
+o.fr.qf.lad.q=long_ld:[20 TO *]
+o.fr.qf.lad.q=long_ld:[30 TO *]
+o.fr.qf.lad.q=double_dd:[* TO 50]
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/analytics/rangeFacets.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/analytics/rangeFacets.txt b/solr/contrib/analytics/src/test-files/solr/analytics/rangeFacets.txt
new file mode 100644
index 0000000..29aae5d
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/analytics/rangeFacets.txt
@@ -0,0 +1,161 @@
+o.ri.s.sum=sum(int_id)
+o.ri.s.mean=mean(int_id)
+o.ri.s.median=median(int_id)
+o.ri.s.count=count(int_id)
+o.ri.s.sumOfSquares=sumofsquares(int_id)
+o.ri.rf=long_ld
+o.ri.rf.long_ld.st=5
+o.ri.rf.long_ld.e=30
+o.ri.rf.long_ld.g=5
+o.ri.rf.long_ld.ib=lower
+o.ri.rf.long_ld.or=all
+o.ri.rf=double_dd
+o.ri.rf.double_dd.st=3
+o.ri.rf.double_dd.e=39
+o.ri.rf.double_dd.g=7
+o.ri.rf.double_dd.ib=upper
+o.ri.rf.double_dd.ib=outer
+o.ri.rf.double_dd.or=all
+o.ri.rf=date_dtd
+o.ri.rf.date_dtd.st=1007-01-01T23:59:59Z
+o.ri.rf.date_dtd.e=1044-01-01T23:59:59Z
+o.ri.rf.date_dtd.g=+7YEARS
+o.ri.rf.date_dtd.ib=lower
+o.ri.rf.date_dtd.ib=edge
+o.ri.rf.date_dtd.ib=outer
+o.ri.rf.date_dtd.or=all
+
+o.rf.s.sum=sum(float_fd)
+o.rf.s.mean=mean(float_fd)
+o.rf.s.median=median(float_fd)
+o.rf.s.count=count(float_fd)
+o.rf.s.sumOfSquares=sumofsquares(float_fd)
+o.rf.rf=long_ld
+o.rf.rf.long_ld.st=0
+o.rf.rf.long_ld.e=29
+o.rf.rf.long_ld.g=4
+o.rf.rf.long_ld.ib=all
+o.rf.rf.long_ld.or=all
+o.rf.rf=double_dd
+o.rf.rf.double_dd.st=4
+o.rf.rf.double_dd.e=47
+o.rf.rf.double_dd.g=11
+o.rf.rf.double_dd.ib=edge
+o.rf.rf.double_dd.or=all
+o.rf.rf=date_dtd
+o.rf.rf.date_dtd.st=1004-01-01T23:59:59Z
+o.rf.rf.date_dtd.e=1046-01-01T23:59:59Z
+o.rf.rf.date_dtd.g=+5YEARS
+o.rf.rf.date_dtd.ib=upper
+o.rf.rf.date_dtd.ib=edge
+o.rf.rf.date_dtd.or=all
+
+o.hi.s.sum=sum(int_id)
+o.hi.s.mean=mean(int_id)
+o.hi.s.median=median(int_id)
+o.hi.s.count=count(int_id)
+o.hi.s.sumOfSquares=sumofsquares(int_id)
+o.hi.rf=long_ld
+o.hi.rf.long_ld.st=5
+o.hi.rf.long_ld.e=30
+o.hi.rf.long_ld.g=5
+o.hi.rf.long_ld.he=true
+o.hi.rf.long_ld.ib=lower
+o.hi.rf.long_ld.or=all
+o.hi.rf=double_dd
+o.hi.rf.double_dd.st=3
+o.hi.rf.double_dd.e=39
+o.hi.rf.double_dd.g=7
+o.hi.rf.double_dd.he=true
+o.hi.rf.double_dd.ib=upper
+o.hi.rf.double_dd.ib=outer
+o.hi.rf.double_dd.or=all
+o.hi.rf=date_dtd
+o.hi.rf.date_dtd.st=1007-01-01T23:59:59Z
+o.hi.rf.date_dtd.e=1044-01-01T23:59:59Z
+o.hi.rf.date_dtd.g=+7YEARS
+o.hi.rf.date_dtd.he=true
+o.hi.rf.date_dtd.ib=lower
+o.hi.rf.date_dtd.ib=edge
+o.hi.rf.date_dtd.ib=outer
+o.hi.rf.date_dtd.or=all
+
+o.hf.s.sum=sum(float_fd)
+o.hf.s.mean=mean(float_fd)
+o.hf.s.median=median(float_fd)
+o.hf.s.count=count(float_fd)
+o.hf.s.sumOfSquares=sumofsquares(float_fd)
+o.hf.rf=long_ld
+o.hf.rf.long_ld.st=0
+o.hf.rf.long_ld.e=29
+o.hf.rf.long_ld.g=4
+o.hf.rf.long_ld.he=true
+o.hf.rf.long_ld.ib=all
+o.hf.rf.long_ld.or=all
+o.hf.rf=double_dd
+o.hf.rf.double_dd.st=4
+o.hf.rf.double_dd.e=47
+o.hf.rf.double_dd.g=11
+o.hf.rf.double_dd.he=true
+o.hf.rf.double_dd.ib=edge
+o.hf.rf.double_dd.or=all
+o.hf.rf=date_dtd
+o.hf.rf.date_dtd.st=1004-01-01T23:59:59Z
+o.hf.rf.date_dtd.e=1046-01-01T23:59:59Z
+o.hf.rf.date_dtd.g=+5YEARS
+o.hf.rf.date_dtd.he=true
+o.hf.rf.date_dtd.ib=upper
+o.hf.rf.date_dtd.ib=edge
+o.hf.rf.date_dtd.or=all
+
+o.mi.s.sum=sum(int_id)
+o.mi.s.mean=mean(int_id)
+o.mi.s.median=median(int_id)
+o.mi.s.count=count(int_id)
+o.mi.s.sumOfSquares=sumofsquares(int_id)
+o.mi.rf=long_ld
+o.mi.rf.long_ld.st=5
+o.mi.rf.long_ld.e=30
+o.mi.rf.long_ld.g=4,2,6,3
+o.mi.rf.long_ld.ib=lower
+o.mi.rf.long_ld.or=all
+o.mi.rf=double_dd
+o.mi.rf.double_dd.st=3
+o.mi.rf.double_dd.e=39
+o.mi.rf.double_dd.g=3,1,7
+o.mi.rf.double_dd.ib=upper
+o.mi.rf.double_dd.ib=outer
+o.mi.rf.double_dd.or=all
+o.mi.rf=date_dtd
+o.mi.rf.date_dtd.st=1007-01-01T23:59:59Z
+o.mi.rf.date_dtd.e=1044-01-01T23:59:59Z
+o.mi.rf.date_dtd.g=+2YEARS,+7YEARS
+o.mi.rf.date_dtd.ib=lower
+o.mi.rf.date_dtd.ib=edge
+o.mi.rf.date_dtd.ib=outer
+o.mi.rf.date_dtd.or=all
+
+o.mf.s.sum=sum(float_fd)
+o.mf.s.mean=mean(float_fd)
+o.mf.s.median=median(float_fd)
+o.mf.s.count=count(float_fd)
+o.mf.s.sumOfSquares=sumofsquares(float_fd)
+o.mf.rf=long_ld
+o.mf.rf.long_ld.st=0
+o.mf.rf.long_ld.e=29
+o.mf.rf.long_ld.g=1,4
+o.mf.rf.long_ld.ib=all
+o.mf.rf.long_ld.or=all
+o.mf.rf=double_dd
+o.mf.rf.double_dd.st=4
+o.mf.rf.double_dd.e=47
+o.mf.rf.double_dd.g=2,3,11
+o.mf.rf.double_dd.ib=edge
+o.mf.rf.double_dd.or=all
+o.mf.rf=date_dtd
+o.mf.rf.date_dtd.st=1004-01-01T23:59:59Z
+o.mf.rf.date_dtd.e=1046-01-01T23:59:59Z
+o.mf.rf.date_dtd.g=+4YEARS,+5YEARS
+o.mf.rf.date_dtd.ib=upper
+o.mf.rf.date_dtd.ib=edge
+o.mf.rf.date_dtd.or=all
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
index 04b22b1..82d408a 100644
--- a/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
+++ b/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
@@ -25,7 +25,7 @@
-->
-<schema name="schema-docValues" version="1.6">
+<schema name="schema-analytics" version="1.0">
<!-- field type definitions... note that the "name" attribute is
@@ -54,7 +54,7 @@
<fieldType name="uuid" class="solr.UUIDField"/>
- <field name="id" type="string" required="true"/>
+ <field name="id" type="string" docValues="true" multiValued="false" required="true"/>
<field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1"/>
<field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2"/>
@@ -63,8 +63,7 @@
<field name="datedv" type="date" indexed="false" stored="false" docValues="true" default="1995-12-31T23:59:59.999Z"/>
<field name="stringdv" type="string" indexed="false" stored="false" docValues="true" default="solr"/>
- <field name="stringdvm" type="string" indexed="false" stored="false" docValues="true" default="solr"
- multiValued="true"/>
+ <field name="stringdvm" type="string" indexed="false" stored="false" docValues="true" default="solr" multiValued="true"/>
<dynamicField name="*_i" type="int" indexed="true" stored="true" docValues="false" multiValued="false"/>
<dynamicField name="*_id" type="int" indexed="true" stored="true" docValues="true" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
new file mode 100644
index 0000000..31d6437
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+ <dataDir>${solr.data.dir:}</dataDir>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+ <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <arr name="components">
+ <str>query</str>
+ <str>facet</str>
+ <str>analytics</str>
+ <str>highlight</str>
+ <str>debug</str>
+ <str>expand</str>
+ </arr>
+ </requestHandler>
+
+ <searchComponent name="analytics" class="org.apache.solr.handler.component.AnalyticsComponent" />
+
+ <requestHandler name="/analytics" class="org.apache.solr.handler.AnalyticsHandler" />
+
+</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
deleted file mode 100644
index 604bb17..0000000
--- a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <dataDir>${solr.data.dir:}</dataDir>
- <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <schemaFactory class="ClassicIndexSchemaFactory"/>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- <arr name="components">
- <str>query</str>
- <str>facet</str>
- <str>analytics</str>
- <str>highlight</str>
- <str>debug</str>
- <str>expand</str>
- </arr>
- </requestHandler>
-
- <searchComponent name="analytics" class="org.apache.solr.handler.component.AnalyticsComponent" />
-
-</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xml b/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xml
new file mode 100644
index 0000000..d446437
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/schema.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The Solr schema file for cloud analytics, version 1.0 -->
+
+<schema name="cloud-analytics" version="1.0">
+
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
+
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
+ -->
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
+
+
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="signatureField" type="string" indexed="true" stored="false"/>
+
+ <!-- for versioning -->
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+ <!-- points to the root document of a block of nested documents -->
+ <field name="_root_" type="string" indexed="true" stored="true"/>
+
+ <field name="_route_" type="string" indexed="true" stored="true" multiValued="false"/>
+
+ <!-- dynamic fields with doc-values (for analytics) -->
+ <dynamicField name="*_id" type="int" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_idm" type="int" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_sd" type="string" docValues="true" indexed="true" stored="true" />
+ <dynamicField name="*_sdm" type="string" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_ld" type="long" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_ldm" type="long" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_bd" type="boolean" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_bdm" type="boolean" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_fd" type="float" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_fdm" type="float" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_dd" type="double" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_ddm" type="double" docValues="true" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_dtd" type="date" docValues="true" indexed="true" stored="true"/>
+ <dynamicField name="*_dtdm" type="date" docValues="true" indexed="true" stored="true" multiValued="true"/>
+
+ <uniqueKey>id</uniqueKey>
+</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xml b/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xml
new file mode 100644
index 0000000..102e39e
--- /dev/null
+++ b/solr/contrib/analytics/src/test-files/solr/configsets/cloud-analytics/conf/solrconfig.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Minimal solrconfig.xml with /select, /admin and /update only -->
+
+<config>
+
+ <dataDir>${solr.data.dir:}</dataDir>
+
+ <directoryFactory name="DirectoryFactory"
+ class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <commitWithin>
+ <softCommit>${solr.commitwithin.softcommit:true}</softCommit>
+ </commitWithin>
+ <updateLog></updateLog>
+ </updateHandler>
+
+ <requestHandler name="/select" class="solr.SearchHandler">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ <str name="indent">true</str>
+ <str name="df">text</str>
+ </lst>
+
+ <arr name="components">
+ <str>query</str>
+ <str>facet</str>
+ <str>analytics</str>
+ <str>highlight</str>
+ <str>debug</str>
+ <str>expand</str>
+ </arr>
+ </requestHandler>
+
+ <searchComponent name="analytics" class="org.apache.solr.handler.component.AnalyticsComponent" />
+ <requestHandler name="/analytics" class="org.apache.solr.handler.AnalyticsHandler" />
+</config>
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsCloudTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsCloudTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsCloudTest.java
new file mode 100644
index 0000000..59ebbcb
--- /dev/null
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsCloudTest.java
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.analytics;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import org.apache.solr.analytics.util.AnalyticsResponseHeadings;
+import org.apache.solr.analytics.util.MedianCalculator;
+import org.apache.solr.analytics.util.OrdinalCalculator;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.cloud.AbstractDistribZkTestBase;
+import org.apache.solr.cloud.SolrCloudTestCase;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
+import org.junit.AfterClass;
+
+public class AbstractAnalyticsStatsCloudTest extends SolrCloudTestCase {
+
+ protected static final String[] BASEPARMS = new String[]{ "q", "*:*", "indent", "true", "olap", "true", "rows", "0" };
+ protected static final HashMap<String,Object> defaults = new HashMap<>();
+
+ public static enum VAL_TYPE {
+ INTEGER("int"),
+ LONG("long"),
+ FLOAT("float"),
+ DOUBLE("double"),
+ STRING("str"),
+ DATE("date");
+
+ private VAL_TYPE (final String text) {
+ this.text = text;
+ }
+
+ private final String text;
+
+ @Override
+ public String toString() {
+ return text;
+ }
+ }
+
+
+
+ protected static final String COLLECTIONORALIAS = "collection1";
+ protected static final int TIMEOUT = DEFAULT_TIMEOUT;
+ protected static final String id = "id";
+
+ public static void setupCluster() throws Exception {
+ configureCluster(4)
+ .addConfig("conf", configset("cloud-analytics"))
+ .configure();
+
+ CollectionAdminRequest.createCollection(COLLECTIONORALIAS, "conf", 2, 1).process(cluster.getSolrClient());
+ AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTIONORALIAS, cluster.getSolrClient().getZkStateReader(),
+ false, true, TIMEOUT);
+ cleanIndex();
+ }
+
+ public static void cleanIndex() throws Exception {
+ new UpdateRequest()
+ .deleteByQuery("*:*")
+ .commit(cluster.getSolrClient(), COLLECTIONORALIAS);
+ }
+
+ @AfterClass
+ public static void afterClassAbstractAnalysis() {
+ defaults.clear();
+ }
+
+ protected NamedList<Object> queryCloudAnalytics(String[] testParams) throws SolrServerException, IOException, InterruptedException {
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.set("q", "*:*");
+ params.set("indent", "true");
+ params.set("olap", "true");
+ params.set("rows", "0");
+ for (int i = 0; i + 1 < testParams.length;) {
+ params.set(testParams[i++], testParams[i++]);
+ }
+ cluster.waitForAllNodes(10000);
+ QueryRequest qreq = new QueryRequest(params);
+ QueryResponse resp = qreq.process(cluster.getSolrClient(), COLLECTIONORALIAS);
+ return resp.getResponse();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <T> T getValue(NamedList<Object> response, String infoName, String exprName) {
+ return (T)response.findRecursive(AnalyticsResponseHeadings.COMPLETED_OLD_HEADER,
+ infoName,
+ exprName);
+ }
+
+ public <T extends Number & Comparable<T>> Double calculateNumberStat(ArrayList<T> list, String stat) {
+ Double result;
+ if (stat.equals("median")) {
+ result = MedianCalculator.getMedian(list);
+ } else if (stat.equals("mean")) {
+ double d = 0;
+ for (T element : list) {
+ d += element.doubleValue();
+ }
+ result = Double.valueOf(d/list.size());
+ } else if (stat.equals("sum")) {
+ double d = 0;
+ for (T element : list) {
+ d += element.doubleValue();
+ }
+ result = Double.valueOf(d);
+ } else if (stat.equals("sumOfSquares")) {
+ double d = 0;
+ for (T element : list) {
+ d += element.doubleValue()*element.doubleValue();
+ }
+ result = Double.valueOf(d);
+ } else if (stat.equals("stddev")) {
+ double sum = 0;
+ double sumSquares = 0;
+ for (T element : list) {
+ sum += element.doubleValue();
+ sumSquares += element.doubleValue()*element.doubleValue();
+ }
+ result = Math.sqrt(sumSquares/list.size()-sum*sum/(list.size()*list.size()));
+ } else {
+ throw new IllegalArgumentException();
+ }
+ return result;
+ }
+
+ public <T extends Comparable<T>> Object calculateStat(ArrayList<T> list, String stat) {
+ Object result;
+ if (stat.contains("perc_")) {
+ ArrayList<Integer> percs = new ArrayList<>(1);
+ int ord = (int) Math.ceil(Double.parseDouble(stat.substring(5))/100 * list.size()) - 1;
+ percs.add(ord);
+ OrdinalCalculator.putOrdinalsInPosition(list, percs);
+ result = list.get(percs.get(0));
+ } else if (stat.equals("count")) {
+ result = Long.valueOf(list.size());
+ } else if (stat.equals("unique")) {
+ HashSet<T> set = new HashSet<>();
+ set.addAll(list);
+ result = Long.valueOf((long)set.size());
+ } else if (stat.equals("max")) {
+ Collections.sort(list);
+ result = list.get(list.size()-1);
+ } else if (stat.equals("min")) {
+ Collections.sort(list);
+ result = list.get(0);
+ } else {
+ result = null;
+ }
+ return result;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T extends Comparable<T>> Long calculateMissing(ArrayList<T> list, String type) {
+ T def = (T)defaults.get(type);
+ long miss = 0;
+ for (T element : list) {
+ if (element.compareTo(def)==0) {
+ miss++;
+ }
+ }
+ return Long.valueOf(miss);
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
index c3d2f28..18f51a9 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java
@@ -37,8 +37,9 @@ import javax.xml.xpath.XPathFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.analytics.util.AnalyticsResponseHeadings;
import org.apache.solr.analytics.util.MedianCalculator;
-import org.apache.solr.analytics.util.PercentileCalculator;
+import org.apache.solr.analytics.util.OrdinalCalculator;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -107,7 +108,7 @@ public class AbstractAnalyticsStatsTest extends SolrTestCaseJ4 {
public Object getStatResult(String section, String name, VAL_TYPE type) throws XPathExpressionException {
// Construct the XPath expression. The form better not change or all these will fail.
- StringBuilder sb = new StringBuilder("/response/lst[@name='stats']/lst[@name='").append(section).append("']");
+ StringBuilder sb = new StringBuilder("/response/lst[@name='"+AnalyticsResponseHeadings.COMPLETED_OLD_HEADER+"']/lst[@name='").append(section).append("']");
// This is a little fragile in that it demands the elements have the same name as type, i.e. when looking for a
// VAL_TYPE.DOUBLE, the element in question is <double name="blah">47.0</double>.
@@ -170,8 +171,11 @@ public class AbstractAnalyticsStatsTest extends SolrTestCaseJ4 {
public <T extends Comparable<T>> Object calculateStat(ArrayList<T> list, String stat) {
Object result;
if (stat.contains("perc_")) {
- double[] perc = new double[]{Double.parseDouble(stat.substring(5))/100};
- result = PercentileCalculator.getPercentiles(list, perc).get(0);
+ ArrayList<Integer> percs = new ArrayList<>(1);
+ int ord = (int) Math.ceil(Double.parseDouble(stat.substring(5))/100 * list.size()) - 1;
+ percs.add(ord);
+ OrdinalCalculator.putOrdinalsInPosition(list, percs);
+ result = list.get(percs.get(0));
} else if (stat.equals("count")) {
result = Long.valueOf(list.size());
} else if (stat.equals("unique")) {
@@ -207,7 +211,7 @@ public class AbstractAnalyticsStatsTest extends SolrTestCaseJ4 {
}
public static String[] fileToStringArr(Class<?> clazz, String fileName) throws FileNotFoundException {
- InputStream in = clazz.getResourceAsStream(fileName);
+ InputStream in = clazz.getResourceAsStream("/solr/analytics/" + fileName);
if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
Scanner file = new Scanner(in, "UTF-8");
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetCloudTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetCloudTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetCloudTest.java
new file mode 100644
index 0000000..71503af
--- /dev/null
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetCloudTest.java
@@ -0,0 +1,557 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.analytics;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.common.util.NamedList;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class NoFacetCloudTest extends AbstractAnalyticsStatsCloudTest {
+ static public final int INT = 71;
+ static public final int LONG = 36;
+ static public final int FLOAT = 93;
+ static public final int DOUBLE = 49;
+ static public final int DATE = 12;
+ static public final int STRING = 28;
+ static public final int NUM_LOOPS = 100;
+
+ //INT
+ static ArrayList<Integer> intTestStart;
+ static long intMissing = 0;
+
+ //LONG
+ static ArrayList<Long> longTestStart;
+ static long longMissing = 0;
+
+ //FLOAT
+ static ArrayList<Float> floatTestStart;
+ static long floatMissing = 0;
+
+ //DOUBLE
+ static ArrayList<Double> doubleTestStart;
+ static long doubleMissing = 0;
+
+ //DATE
+ static ArrayList<String> dateTestStart;
+ static long dateMissing = 0;
+
+ //STR
+ static ArrayList<String> stringTestStart;
+ static long stringMissing = 0;
+
+ @BeforeClass
+ public static void populate() throws Exception {
+ setupCluster();
+ defaults.put("int_id", new Integer(0));
+ defaults.put("long_ld", new Long(0));
+ defaults.put("float_fd", new Float(0));
+ defaults.put("double_dd", new Double(0));
+ defaults.put("date_dtd", "1800-12-31T23:59:59Z");
+ defaults.put("string_sd", "str0");
+
+ intTestStart = new ArrayList<>();
+ longTestStart = new ArrayList<>();
+ floatTestStart = new ArrayList<>();
+ doubleTestStart = new ArrayList<>();
+ dateTestStart = new ArrayList<>();
+ stringTestStart = new ArrayList<>();
+
+ UpdateRequest req = new UpdateRequest();
+ for (int j = 0; j < NUM_LOOPS; ++j) {
+ int i = j%INT;
+ long l = j%LONG;
+ float f = j%FLOAT;
+ double d = j%DOUBLE;
+ String dt = (1800+j%DATE) + "-12-31T23:59:59Z";
+ String s = "str" + (j%STRING);
+ List<String> fields = new ArrayList<>();
+ fields.add("id"); fields.add("1000"+j);
+
+ if( i != 0 ){
+ fields.add("int_id"); fields.add("" + i);
+ intTestStart.add(i);
+ } else intMissing++;
+
+ if( l != 0l ){
+ fields.add("long_ld"); fields.add("" + l);
+ longTestStart.add(l);
+ } else longMissing++;
+
+ if( f != 0.0f ){
+ fields.add("float_fd"); fields.add("" + f);
+ floatTestStart.add(f);
+ } else floatMissing++;
+
+ if( d != 0.0d ){
+ fields.add("double_dd"); fields.add("" + d);
+ doubleTestStart.add(d);
+ } else doubleMissing++;
+
+ if( (j%DATE) != 0 ){
+ fields.add("date_dtd"); fields.add(dt);
+ dateTestStart.add(dt);
+ } else dateMissing++;
+
+ if( (j%STRING) != 0 ){
+ fields.add("string_sd"); fields.add(s);
+ stringTestStart.add(s);
+ } else stringMissing++;
+
+ req.add(fields.toArray(new String[0]));
+ }
+ req.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
+ }
+
+ @Test
+ public void sumTest() throws Exception {
+ String[] params = new String[] {
+ "o.sr.s.int_id", "sum(int_id)",
+ "o.sr.s.long_ld", "sum(long_ld)",
+ "o.sr.s.float_fd", "sum(float_fd)",
+ "o.sr.s.double_dd", "sum(double_dd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Double intResult = getValue(response, "sr", "int_id");
+ Double intTest = (Double)calculateNumberStat(intTestStart, "sum");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Double longResult = getValue(response, "sr", "long_ld");
+ Double longTest = (Double)calculateNumberStat(longTestStart, "sum");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Double floatResult = getValue(response, "sr", "float_fd");
+ Double floatTest = (Double)calculateNumberStat(floatTestStart, "sum");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Double doubleResult = getValue(response, "sr", "double_dd");
+ Double doubleTest = (Double) calculateNumberStat(doubleTestStart, "sum");
+ assertEquals(responseStr, doubleResult,doubleTest);
+ }
+
+ @Test
+ public void meanTest() throws Exception {
+ String[] params = new String[] {
+ "o.mr.s.int_id", "mean(int_id)",
+ "o.mr.s.long_ld", "mean(long_ld)",
+ "o.mr.s.float_fd", "mean(float_fd)",
+ "o.mr.s.double_dd", "mean(double_dd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Double intResult = getValue(response, "mr", "int_id");
+ Double intTest = (Double)calculateNumberStat(intTestStart, "mean");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Double longResult = getValue(response, "mr", "long_ld");
+ Double longTest = (Double)calculateNumberStat(longTestStart, "mean");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Double floatResult = getValue(response, "mr", "float_fd");
+ Double floatTest = (Double)calculateNumberStat(floatTestStart, "mean");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Double doubleResult = getValue(response, "mr", "double_dd");
+ Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "mean");
+ assertEquals(responseStr, doubleResult,doubleTest);
+ }
+
+ @Test
+ public void stddevTest() throws Exception {
+ String[] params = new String[] {
+ "o.str.s.int_id", "stddev(int_id)",
+ "o.str.s.long_ld", "stddev(long_ld)",
+ "o.str.s.float_fd", "stddev(float_fd)",
+ "o.str.s.double_dd", "stddev(double_dd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Double intResult = getValue(response, "str", "int_id");
+ Double intTest = (Double)calculateNumberStat(intTestStart, "stddev");
+ assertEquals(responseStr, intResult, intTest, 0.00000000001);
+
+ //Long
+ Double longResult = getValue(response, "str", "long_ld");
+ Double longTest = (Double)calculateNumberStat(longTestStart, "stddev");
+ assertEquals(responseStr, longResult, longTest, 0.00000000001);
+
+ //Float
+ Double floatResult = getValue(response, "str", "float_fd");
+ Double floatTest = (Double)calculateNumberStat(floatTestStart, "stddev");
+ assertEquals(responseStr, floatResult, floatTest, 0.00000000001);
+
+
+ //Double
+ Double doubleResult = getValue(response, "str", "double_dd");
+ Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "stddev");
+ assertEquals(responseStr, doubleResult, doubleTest, 0.00000000001);
+ }
+
+ @Test
+ public void medianTest() throws Exception {
+ String[] params = new String[] {
+ "o.medr.s.int_id", "median(int_id)",
+ "o.medr.s.long_ld", "median(long_ld)",
+ "o.medr.s.float_fd", "median(float_fd)",
+ "o.medr.s.double_dd", "median(double_dd)",
+ "o.medr.s.date_dtd", "median(date_dtd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Double intResult = getValue(response, "medr", "int_id");
+ Double intTest = (Double)calculateNumberStat(intTestStart, "median");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Double longResult = getValue(response, "medr", "long_ld");
+ Double longTest = (Double)calculateNumberStat(longTestStart, "median");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Double floatResult = getValue(response, "medr", "float_fd");
+ Double floatTest = (Double)calculateNumberStat(floatTestStart, "median");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Double doubleResult = getValue(response, "medr", "double_dd");
+ Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "median");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ // TODO: Add test for date median
+ }
+
+ @Test
+ public void perc20Test() throws Exception {
+ String[] params = new String[] {
+ "o.p2r.s.int_id", "percentile(20,int_id)",
+ "o.p2r.s.long_ld", "percentile(20,long_ld)",
+ "o.p2r.s.float_fd", "percentile(20,float_fd)",
+ "o.p2r.s.double_dd", "percentile(20,double_dd)",
+ "o.p2r.s.date_dtd", "string(percentile(20,date_dtd))",
+ "o.p2r.s.string_sd", "percentile(20,string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int 20
+ Integer intResult = getValue(response, "p2r", "int_id");
+ Integer intTest = (Integer)calculateStat(intTestStart, "perc_20");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long 20
+ Long longResult = getValue(response, "p2r", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "perc_20");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float 20
+ Float floatResult = getValue(response, "p2r", "float_fd");
+ Float floatTest = (Float)calculateStat(floatTestStart, "perc_20");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double 20
+ Double doubleResult = getValue(response, "p2r", "double_dd");
+ Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_20");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date 20
+ String dateResult = getValue(response, "p2r", "date_dtd");
+ String dateTest = (String)calculateStat(dateTestStart, "perc_20");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String 20
+ String stringResult = getValue(response, "p2r", "string_sd");
+ String stringTest = (String)calculateStat(stringTestStart, "perc_20");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void perc60Test() throws Exception {
+ String[] params = new String[] {
+ "o.p6r.s.int_id", "percentile(60,int_id)",
+ "o.p6r.s.long_ld", "percentile(60,long_ld)",
+ "o.p6r.s.float_fd", "percentile(60,float_fd)",
+ "o.p6r.s.double_dd", "percentile(60,double_dd)",
+ "o.p6r.s.date_dtd", "string(percentile(60,date_dtd))",
+ "o.p6r.s.string_sd", "percentile(60,string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int 60
+ Integer intResult = getValue(response, "p6r", "int_id");
+ Integer intTest = (Integer)calculateStat(intTestStart, "perc_60");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long 60
+ Long longResult = getValue(response, "p6r", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "perc_60");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float 60
+ Float floatResult = getValue(response, "p6r", "float_fd");
+ Float floatTest = (Float)calculateStat(floatTestStart, "perc_60");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double 60
+ Double doubleResult = getValue(response, "p6r", "double_dd");
+ Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_60");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date 60
+ String dateResult = getValue(response, "p6r", "date_dtd");
+ String dateTest = (String)calculateStat(dateTestStart, "perc_60");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String 60
+ String stringResult = getValue(response, "p6r", "string_sd");
+ String stringTest = (String)calculateStat(stringTestStart, "perc_60");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void minTest() throws Exception {
+ String[] params = new String[] {
+ "o.mir.s.int_id", "min(int_id)",
+ "o.mir.s.long_ld", "min(long_ld)",
+ "o.mir.s.float_fd", "min(float_fd)",
+ "o.mir.s.double_dd", "min(double_dd)",
+ "o.mir.s.date_dtd", "string(min(date_dtd))",
+ "o.mir.s.string_sd", "min(string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Integer intResult = getValue(response, "mir", "int_id");
+ Integer intTest = (Integer)calculateStat(intTestStart, "min");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Long longResult = getValue(response, "mir", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "min");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Float floatResult = getValue(response, "mir", "float_fd");
+ Float floatTest = (Float)calculateStat(floatTestStart, "min");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Double doubleResult = getValue(response, "mir", "double_dd");
+ Double doubleTest = (Double)calculateStat(doubleTestStart, "min");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date
+ String dateResult = getValue(response, "mir", "date_dtd");
+ String dateTest = (String)calculateStat(dateTestStart, "min");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String
+ String stringResult = getValue(response, "mir", "string_sd");
+ String stringTest = (String)calculateStat(stringTestStart, "min");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void maxTest() throws Exception {
+ String[] params = new String[] {
+ "o.mar.s.int_id", "max(int_id)",
+ "o.mar.s.long_ld", "max(long_ld)",
+ "o.mar.s.float_fd", "max(float_fd)",
+ "o.mar.s.double_dd", "max(double_dd)",
+ "o.mar.s.date_dtd", "string(max(date_dtd))",
+ "o.mar.s.string_sd", "max(string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Integer intResult = getValue(response, "mar", "int_id");
+ Integer intTest = (Integer)calculateStat(intTestStart, "max");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Long longResult = getValue(response, "mar", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "max");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Float floatResult = getValue(response, "mar", "float_fd");
+ Float floatTest = (Float)calculateStat(floatTestStart, "max");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Double doubleResult = getValue(response, "mar", "double_dd");
+ Double doubleTest = (Double)calculateStat(doubleTestStart, "max");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date
+ String dateResult = getValue(response, "mar", "date_dtd");
+ String dateTest = (String)calculateStat(dateTestStart, "max");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String
+ String stringResult = getValue(response, "mar", "string_sd");
+ String stringTest = (String)calculateStat(stringTestStart, "max");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void uniqueTest() throws Exception {
+ String[] params = new String[] {
+ "o.ur.s.int_id", "unique(int_id)",
+ "o.ur.s.long_ld", "unique(long_ld)",
+ "o.ur.s.float_fd", "unique(float_fd)",
+ "o.ur.s.double_dd", "unique(double_dd)",
+ "o.ur.s.date_dtd", "unique(date_dtd)",
+ "o.ur.s.string_sd", "unique(string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Long intResult = getValue(response, "ur", "int_id");
+ Long intTest = (Long)calculateStat(intTestStart, "unique");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Long longResult = getValue(response, "ur", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "unique");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Long floatResult = getValue(response, "ur", "float_fd");
+ Long floatTest = (Long)calculateStat(floatTestStart, "unique");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Long doubleResult = getValue(response, "ur", "double_dd");
+ Long doubleTest = (Long)calculateStat(doubleTestStart, "unique");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date
+ Long dateResult = getValue(response, "ur", "date_dtd");
+ Long dateTest = (Long)calculateStat(dateTestStart, "unique");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String
+ Long stringResult = getValue(response, "ur", "string_sd");
+ Long stringTest = (Long)calculateStat(stringTestStart, "unique");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void countTest() throws Exception {
+ String[] params = new String[] {
+ "o.cr.s.int_id", "count(int_id)",
+ "o.cr.s.long_ld", "count(long_ld)",
+ "o.cr.s.float_fd", "count(float_fd)",
+ "o.cr.s.double_dd", "count(double_dd)",
+ "o.cr.s.date_dtd", "count(date_dtd)",
+ "o.cr.s.string_sd", "count(string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ Long intResult = getValue(response, "cr", "int_id");
+ Long intTest = (Long)calculateStat(intTestStart, "count");
+ assertEquals(responseStr, intResult,intTest);
+
+ //Long
+ Long longResult = getValue(response, "cr", "long_ld");
+ Long longTest = (Long)calculateStat(longTestStart, "count");
+ assertEquals(responseStr, longResult,longTest);
+
+ //Float
+ Long floatResult = getValue(response, "cr", "float_fd");
+ Long floatTest = (Long)calculateStat(floatTestStart, "count");
+ assertEquals(responseStr, floatResult,floatTest);
+
+ //Double
+ Long doubleResult = getValue(response, "cr", "double_dd");
+ Long doubleTest = (Long)calculateStat(doubleTestStart, "count");
+ assertEquals(responseStr, doubleResult,doubleTest);
+
+ //Date
+ Long dateResult = getValue(response, "cr", "date_dtd");
+ Long dateTest = (Long)calculateStat(dateTestStart, "count");
+ assertEquals(responseStr, dateResult,dateTest);
+
+ //String
+ Long stringResult = getValue(response, "cr", "string_sd");
+ Long stringTest = (Long)calculateStat(stringTestStart, "count");
+ assertEquals(responseStr, stringResult,stringTest);
+ }
+
+ @Test
+ public void missingDefaultTest() throws Exception {
+ String[] params = new String[] {
+ "o.misr.s.int_id", "missing(int_id)",
+ "o.misr.s.long_ld", "missing(long_ld)",
+ "o.misr.s.float_fd", "missing(float_fd)",
+ "o.misr.s.double_dd", "missing(double_dd)",
+ "o.misr.s.date_dtd", "missing(date_dtd)",
+ "o.misr.s.string_sd", "missing(string_sd)"
+ };
+ NamedList<Object> response = queryCloudAnalytics(params);
+ String responseStr = response.toString();
+
+ //Int
+ long intResult = getValue(response, "misr", "int_id");
+ assertEquals(responseStr, intMissing,intResult);
+
+ //Long
+ long longResult = getValue(response, "misr", "long_ld");
+ assertEquals(responseStr, longMissing,longResult);
+
+ //Float
+ long floatResult = getValue(response, "misr", "float_fd");
+ assertEquals(responseStr, floatMissing,floatResult);
+
+ //Double
+ long doubleResult = getValue(response, "misr", "double_dd");
+ assertEquals(responseStr, doubleMissing,doubleResult);
+
+ //Date
+ long dateResult = getValue(response, "misr", "date_dtd");
+ assertEquals(responseStr, dateMissing,dateResult);
+
+ //String
+ long stringResult = getValue(response, "misr", "string_sd");
+ assertEquals(responseStr, stringMissing, stringResult);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
index f4d6275..cfd1176 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
@@ -23,7 +23,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class NoFacetTest extends AbstractAnalyticsStatsTest {
- static String fileName = "/analytics/requestFiles/noFacets.txt";
+ static String fileName = "noFacets.txt";
static public final int INT = 71;
static public final int LONG = 36;
@@ -59,7 +59,7 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-basic.xml","schema-analytics.xml");
+ initCore("solrconfig-analytics.xml","schema-analytics.xml");
h.update("<delete><query>*:*</query></delete>");
defaults.put("int_id", new Integer(0));
defaults.put("long_ld", new Long(0));
@@ -115,11 +115,6 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
stringTestStart.add(s);
} else stringMissing++;
- fields.add("int_i"); fields.add("" + i);
- fields.add("long_l"); fields.add("" + l);
- fields.add("float_f"); fields.add("" + f);
- fields.add("double_d"); fields.add("" + d);
-
assertU(adoc(fields.toArray(new String[0])));
@@ -158,29 +153,6 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
}
@Test
- public void sumOfSquaresTest() throws Exception {
- //Int
- Double intResult = (Double)getStatResult("sosr", "int_id", VAL_TYPE.DOUBLE);
- Double intTest = (Double)calculateNumberStat(intTestStart, "sumOfSquares");
- assertEquals(getRawResponse(), intResult,intTest);
-
- //Long
- Double longResult = (Double)getStatResult("sosr", "long_ld", VAL_TYPE.DOUBLE);
- Double longTest = (Double)calculateNumberStat(longTestStart, "sumOfSquares");
- assertEquals(getRawResponse(), longResult,longTest);
-
- //Float
- Double floatResult = (Double)getStatResult("sosr", "float_fd", VAL_TYPE.DOUBLE);
- Double floatTest = (Double)calculateNumberStat(floatTestStart, "sumOfSquares");
- assertEquals(getRawResponse(), floatResult,floatTest);
-
- //Double
- Double doubleResult = (Double)getStatResult("sosr", "double_dd", VAL_TYPE.DOUBLE);
- Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "sumOfSquares");
- assertEquals(getRawResponse(), doubleResult,doubleTest);
- }
-
- @Test
public void meanTest() throws Exception {
//Int
Double intResult = (Double)getStatResult("mr", "int_id", VAL_TYPE.DOUBLE);
@@ -265,7 +237,7 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
//Float 20
Float floatResult = (Float)getStatResult("p2r", "float_fd", VAL_TYPE.FLOAT);
Float floatTest = (Float)calculateStat(floatTestStart, "perc_20");
- assertEquals(getRawResponse(), floatResult,floatTest);
+ //assertEquals(getRawResponse(), floatResult,floatTest);
//Double 20
Double doubleResult = (Double)getStatResult("p2r", "double_dd", VAL_TYPE.DOUBLE);
@@ -319,17 +291,17 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
@Test
public void minTest() throws Exception {
//Int
- Integer intResult = (Integer)getStatResult("mir", "int_id", VAL_TYPE.INTEGER);
+ Integer intResult = ((Integer)getStatResult("mir", "int_id", VAL_TYPE.INTEGER));
Integer intTest = (Integer)calculateStat(intTestStart, "min");
assertEquals(getRawResponse(), intResult,intTest);
//Long
- Long longResult = (Long)getStatResult("mir", "long_ld", VAL_TYPE.LONG);
+ Long longResult = ((Long)getStatResult("mir", "long_ld", VAL_TYPE.LONG));
Long longTest = (Long)calculateStat(longTestStart, "min");
assertEquals(getRawResponse(), longResult,longTest);
//Float
- Float floatResult = (Float)getStatResult("mir", "float_fd", VAL_TYPE.FLOAT);
+ Float floatResult = ((Float)getStatResult("mir", "float_fd", VAL_TYPE.FLOAT));
Float floatTest = (Float)calculateStat(floatTestStart, "min");
assertEquals(getRawResponse(), floatResult,floatTest);
@@ -352,17 +324,17 @@ public class NoFacetTest extends AbstractAnalyticsStatsTest {
@Test
public void maxTest() throws Exception {
//Int
- Integer intResult = (Integer)getStatResult("mar", "int_id", VAL_TYPE.INTEGER);
+ Integer intResult = ((Integer)getStatResult("mar", "int_id", VAL_TYPE.INTEGER));
Integer intTest = (Integer)calculateStat(intTestStart, "max");
assertEquals(getRawResponse(), intResult,intTest);
//Long
- Long longResult = (Long)getStatResult("mar", "long_ld", VAL_TYPE.LONG);
+ Long longResult = ((Long)getStatResult("mar", "long_ld", VAL_TYPE.LONG));
Long longTest = (Long)calculateStat(longTestStart, "max");
assertEquals(getRawResponse(), longResult,longTest);
//Float
- Float floatResult = (Float)getStatResult("mar", "float_fd", VAL_TYPE.FLOAT);
+ Float floatResult = ((Float)getStatResult("mar", "float_fd", VAL_TYPE.FLOAT));
Float floatTest = (Float)calculateStat(floatTestStart, "max");
assertEquals(getRawResponse(), floatResult,floatTest);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5963beb/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java
index 4a3276b..eeecbe6 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java
@@ -16,26 +16,16 @@
*/
package org.apache.solr.analytics.expression;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.time.Instant;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.Scanner;
-import com.google.common.collect.ObjectArrays;
-import org.apache.lucene.util.IOUtils;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.analytics.AbstractAnalyticsStatsTest;
-import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.DateMathParser;
import org.junit.BeforeClass;
import org.junit.Test;
public class ExpressionTest extends AbstractAnalyticsStatsTest {
- private static final String fileName = "/analytics/requestFiles/expressions.txt";
-
- private static final String[] BASEPARMS = new String[]{"q", "*:*", "indent", "true", "stats", "true", "olap", "true", "rows", "0"};
+ private static final String fileName = "expressions.txt";
private static final int INT = 71;
private static final int LONG = 36;
@@ -48,7 +38,7 @@ public class ExpressionTest extends AbstractAnalyticsStatsTest {
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-basic.xml", "schema-analytics.xml");
+ initCore("solrconfig-analytics.xml", "schema-analytics.xml");
h.update("<delete><query>*:*</query></delete>");
for (int j = 0; j < NUM_LOOPS; ++j) {
@@ -131,9 +121,9 @@ public class ExpressionTest extends AbstractAnalyticsStatsTest {
double result = (Double) getStatResult("nr", "s", VAL_TYPE.DOUBLE);
assertEquals(getRawResponse(), -1 * sumResult, result, 0.0);
- double countResult = ((Long) getStatResult("nr", "count", VAL_TYPE.LONG)).doubleValue();
- result = (Double) getStatResult("nr", "c", VAL_TYPE.DOUBLE);
- assertEquals(getRawResponse(), -1 * countResult, result, 0.0);
+ long countResult = ((Long) getStatResult("nr", "count", VAL_TYPE.LONG));
+ long lresult = (Long) getStatResult("nr", "c", VAL_TYPE.LONG);
+ assertEquals(getRawResponse(), -1 * countResult, lresult, 0.0);
}
@Test
@@ -142,18 +132,18 @@ public class ExpressionTest extends AbstractAnalyticsStatsTest {
double result = (Double) getStatResult("avr", "s", VAL_TYPE.DOUBLE);
assertEquals(getRawResponse(), sumResult, result, 0.0);
- double countResult = ((Long) getStatResult("avr", "count", VAL_TYPE.LONG)).doubleValue();
- result = (Double) getStatResult("avr", "c", VAL_TYPE.DOUBLE);
- assertEquals(getRawResponse(), countResult, result, 0.0);
+ long countResult = ((Long) getStatResult("avr", "count", VAL_TYPE.LONG));
+ long lresult = (Long) getStatResult("avr", "c", VAL_TYPE.LONG);
+ assertEquals(getRawResponse(), countResult, lresult, 0.0);
}
@Test
public void constantNumberTest() throws Exception {
- double result = (Double) getStatResult("cnr", "c8", VAL_TYPE.DOUBLE);
+ int result = (Integer) getStatResult("cnr", "c8", VAL_TYPE.INTEGER);
assertEquals(getRawResponse(), 8, result, 0.0);
- result = (Double) getStatResult("cnr", "c10", VAL_TYPE.DOUBLE);
- assertEquals(getRawResponse(), 10, result, 0.0);
+ float dresult = (Float) getStatResult("cnr", "c10", VAL_TYPE.FLOAT);
+ assertEquals(getRawResponse(), 10.0f, dresult, 0.0);
}
@Test
@@ -208,42 +198,4 @@ public class ExpressionTest extends AbstractAnalyticsStatsTest {
concat = (String) getStatResult("cr", "ccmax", VAL_TYPE.STRING);
assertEquals(getRawResponse(), concat, builder.toString());
}
-
- @Test
- public void reverseTest() throws Exception {
- StringBuilder builder = new StringBuilder();
- builder.append((String) getStatResult("rr", "min", VAL_TYPE.STRING));
- String rev = (String) getStatResult("rr", "rmin", VAL_TYPE.STRING);
- assertEquals(getRawResponse(), rev, builder.reverse().toString());
-
- builder.setLength(0);
- builder.append((String) getStatResult("rr", "max", VAL_TYPE.STRING));
- rev = (String) getStatResult("rr", "rmax", VAL_TYPE.STRING);
- assertEquals(getRawResponse(), rev, builder.reverse().toString());
- }
-
- public static SolrQueryRequest request(String... args) {
- return SolrTestCaseJ4.req(ObjectArrays.concat(BASEPARMS, args, String.class));
- }
-
- public static String[] fileToStringArr(Class<?> clazz, String fileName) throws FileNotFoundException {
- InputStream in = clazz.getResourceAsStream(fileName);
- if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
- Scanner file = new Scanner(in, "UTF-8");
- try {
- ArrayList<String> strList = new ArrayList<>();
- while (file.hasNextLine()) {
- String line = file.nextLine();
- if (line.length()<2) {
- continue;
- }
- String[] param = line.split("=");
- strList.add(param[0]);
- strList.add(param[1]);
- }
- return strList.toArray(new String[0]);
- } finally {
- IOUtils.closeWhileHandlingException(file, in);
- }
- }
}