lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1700800 [7/24] - in /lucene/dev/branches/lucene6699: ./ dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ ...
Date Wed, 02 Sep 2015 13:06:22 GMT
Modified: lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java (original)
+++ lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java Wed Sep  2 13:06:13 2015
@@ -127,6 +127,11 @@ public class LibVersionsCheckTask extend
   private File ivyResolutionCacheDir;
   
   /**
+   * Artifact lock strategy that Ivy should use.
+   */
+  private String ivyLockStrategy;
+  
+  /**
    * A logging level associated with verbose logging.
    */
   private int verboseLevel = Project.MSG_VERBOSE;
@@ -183,6 +188,10 @@ public class LibVersionsCheckTask extend
   public void setIvyResolutionCacheDir(File dir) {
     ivyResolutionCacheDir = dir;
   }
+  
+  public void setIvyLockStrategy(String strategy) {
+    this.ivyLockStrategy = strategy;
+  }
 
   public void setCommonBuildDir(File file) {
     commonBuildDir = file;
@@ -683,6 +692,7 @@ public class LibVersionsCheckTask extend
       ivySettings.setVariable("common.build.dir", commonBuildDir.getAbsolutePath());
       ivySettings.setVariable("ivy.exclude.types", "source|javadoc");
       ivySettings.setVariable("ivy.resolution-cache.dir", ivyResolutionCacheDir.getAbsolutePath());
+      ivySettings.setVariable("ivy.lock-strategy", ivyLockStrategy);
       ivySettings.setBaseDir(commonBuildDir);
       ivySettings.setDefaultConflictManager(new NoConflictManager());
       ivy = Ivy.newInstance(ivySettings);

Modified: lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java (original)
+++ lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java Wed Sep  2 13:06:13 2015
@@ -86,8 +86,8 @@ public class IvyNodeElement {
    */
   public IvyNodeElement[] getDeepDependencies() {
     if (deepDependencyCache == null) {
-      Collection deepDependencies = getDeepDependencies(this);
-      deepDependencyCache = (IvyNodeElement[])deepDependencies.toArray(new IvyNodeElement[deepDependencies.size()]);
+      Collection<IvyNodeElement> deepDependencies = getDeepDependencies(this);
+      deepDependencyCache = deepDependencies.toArray(new IvyNodeElement[deepDependencies.size()]);
     }
     return deepDependencyCache;
   }
@@ -147,8 +147,8 @@ public class IvyNodeElement {
    */
   public void setDepth(int depth) {
     this.depth = depth;
-    for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
-      IvyNodeElement dependency = (IvyNodeElement) iter.next();
+    for (Iterator<IvyNodeElement> iter = dependencies.iterator(); iter.hasNext();) {
+      IvyNodeElement dependency = iter.next();
       dependency.setDepth(depth + 1);
     }
   }
@@ -157,7 +157,7 @@ public class IvyNodeElement {
     return conflicts.toArray(new IvyNodeElement[conflicts.size()]);
   }
 
-  public void setConflicts(Collection conflicts) {
+  public void setConflicts(Collection<IvyNodeElement> conflicts) {
     this.conflicts = conflicts;
   }
 

Modified: lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java Wed Sep  2 13:06:13 2015
@@ -54,8 +54,8 @@ public class IvyNodeElementAdapter {
     @SuppressWarnings("unchecked") List<IvyNode> dependencies = report.getDependencies();
 
     // First pass - build the map of resolved nodes by revision id
-    for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
-      IvyNode node = (IvyNode) iter.next();
+    for (Iterator<IvyNode> iter = dependencies.iterator(); iter.hasNext();) {
+      IvyNode node = iter.next();
       if (node.getAllEvictingNodes() != null) {
         // Nodes that are evicted as a result of conf inheritance still appear
         // as dependencies, but with eviction data. They also appear as evictions.
@@ -68,8 +68,8 @@ public class IvyNodeElementAdapter {
     }
 
     // Second pass - establish relationships between the resolved nodes
-    for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
-      IvyNode node = (IvyNode) iter.next();
+    for (Iterator<IvyNode> iter = dependencies.iterator(); iter.hasNext();) {
+      IvyNode node = iter.next();
       if (node.getAllEvictingNodes() != null) {
         continue; // see note above
       }
@@ -124,8 +124,8 @@ public class IvyNodeElementAdapter {
       if (moduleRevisionMap.containsKey(moduleId)) {
         Collection<IvyNodeElement> conflicts = moduleRevisionMap.get(moduleId);
         conflicts.add(deepDependencies[i]);
-        for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
-          IvyNodeElement conflict = (IvyNodeElement) iter.next();
+        for (Iterator<IvyNodeElement> iter = conflicts.iterator(); iter.hasNext();) {
+          IvyNodeElement conflict = iter.next();
           conflict.setConflicts(conflicts);
         }
       } else {

Modified: lucene/dev/branches/lucene6699/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/CHANGES.txt?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene6699/solr/CHANGES.txt Wed Sep  2 13:06:13 2015
@@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for
 Versions of Major Components
 ---------------------
 Apache Tika 1.7
-Carrot2 3.9.0
+Carrot2 3.10.3
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
@@ -45,7 +45,13 @@ Upgrading from Solr 5.x
 * SolrClient.shutdown() has been removed, use SolrClient.close() instead.
 
 * The deprecated zkCredientialsProvider element in solrcloud section of solr.xml
-  is now removed. Use the correct spelling (zkCredentialsProvider) instead.
+  is now removed. Use tI'll start looking at it today. - Mark On Wed, Aug 19, 2015 at 10:15 PM Gregory Chanan <he correct spelling (zkCredentialsProvider) instead.
+
+* SOLR-7957: internal/expert - ResultContext was significantly changed and expanded
+  to allow for multiple full query results (DocLists) per Solr request.
+  TransformContext was rendered redundant and was removed. (yonik)
+
+
 
 Detailed Change List
 ----------------------
@@ -59,6 +65,11 @@ New Features
 
 * SOLR-7707: Add StreamExpression Support to RollupStream (Dennis Gove, Joel Bernstein)
 
+Optimizations
+----------------------
+* SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been
+  specified.  Speedups of up to 8% were observed.  (yonik)
+
 
 Other Changes
 ----------------------
@@ -71,7 +82,7 @@ Other Changes
 * SOLR-6954: Deprecated SolrClient.shutdown() method removed (Alan Woodward)
 
 * SOLR-7355: Switch from Google's ConcurrentLinkedHashMap to Caffeine.  Only
-  affects HDFS support. (Ben Manes via Shawn Heisey)
+  affects HDFS support. (Ben Manes viI'll start looking at it today. - Mark On Wed, Aug 19, 2015 at 10:15 PM Gregory Chanan <a Shawn Heisey)
 
 * SOLR-7624: Remove deprecated zkCredientialsProvider element in solrcloud section of solr.xml.
   (Xu Zhang, Per Steffensen, Ramkumar Aiyengar, Mark Miller)
@@ -93,11 +104,11 @@ Consult the LUCENE_CHANGES.txt file for
 Versions of Major Components
 ---------------------
 Apache Tika 1.7
-Carrot2 3.9.0
+Carrot2 3.10.3
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
-Jetty 9.2.11.v20150529
+Jetty 9.2.13.v20150730
 
 Upgrading from Solr 5.3
 -----------------------
@@ -123,6 +134,17 @@ New Features
   Example: description:HDTV OR filter(+promotion:tv +promotion_date:[NOW/DAY TO NOW/DAY+7DAY])
   (yonik)
 
+* SOLR-7775: Allow fromIndex parameter to ScoreJoinQParserPlugin {!join score=.. fromIndex=..}..
+   to refer to a single-sharded collection that has a replica on all nodes where there is a 
+   replica in the to index (Andrei Beliakov via Mikhail Khludnev)
+
+* SOLR-7961: Print Solr's version with command bin/solr version (janhoy)
+
+* SOLR-7789: Introduce a ConfigSet management API (Gregory Chanan)
+
+* SOLR-4316: Add a collections dropdown to angular admin UI (Upayavira, Shalin Shekhar Mangar)
+
+* SOLR-7915: Provide pluggable context tool support for VelocityResponseWriter (Erik Hatcher)
 
 Bug Fixes
 ----------------------
@@ -133,12 +155,72 @@ Bug Fixes
 * SOLR-7836: Possible deadlock when closing refcounted index writers.
   (Jessica Cheng Mallet, Erick Erickson)
 
+* SOLR-7869: Overseer does not handle BadVersionException correctly and, in some cases,
+  can go into an infinite loop if cluster state in ZooKeeper is modified externally.
+  (Scott Blum, shalin)
+
+* SOLR-7920: Resolve XSS issue in Admin UI Schema Browser (David Chiu via Upayavira)
+
+* SOLR-7935: Fix very rare race condition that can cause an update to fail
+  via NullPointerException during a core reload. (yonik)
+
+* SOLR-7941: multivalued params are concatenated when using config API (noble)
+
+* SOLR-7949: Resolve XSS issue in Admin UI stats page (David Chiu via janhoy)
+
+* SOLR-7956: There are interrupts on shutdown in places that can cause ChannelAlreadyClosed
+  exceptions which prevents proper closing of transaction logs, interfere with the IndexWriter,
+  the hdfs client and other things. (Mark Miller, Scott Blum)
+
+* SOLR-7972: Fix VelocityResponseWriter template encoding issue.
+  Templates must be UTF-8 encoded. (Erik Hatcher)
+
+* SOLR-7929: SimplePostTool (also bin/post) -filetypes "*" now works properly in 'web' mode (Erik Hatcher)
+
+* SOLR-7954: Fixed an integer overflow bug in the HyperLogLog code used by the 'cardinality' option
+  of stats.field to prevent ArrayIndexOutOfBoundsException in a distributed search when a large precision
+  is selected and a large number of values exist in each shard (hossman)
+
+* SOLR-7988: SolrJ could not make requests to handlers with '/admin/' prefix (noble , ludovic Boutros)
+
+* SOLR-7844: Zookeeper session expiry during shard leader election can cause multiple leaders.
+  (Mike Roberts, Mark Miller, Jessica Cheng)
+
+* SOLR-8000: security.json is not loaded on server start (noble)
+
+* SOLR-8004: RuleBasedAuthorization plugin does not work for the collection-admin-edit permission (noble)
+
+
 Optimizations
 ----------------------
 
+* SOLR-7918: Filter (DocSet) production from term queries has been optimized and
+  is anywhere from 20% to over 100% faster and produces less garbage on average.
+  (yonik)
+
+* SOLR-6760: New optimized DistributedQueue implementation for overseer increases
+  message processing performance by ~470%.
+  (Noble Paul, Scott Blum, shalin)
+
+* SOLR-6629: Watch /collections zk node on all nodes so that cluster state updates
+  are more efficient especially when cluster has a mix of collections in stateFormat=1
+  and stateFormat=2. (Scott Blum, shalin)
+
+* SOLR-7971: Reduce memory allocated by JavaBinCodec to encode large strings by an amount
+  equal to the string.length().
+  (yonik, Steve Rowe, shalin)
+
+* SOLR-7983: Utils.toUTF8 uses larger buffer than necessary for holding UTF8 data. (shalin)
+
 Other Changes
 ----------------------
 
+* SOLR-7969: Unavailable clustering engines should not fail the core. (Dawid Weiss)
+
+* SOLR-7790, SOLR-7792, SOLR-7791: Update Carrot2 clustering component to 
+  version 3.10.3. Upgrade HPPC library to version 0.7.1, morfologik-stemming 
+  to version 1.10.0. (Dawid Weiss)
+
 * SOLR-7831: Start Scripts: Allow a configurable stack size [-Xss] (Steve Davids via Mark Miller)
 
 * SOLR-7870: Write a test which asserts that requests to stateFormat=2 collection succeed on a node
@@ -148,6 +230,28 @@ Other Changes
 * SOLR-7902: Split out use of child timers from RTimer to a sub-class
   (Ramkumar Aiyengar)
 
+* SOLR-7943: Upgrade Jetty to 9.2.13.v20150730. (Bill Bell, shalin)
+
+* SOLR-7007: DistributedUpdateProcessor now logs replay flag as boolean instead of int
+  (Mike Drob via Christine Poerschke)
+
+* SOLR-7960: Start scripts now gives generic help for bin/solr -h and bin/solr --help (janhoy)
+
+* SOLR-7970: Factor out a SearchGroupsFieldCommandResult class.
+  (Christine Poerschke)
+
+* SOLR-7942: Previously removed unlockOnStartup option (LUCENE-6508) now logs warning if configured,
+  will be an error in 6.0.  Also improved error msg if an index is locked on startup  (hossman)
+
+* SOLR-7979: Fix two typos (in a CoreAdminHandler log message and a TestCloudPivotFacet comment).
+  (Mike Drob via Christine Poerschke)
+
+* SOLR-7966: Solr Admin UI Solr now sets the HTTP header X-Frame-Options to DENY
+  to avoid clickjacking. (yonik)
+
+* SOLR-7999: SolrRequestParser tests no longer depend on external URLs
+  that may fail to work.  (Uwe Schindler)
+
 ==================  5.3.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
@@ -379,6 +483,12 @@ Bug Fixes
 * SOLR-7908: SegmentsInfoRequestHandler gets a ref counted IndexWriter and does not properly release it.
   (Mark Miller, shalin)
 
+* SOLR-7921: The techproducts example fails when running in a directory that contains spaces.
+  (Ishan Chattopadhyaya via Timothy Potter)
+
+* SOLR-7934: SolrCLI masks underlying cause of create collection failure. (Timothy Potter)
+
+
 Optimizations
 ----------------------
 
@@ -2355,7 +2465,7 @@ Other Changes
 
 ==================  4.10.2 ==================
 
-Bug FixesAnalyticsComponent
+Bug Fixes
 ----------------------
 
 * SOLR-6509: Solr start scripts interactive mode doesn't honor -z argument (Timothy Potter)
@@ -7521,7 +7631,7 @@ Bug Fixes
 
 * SOLR-2819: Improved speed of parsing hex entities in HTMLStripCharFilter
   (Bernhard Berger, hossman)
-	 	   
+
 * SOLR-2509: StringIndexOutOfBoundsException in the spellchecker collate when the term contains
   a hyphen. (Thomas Gambier caught the bug, Steffen Godskesen did the patch, via Erick Erickson)
 
@@ -8316,7 +8426,7 @@ Other Changes
   (Drew Farris, Robert Muir, Steve Rowe)
 
 * SOLR-2105: Rename RequestHandler param 'update.processor' to 'update.chain'.
-	(Jan Høydahl via Mark Miller)
+  (Jan Høydahl via Mark Miller)
 
 * SOLR-2485: Deprecate BaseResponseWriter, GenericBinaryResponseWriter, and 
   GenericTextResponseWriter.  These classes will be removed in 4.0.  (ryan)
@@ -8560,8 +8670,8 @@ New Features
    (Ankul Garg, Jason Rutherglen, Shalin Shekhar Mangar, Grant Ingersoll, Robert Muir, ab)
 
 * SOLR-1568: Added "native" filtering support for PointType, GeohashField.  Added LatLonType with filtering support too.  See
-  	     http://wiki.apache.org/solr/SpatialSearch and the example.  Refactored some items in Lucene spatial.
-	     Removed SpatialTileField as the underlying CartesianTier is broken beyond repair and is going to be moved. (gsingers)
+  http://wiki.apache.org/solr/SpatialSearch and the example.  Refactored some items in Lucene spatial.
+  Removed SpatialTileField as the underlying CartesianTier is broken beyond repair and is going to be moved. (gsingers)
 
 * SOLR-2128: Full parameter substitution for function queries.
   Example: q=add($v1,$v2)&v1=mul(popularity,5)&v2=20.0
@@ -9452,7 +9562,7 @@ New Features
 62. SOLR-1145: Add capability to specify an infoStream log file for the underlying Lucene IndexWriter in solrconfig.xml.
     This is an advanced debug log file that can be used to aid developers in fixing IndexWriter bugs. See the commented
     out example in the example solrconfig.xml under the indexDefaults section. 
-	  (Chris Harris, Mark Miller)
+    (Chris Harris, Mark Miller)
 
 63. SOLR-1256: Show the output of CharFilters in analysis.jsp. (koji)
 
@@ -10930,7 +11040,7 @@ Build
 
  2. SOLR-479: Added clover code coverage targets for committers and the nightly build.  Requires 
     the Clover library, as licensed to Apache and only available privately.  To run:
-   	     ant -Drun.clover=true clean clover test generate-clover-reports
+          ant -Drun.clover=true clean clover test generate-clover-reports
 
  3. SOLR-510: Nightly release includes client sources. (koji)
 

Modified: lucene/dev/branches/lucene6699/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/bin/solr?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/bin/solr (original)
+++ lucene/dev/branches/lucene6699/solr/bin/solr Wed Sep  2 13:06:13 2015
@@ -188,7 +188,7 @@ function print_usage() {
   if [ -z "$CMD" ]; then
     echo ""
     echo "Usage: solr COMMAND OPTIONS"
-    echo "       where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete"
+    echo "       where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version"
     echo ""
     echo "  Standalone server example (start Solr running in the background on port 8984):"
     echo ""
@@ -500,7 +500,7 @@ function stop_solr() {
 
 if [ $# -eq 1 ]; then
   case $1 in
-    -help|-usage)
+    -help|-usage|-h|--help)
         print_usage ""
         exit
     ;;
@@ -508,6 +508,10 @@ if [ $# -eq 1 ]; then
         get_info
         exit
     ;;
+    -version|-v|version)
+        run_tool version
+        exit
+    ;;
   esac
 fi
 

Modified: lucene/dev/branches/lucene6699/solr/bin/solr.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/bin/solr.cmd?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/bin/solr.cmd (original)
+++ lucene/dev/branches/lucene6699/solr/bin/solr.cmd Wed Sep  2 13:06:13 2015
@@ -94,10 +94,15 @@ IF [%1]==[] goto usage
 
 IF "%1"=="-help" goto usage
 IF "%1"=="-usage" goto usage
+IF "%1"=="-h" goto usage
+IF "%1"=="--help" goto usage
 IF "%1"=="/?" goto usage
 IF "%1"=="-i" goto get_info
 IF "%1"=="-info" goto get_info
 IF "%1"=="status" goto get_info
+IF "%1"=="version" goto get_version
+IF "%1"=="-v" goto get_version
+IF "%1"=="-version" goto get_version
 
 REM Only allow the command to be the first argument, assume start if not supplied
 IF "%1"=="start" goto set_script_cmd
@@ -136,6 +141,8 @@ IF NOT "%SCRIPT_ERROR%"=="" ECHO %SCRIPT
 IF [%FIRST_ARG%]==[] goto script_usage
 IF "%FIRST_ARG%"=="-help" goto script_usage
 IF "%FIRST_ARG%"=="-usage" goto script_usage
+IF "%FIRST_ARG%"=="-h" goto script_usage
+IF "%FIRST_ARG%"=="--help" goto script_usage
 IF "%FIRST_ARG%"=="/?" goto script_usage
 IF "%SCRIPT_CMD%"=="start" goto start_usage
 IF "%SCRIPT_CMD%"=="restart" goto start_usage
@@ -150,7 +157,7 @@ goto done
 :script_usage
 @echo.
 @echo Usage: solr COMMAND OPTIONS
-@echo        where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete
+@echo        where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version
 @echo.
 @echo   Standalone server example (start Solr running in the background on port 8984):
 @echo.
@@ -968,6 +975,12 @@ IF NOT DEFINED HEALTHCHECK_ZK_HOST set "
   org.apache.solr.util.SolrCLI healthcheck -collection !HEALTHCHECK_COLLECTION! -zkHost !HEALTHCHECK_ZK_HOST!
 goto done
 
+:get_version
+"%JAVA%" %SOLR_SSL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" -Dlog4j.configuration="file:%DEFAULT_SERVER_DIR%\scripts\cloud-scripts\log4j.properties" ^
+  -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
+  org.apache.solr.util.SolrCLI version
+goto done
+
 :parse_create_args
 IF [%1]==[] goto run_create
 IF "%1"=="-c" goto set_create_name

Modified: lucene/dev/branches/lucene6699/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/build.xml (original)
+++ lucene/dev/branches/lucene6699/solr/build.xml Wed Sep  2 13:06:13 2015
@@ -95,7 +95,7 @@
   <!--LUCENE-3286: Luke is incompatible with new XML QP location and target is not flexible
   when it comes to incompatible changes.  Update when Luke has updated.
   <target name="compile-xml-query-parser">
-  	<ant dir="${common.dir}/queryparser" target="compile-core" inheritAll="false">
+    <ant dir="${common.dir}/queryparser" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -378,7 +378,7 @@
         <include name="webapps" />
         <include name="solr-webapp/**/*" />
         <exclude name="**/.gitignore" />
-      </fileset>    	
+      </fileset>      
     </delete>
   </target>
   
@@ -679,7 +679,7 @@
       <contrib-crawl target="-validate-maven-dependencies"/>
     </sequential>
   </target>
-	 
+   
   <!-- ========================================================================= -->
   <!-- ========================= COMMITTERS' HELPERS =========================== -->
   <!-- ========================================================================= -->
@@ -717,37 +717,37 @@
     <!-- spanish -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/spanish_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_es.txt"/>
-  	<!-- basque -->
+    <!-- basque -->
     <copy verbose="true" file="${analysis-common.res.dir}/eu/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_eu.txt"/>
-  	<!-- persian -->
+    <!-- persian -->
     <copy verbose="true" file="${analysis-common.res.dir}/fa/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_fa.txt"/>
-  	<!-- finnish -->
+    <!-- finnish -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/finnish_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_fi.txt"/>
-  	<!-- french -->
+    <!-- french -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/french_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_fr.txt"/>
         <!-- irish -->
     <copy verbose="true" file="${analysis-common.res.dir}/ga/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_ga.txt"/>
-  	<!-- galician -->
+    <!-- galician -->
     <copy verbose="true" file="${analysis-common.res.dir}/gl/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_gl.txt"/>
-  	<!-- hindi -->
+    <!-- hindi -->
     <copy verbose="true" file="${analysis-common.res.dir}/hi/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_hi.txt"/>
-  	<!-- hungarian -->
+    <!-- hungarian -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/hungarian_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_hu.txt"/>
-  	<!-- armenian -->
+    <!-- armenian -->
     <copy verbose="true" file="${analysis-common.res.dir}/hy/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_hy.txt"/>
-  	<!-- indonesian -->
+    <!-- indonesian -->
     <copy verbose="true" file="${analysis-common.res.dir}/id/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_id.txt"/>
-  	<!-- italian -->
+    <!-- italian -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/italian_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_it.txt"/>
     <!-- japanese -->
@@ -755,31 +755,31 @@
                          tofile="${analysis.conf.dest}/stopwords_ja.txt"/>
     <copy verbose="true" file="${analysis-kuromoji.res.dir}/ja/stoptags.txt"
                          tofile="${analysis.conf.dest}/stoptags_ja.txt"/>
-  	<!-- latvian -->
+    <!-- latvian -->
     <copy verbose="true" file="${analysis-common.res.dir}/lv/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_lv.txt"/>
-  	<!-- dutch -->
+    <!-- dutch -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/dutch_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_nl.txt"/>
-  	<!-- norwegian -->
+    <!-- norwegian -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/norwegian_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_no.txt"/>
-  	<!-- portuguese -->
+    <!-- portuguese -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/portuguese_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_pt.txt"/>
-  	<!-- romanian -->
+    <!-- romanian -->
     <copy verbose="true" file="${analysis-common.res.dir}/ro/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_ro.txt"/>
-  	<!-- russian -->
+    <!-- russian -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/russian_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_ru.txt"/>
-  	<!-- swedish -->
+    <!-- swedish -->
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/swedish_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_sv.txt"/>
-  	<!-- thai -->
+    <!-- thai -->
     <copy verbose="true" file="${analysis-common.res.dir}/th/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_th.txt"/>
-  	<!-- turkish -->
+    <!-- turkish -->
     <copy verbose="true" file="${analysis-common.res.dir}/tr/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_tr.txt"/>
   </target>

Modified: lucene/dev/branches/lucene6699/solr/cloud-dev/control.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/cloud-dev/control.sh?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/cloud-dev/control.sh (original)
+++ lucene/dev/branches/lucene6699/solr/cloud-dev/control.sh Wed Sep  2 13:06:13 2015
@@ -22,14 +22,14 @@ case "$1" in
         status $2
         ;;
   cleanlogs)
-		cleanlogs $2
-		;;
+        cleanlogs $2
+        ;;
   taillogs)
-		taillogs $2
-		;;
+        taillogs $2
+        ;;
   createshard)
-		createshard $2 $3 $4 $5
-		;;
+        createshard $2 $3 $4 $5
+        ;;
   *)
         echo $"Usage: $0 { rebuild| reinstall <instanceid>| start <instanceid> [numshards]| stop <instanceid>|kill <instanceid>| status<instanceid>| cleanlogs<instanceid>| createshard <instance> <collection> <coreName> [shardId]}"
         exit 1

Modified: lucene/dev/branches/lucene6699/solr/cloud-dev/functions.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/cloud-dev/functions.sh?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/cloud-dev/functions.sh (original)
+++ lucene/dev/branches/lucene6699/solr/cloud-dev/functions.sh Wed Sep  2 13:06:13 2015
@@ -5,13 +5,13 @@ ZK_PORT="2414"
 ZK_CHROOT="solr"
 
 rebuild() {
-	echo "Rebuilding"
-	cd ..
-	rm -r -f dist
-	rm -r -f build
-	rm -r -f server/solr/zoo_data
-	rm -f server/server.log
-	ant server dist
+  echo "Rebuilding"
+  cd ..
+  rm -r -f dist
+  rm -r -f build
+  rm -r -f server/solr/zoo_data
+  rm -f server/server.log
+  ant server dist
 }
 
 setports() {
@@ -20,58 +20,58 @@ setports() {
 }
 
 reinstall() {
-	echo "Reinstalling instance $1"
-	cd ..
-	rm -rf  server$1
-	cp -r -f server server$1
+  echo "Reinstalling instance $1"
+  cd ..
+  rm -rf  server$1
+  cp -r -f server server$1
 }
 
 start() {
-	OPT="-DzkHost=localhost:$ZK_PORT/$ZK_CHROOT"
-	NUMSHARDS=$2
+  OPT="-DzkHost=localhost:$ZK_PORT/$ZK_CHROOT"
+  NUMSHARDS=$2
 
-	echo "Starting instance $1"
+  echo "Starting instance $1"
 
-	setports $1
-	cd ../server$1
-	java $JAVA_OPTS -Djetty.port=$PORT $OPT -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key jetty.base=. 1>server$1.log 2>&1 &
+  setports $1
+  cd ../server$1
+  java $JAVA_OPTS -Djetty.port=$PORT $OPT -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key jetty.base=. 1>server$1.log 2>&1 &
 }
 
 stop() {
-	echo "Stopping instance $1"
-	setports $1
-	cd ../server$1
-	java -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key --stop
+  echo "Stopping instance $1"
+  setports $1
+  cd ../server$1
+  java -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key --stop
 }
 
 do_kill() {
-	echo "Killing instance $1"
-	setports $1
-	PID=`ps aux|grep "STOP.PORT=$STOP_PORT"|grep -v grep|cut -b 8-15`
-	if [ "" = "$PID" ]; then
-		echo "not running?"
-	else
-		kill -9 $PID
-	fi
+  echo "Killing instance $1"
+  setports $1
+  PID=`ps aux|grep "STOP.PORT=$STOP_PORT"|grep -v grep|cut -b 8-15`
+  if [ "" = "$PID" ]; then
+    echo "not running?"
+  else
+    kill -9 $PID
+  fi
 }
 
 status() {
-	echo "Status:"
-	ps aux|grep "STOP.PORT"|grep -v grep
+  echo "Status:"
+  ps aux|grep "STOP.PORT"|grep -v grep
 }
 
 cleanlogs() {
     cd ../server$1
-	mv server$1.log server$1.oldlog
+  mv server$1.log server$1.oldlog
 }
 
 taillogs() {
-	cd ../server$1
-	tail -f server$1.log
+  cd ../server$1
+  tail -f server$1.log
 }
 
 createshard() {
-	setports $1
-	echo "Creating new shard @instance $1, collection=$2, shard=$3, name=$4"
-	curl "http://127.0.0.1:$PORT/solr/admin/cores?action=CREATE&collection=$2&name=$3&shard=$4"
+  setports $1
+  echo "Creating new shard @instance $1, collection=$2, shard=$3, name=$4"
+  curl "http://127.0.0.1:$PORT/solr/admin/cores?action=CREATE&collection=$2&name=$3&shard=$4"
 }

Modified: lucene/dev/branches/lucene6699/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/common-build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene6699/solr/common-build.xml Wed Sep  2 13:06:13 2015
@@ -76,21 +76,21 @@
   <property name="fullnamever" value="${final.name}"/>
 
   <path id="additional.dependencies">
-  	<fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
-  	<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
-  	<fileset dir="${common-solr.dir}/server/lib" excludes="${common.classpath.excludes}"/>
-  	<fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>  	
-  	<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
+    <fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/server/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>    
+    <fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
   </path>
 
   <path id="solr.lucene.libs">
     <!-- List of jars that will be used as the foundation for both
          the base classpath, as well as copied into the lucene-libs dir 
-	 in the release.
+         in the release.
     -->
     <!-- NOTE: lucene-core is explicitly not included because of the 
-	 base.classpath (compilation & tests are done directly against   
-	 the class files w/o needing to build the jar)
+         base.classpath (compilation & tests are done directly against   
+         the class files w/o needing to build the jar)
     -->
     <pathelement location="${analyzers-common.jar}"/>
     <pathelement location="${analyzers-kuromoji.jar}"/>
@@ -128,8 +128,8 @@
       <exclude name="randomizedtesting-runner-*.jar" />
       <exclude name="ant*.jar" />
     </fileset>
-  	<pathelement path="src/test-files"/>
-  	<path refid="test.base.classpath"/>
+    <pathelement path="src/test-files"/>
+    <path refid="test.base.classpath"/>
   </path>
  
   <path id="test.classpath" refid="solr.test.base.classpath"/>
@@ -168,11 +168,11 @@
   </target>
 
   <target name="prep-lucene-jars" 
-  	      depends="jar-lucene-core, jar-backward-codecs, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-codecs,jar-expressions, jar-suggest, jar-highlighter, jar-memory,
-  	               jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser, jar-join, jar-sandbox">
-  	  <property name="solr.deps.compiled" value="true"/>
+          depends="jar-lucene-core, jar-backward-codecs, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-codecs,jar-expressions, jar-suggest, jar-highlighter, jar-memory,
+                   jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser, jar-join, jar-sandbox">
+      <property name="solr.deps.compiled" value="true"/>
   </target>
-	
+  
   <target name="lucene-jars-to-solr" 
           depends="-lucene-jars-to-solr-not-for-package,-lucene-jars-to-solr-package"/>
   
@@ -249,7 +249,7 @@
 
   <!-- create javadocs for the current module -->
   <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,check-javadocs-uptodate" unless="javadocs-uptodate-${name}">
-   	<sequential>
+     <sequential>
       <mkdir dir="${javadoc.dir}/${name}"/>
       <solr-invoke-javadoc>
         <solrsources>
@@ -424,7 +424,7 @@
     <ant dir="${common-solr.dir}/test-framework" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
-  	<property name="solr.core.compiled" value="true"/>
+    <property name="solr.core.compiled" value="true"/>
     <property name="solr.test.framework.compiled" value="true"/>
   </target>
 
@@ -469,15 +469,15 @@
   </target>
 
   <target name="compile-contrib" description="Compile contrib modules">
-  	<contrib-crawl target="compile-core"/>
+    <contrib-crawl target="compile-core"/>
   </target>
   
   <target name="compile-test-contrib" description="Compile contrib modules' tests">
-  	<contrib-crawl target="compile-test"/>
+    <contrib-crawl target="compile-test"/>
   </target>
 
   <target name="javadocs-contrib" description="Compile contrib modules">
-  	<contrib-crawl target="javadocs"/>
+    <contrib-crawl target="javadocs"/>
   </target>
 
   <target name="jar-contrib" description="Jar contrib modules">

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/expressions.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/expressions.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/expressions.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/expressions.xml Wed Sep  2 13:06:13 2015
@@ -1,285 +1,285 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>Add Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>unique</name>
- 		</statistic>
- 		<statistic>
- 			<expression>add(sum(int(int_id)),unique(long(long_ld)))</expression>
- 			<name>add sum and unique</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>add(mean(int(int_id)),count(long(long_ld)),median(int(int_id)))</expression>
- 			<name>add mean and count and median</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Multiply Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>unique</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mult(sum(int(int_id)),unique(long(long_ld)))</expression>
- 			<name>multiply sum and unique</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mult(mean(int(int_id)),count(long(long_ld)),median(int(int_id)))</expression>
- 			<name>multiply mean and count and median</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Divide Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>unique</name>
- 		</statistic>
- 		<statistic>
- 			<expression>div(sum(int(int_id)),unique(long(long_ld)))</expression>
- 			<name>divide sum by unique</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>div(mean(int(int_id)),count(long(long_ld)))</expression>
- 			<name>divide mean by count</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Power Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>unique</name>
- 		</statistic>
- 		<statistic>
- 			<expression>pow(sum(int(int_id)),unique(long(long_ld)))</expression>
- 			<name>power sum by unique</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>pow(mean(int(int_id)),count(long(long_ld)))</expression>
- 			<name>power mean by count</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Negate Request</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>sum</name>
- 		</statistic>
- 		<statistic>
- 			<expression>neg(sum(int(int_id)))</expression>
- 			<name>negate of sum</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>count</name>
- 		</statistic>
- 		<statistic>
- 			<expression>neg(count(long(long_ld)))</expression>
- 			<name>negate of count</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Const Num Request</name>
- 		
- 		<statistic>
- 			<expression>const_num(8)</expression>
- 			<name>constant 8</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_num(10)</expression>
- 			<name>constant 10</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Date Math Request</name>
- 		
- 		<statistic>
- 			<expression>median(date(date_dtd))</expression>
- 			<name>median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_str(+2YEARS)</expression>
- 			<name>constant str median</name>
- 		</statistic>
- 		<statistic>
- 			<expression>date_math(median(date(date_dtd)),const_str(+2YEARS))</expression>
- 			<name>date math median</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(date(date_dtd))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_str(+2MONTHS)</expression>
- 			<name>constant str max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>date_math(max(date(date_dtd)),const_str(+2MONTHS))</expression>
- 			<name>date math max</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Constant Date Request</name>
- 		
- 		<statistic>
- 			<expression>const_str(1800-12-31T23:59:59Z)</expression>
- 			<name>const str 1</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_date(1800-12-31T23:59:59Z)</expression>
- 			<name>const date 1</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_str(1804-06-30T23:59:59Z)</expression>
- 			<name>const str 2</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_date(1804-06-30T23:59:59Z)</expression>
- 			<name>const date 2</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Constant String Request</name>
- 		
- 		<statistic>
- 			<expression>const_str(this is the first)</expression>
- 			<name>const str 1</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_str(this is the second)</expression>
- 			<name>const str 2</name>
- 		</statistic>
- 		<statistic>
- 			<expression>const_str(this is the third)</expression>
- 			<name>const str 3</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Concatenate Request</name>
- 		
- 		<statistic>
- 			<expression>const_str(this is the first)</expression>
- 			<name>const str min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(str(string_sd))</expression>
- 			<name>min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>concat(const_str(this is the first),min(str(string_sd)))</expression>
- 			<name>concat const and min</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>const_str(this is the second)</expression>
- 			<name>const str max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(str(string_sd))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>concat(const_str(this is the second),max(str(string_sd)))</expression>
- 			<name>concat const and max</name>
- 		</statistic>
- 	</analyticsRequest>
- 	
- 	<analyticsRequest>
- 		<name>Reverse Request</name>
- 		
- 		<statistic>
- 			<expression>min(str(string_sd))</expression>
- 			<name>min</name>
- 		</statistic>
- 		<statistic>
- 			<expression>rev(min(str(string_sd)))</expression>
- 			<name>reverse min</name>
- 		</statistic>
- 		
- 		<statistic>
- 			<expression>max(str(string_sd))</expression>
- 			<name>max</name>
- 		</statistic>
- 		<statistic>
- 			<expression>rev(max(str(string_sd)))</expression>
- 			<name>reverse max</name>
- 		</statistic>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>Add Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>unique</name>
+     </statistic>
+     <statistic>
+       <expression>add(sum(int(int_id)),unique(long(long_ld)))</expression>
+       <name>add sum and unique</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>add(mean(int(int_id)),count(long(long_ld)),median(int(int_id)))</expression>
+       <name>add mean and count and median</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Multiply Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>unique</name>
+     </statistic>
+     <statistic>
+       <expression>mult(sum(int(int_id)),unique(long(long_ld)))</expression>
+       <name>multiply sum and unique</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>mult(mean(int(int_id)),count(long(long_ld)),median(int(int_id)))</expression>
+       <name>multiply mean and count and median</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Divide Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>unique</name>
+     </statistic>
+     <statistic>
+       <expression>div(sum(int(int_id)),unique(long(long_ld)))</expression>
+       <name>divide sum by unique</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>div(mean(int(int_id)),count(long(long_ld)))</expression>
+       <name>divide mean by count</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Power Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>unique</name>
+     </statistic>
+     <statistic>
+       <expression>pow(sum(int(int_id)),unique(long(long_ld)))</expression>
+       <name>power sum by unique</name>
+     </statistic>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>pow(mean(int(int_id)),count(long(long_ld)))</expression>
+       <name>power mean by count</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Negate Request</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>sum</name>
+     </statistic>
+     <statistic>
+       <expression>neg(sum(int(int_id)))</expression>
+       <name>negate of sum</name>
+     </statistic>
+     
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>count</name>
+     </statistic>
+     <statistic>
+       <expression>neg(count(long(long_ld)))</expression>
+       <name>negate of count</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Const Num Request</name>
+     
+     <statistic>
+       <expression>const_num(8)</expression>
+       <name>constant 8</name>
+     </statistic>
+     <statistic>
+       <expression>const_num(10)</expression>
+       <name>constant 10</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Date Math Request</name>
+     
+     <statistic>
+       <expression>median(date(date_dtd))</expression>
+       <name>median</name>
+     </statistic>
+     <statistic>
+       <expression>const_str(+2YEARS)</expression>
+       <name>constant str median</name>
+     </statistic>
+     <statistic>
+       <expression>date_math(median(date(date_dtd)),const_str(+2YEARS))</expression>
+       <name>date math median</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(date(date_dtd))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>const_str(+2MONTHS)</expression>
+       <name>constant str max</name>
+     </statistic>
+     <statistic>
+       <expression>date_math(max(date(date_dtd)),const_str(+2MONTHS))</expression>
+       <name>date math max</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Constant Date Request</name>
+     
+     <statistic>
+       <expression>const_str(1800-12-31T23:59:59Z)</expression>
+       <name>const str 1</name>
+     </statistic>
+     <statistic>
+       <expression>const_date(1800-12-31T23:59:59Z)</expression>
+       <name>const date 1</name>
+     </statistic>
+     <statistic>
+       <expression>const_str(1804-06-30T23:59:59Z)</expression>
+       <name>const str 2</name>
+     </statistic>
+     <statistic>
+       <expression>const_date(1804-06-30T23:59:59Z)</expression>
+       <name>const date 2</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Constant String Request</name>
+     
+     <statistic>
+       <expression>const_str(this is the first)</expression>
+       <name>const str 1</name>
+     </statistic>
+     <statistic>
+       <expression>const_str(this is the second)</expression>
+       <name>const str 2</name>
+     </statistic>
+     <statistic>
+       <expression>const_str(this is the third)</expression>
+       <name>const str 3</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Concatenate Request</name>
+     
+     <statistic>
+       <expression>const_str(this is the first)</expression>
+       <name>const str min</name>
+     </statistic>
+     <statistic>
+       <expression>min(str(string_sd))</expression>
+       <name>min</name>
+     </statistic>
+     <statistic>
+       <expression>concat(const_str(this is the first),min(str(string_sd)))</expression>
+       <name>concat const and min</name>
+     </statistic>
+     
+     <statistic>
+       <expression>const_str(this is the second)</expression>
+       <name>const str max</name>
+     </statistic>
+     <statistic>
+       <expression>max(str(string_sd))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>concat(const_str(this is the second),max(str(string_sd)))</expression>
+       <name>concat const and max</name>
+     </statistic>
+   </analyticsRequest>
+   
+   <analyticsRequest>
+     <name>Reverse Request</name>
+     
+     <statistic>
+       <expression>min(str(string_sd))</expression>
+       <name>min</name>
+     </statistic>
+     <statistic>
+       <expression>rev(min(str(string_sd)))</expression>
+       <name>reverse min</name>
+     </statistic>
+     
+     <statistic>
+       <expression>max(str(string_sd))</expression>
+       <name>max</name>
+     </statistic>
+     <statistic>
+       <expression>rev(max(str(string_sd)))</expression>
+       <name>reverse max</name>
+     </statistic>
+   </analyticsRequest>
 </analyticsRequestEnvelope> 

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacetExtras.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacetExtras.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacetExtras.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacetExtras.xml Wed Sep  2 13:06:13 2015
@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>sort request</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</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>perc(20,int(int_id))</expression>
- 			<name>perc_20</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>long_ld</field>
- 			<sortSpecification>
- 				<statName>mean</statName>
- 				<direction>asc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>float_fd</field>
- 			<sortSpecification>
- 				<statName>median</statName>
- 				<direction>desc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>double_dd</field>
- 			<sortSpecification>
- 				<statName>count</statName>
- 				<direction>asc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>string_sd</field>
- 			<sortSpecification>
- 				<statName>perc_20</statName>
- 				<direction>desc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>limit request</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</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>perc(20,int(int_id))</expression>
- 			<name>perc_20</name>
- 		</statistic>
- 		
- 		<fieldFacet limit="5">
- 			<field>long_ld</field>
- 			<sortSpecification>
- 				<statName>mean</statName>
- 				<direction>asc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet limit="3">
- 			<field>float_fd</field>
- 			<sortSpecification>
- 				<statName>median</statName>
- 				<direction>desc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet limit="7">
- 			<field>double_dd</field>
- 			<sortSpecification>
- 				<statName>count</statName>
- 				<direction>asc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 		<fieldFacet limit="1">
- 			<field>string_sd</field>
- 			<sortSpecification>
- 				<statName>perc_20</statName>
- 				<direction>desc</direction>
- 			</sortSpecification>
- 		</fieldFacet>
- 	</analyticsRequest>
+   <analyticsRequest>
+     <name>sort request</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</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>perc(20,int(int_id))</expression>
+       <name>perc_20</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>long_ld</field>
+       <sortSpecification>
+         <statName>mean</statName>
+         <direction>asc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet>
+       <field>float_fd</field>
+       <sortSpecification>
+         <statName>median</statName>
+         <direction>desc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet>
+       <field>double_dd</field>
+       <sortSpecification>
+         <statName>count</statName>
+         <direction>asc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet>
+       <field>string_sd</field>
+       <sortSpecification>
+         <statName>perc_20</statName>
+         <direction>desc</direction>
+       </sortSpecification>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>limit request</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</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>perc(20,int(int_id))</expression>
+       <name>perc_20</name>
+     </statistic>
+     
+     <fieldFacet limit="5">
+       <field>long_ld</field>
+       <sortSpecification>
+         <statName>mean</statName>
+         <direction>asc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet limit="3">
+       <field>float_fd</field>
+       <sortSpecification>
+         <statName>median</statName>
+         <direction>desc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet limit="7">
+       <field>double_dd</field>
+       <sortSpecification>
+         <statName>count</statName>
+         <direction>asc</direction>
+       </sortSpecification>
+     </fieldFacet>
+     <fieldFacet limit="1">
+       <field>string_sd</field>
+       <sortSpecification>
+         <statName>perc_20</statName>
+         <direction>desc</direction>
+       </sortSpecification>
+     </fieldFacet>
+   </analyticsRequest>
 </analyticsRequestEnvelope>

Modified: lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacets.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacets.xml (original)
+++ lucene/dev/branches/lucene6699/solr/contrib/analytics/src/test-files/analytics/requestXMLFiles/fieldFacets.xml Wed Sep  2 13:06:13 2015
@@ -1,496 +1,496 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <analyticsRequestEnvelope stats="true" olap="true">
- 	<analyticsRequest>
- 		<name>sum</name>
- 		
- 		<statistic>
- 			<expression>sum(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sum(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>mean</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>mean(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>sumOfSquares</name>
- 		
- 		<statistic>
- 			<expression>sumofsquares(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>sumofsquares(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>stddev</name>
- 		
- 		<statistic>
- 			<expression>stddev(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>stddev(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>median</name>
- 		
- 		<statistic>
- 			<expression>median(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>median(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>perc_20 numeric</name>
- 		
- 		<statistic>
- 			<expression>perc(20,int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>perc_20</name>
- 		
- 		<statistic>
- 			<expression>perc(20,str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(20,date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>perc_60 numeric</name>
- 		
- 		<statistic>
- 			<expression>perc(60,int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>perc_60</name>
- 		
- 		<statistic>
- 			<expression>perc(60,str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>perc(60,date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>min numeric</name>
- 		
- 		<statistic>
- 			<expression>min(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>min</name>
- 		
- 		<statistic>
- 			<expression>min(str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>min(date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>max numeric</name>
- 		
- 		<statistic>
- 			<expression>max(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>max</name>
- 		
- 		<statistic>
- 			<expression>max(str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>max(date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>count numeric</name>
- 		
- 		<statistic>
- 			<expression>count(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>count</name>
- 		
- 		<statistic>
- 			<expression>count(str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>count(date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>unique numeric</name>
- 		
- 		<statistic>
- 			<expression>unique(int(int_id))</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(long(long_ld))</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(float(float_fd))</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(double(double_dd))</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>unique</name>
- 		
- 		<statistic>
- 			<expression>unique(str(string_sd))</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>unique(date(date_dtd))</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>missing numeric</name>
- 		
- 		<statistic>
- 			<expression>missing(int{int_id})</expression>
- 			<name>int</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(long{long_ld})</expression>
- 			<name>long</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(float{float_fd})</expression>
- 			<name>float</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(double{double_dd})</expression>
- 			<name>double</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>missing</name>
- 		
- 		<statistic>
- 			<expression>missing(str{string_sd})</expression>
- 			<name>str</name>
- 		</statistic>
- 		<statistic>
- 			<expression>missing(date{date_dtd})</expression>
- 			<name>date</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>int_id</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>long_ld</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>multivalued</name>
- 		
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>long_ldm</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>string_sdm</field>
- 		</fieldFacet>
- 		<fieldFacet>
- 			<field>date_dtdm</field>
- 		</fieldFacet>
- 	</analyticsRequest>
- 	<analyticsRequest>
- 		<name>missing facet</name>
+   <analyticsRequest>
+     <name>sum</name>
+     
+     <statistic>
+       <expression>sum(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>sum(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>sum(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>sum(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>mean</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>mean(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>mean(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>mean(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>sumOfSquares</name>
+     
+     <statistic>
+       <expression>sumofsquares(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>sumofsquares(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>stddev</name>
+     
+     <statistic>
+       <expression>stddev(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>stddev(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>median</name>
+     
+     <statistic>
+       <expression>median(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>median(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>median(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>median(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>perc_20 numeric</name>
+     
+     <statistic>
+       <expression>perc(20,int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>perc_20</name>
+     
+     <statistic>
+       <expression>perc(20,str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>perc(20,date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>perc_60 numeric</name>
+     
+     <statistic>
+       <expression>perc(60,int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>perc_60</name>
+     
+     <statistic>
+       <expression>perc(60,str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>perc(60,date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>min numeric</name>
+     
+     <statistic>
+       <expression>min(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>min(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>min(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>min(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>min</name>
+     
+     <statistic>
+       <expression>min(str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>min(date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>max numeric</name>
+     
+     <statistic>
+       <expression>max(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>max(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>max(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>max(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>max</name>
+     
+     <statistic>
+       <expression>max(str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>max(date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>count numeric</name>
+     
+     <statistic>
+       <expression>count(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>count(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>count(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>count(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>count</name>
+     
+     <statistic>
+       <expression>count(str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>count(date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>unique numeric</name>
+     
+     <statistic>
+       <expression>unique(int(int_id))</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>unique(long(long_ld))</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>unique(float(float_fd))</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>unique(double(double_dd))</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>unique</name>
+     
+     <statistic>
+       <expression>unique(str(string_sd))</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>unique(date(date_dtd))</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>missing numeric</name>
+     
+     <statistic>
+       <expression>missing(int{int_id})</expression>
+       <name>int</name>
+     </statistic>
+     <statistic>
+       <expression>missing(long{long_ld})</expression>
+       <name>long</name>
+     </statistic>
+     <statistic>
+       <expression>missing(float{float_fd})</expression>
+       <name>float</name>
+     </statistic>
+     <statistic>
+       <expression>missing(double{double_dd})</expression>
+       <name>double</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>missing</name>
+     
+     <statistic>
+       <expression>missing(str{string_sd})</expression>
+       <name>str</name>
+     </statistic>
+     <statistic>
+       <expression>missing(date{date_dtd})</expression>
+       <name>date</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>int_id</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>long_ld</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>multivalued</name>
+     
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>long_ldm</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>string_sdm</field>
+     </fieldFacet>
+     <fieldFacet>
+       <field>date_dtdm</field>
+     </fieldFacet>
+   </analyticsRequest>
+   <analyticsRequest>
+     <name>missing facet</name>
 
- 		<statistic>
- 			<expression>mean(int(int_id))</expression>
- 			<name>mean</name>
- 		</statistic>
- 		
- 		<fieldFacet>
- 			<field>date_dtd</field>
- 		</fieldFacet>
- 		<fieldFacet showMissing="true">
- 			<field>string_sd</field>
- 		</fieldFacet>
- 		<fieldFacet showMissing="true">
- 			<field>date_dtdm</field>
- 		</fieldFacet>
- 	</analyticsRequest>
+     <statistic>
+       <expression>mean(int(int_id))</expression>
+       <name>mean</name>
+     </statistic>
+     
+     <fieldFacet>
+       <field>date_dtd</field>
+     </fieldFacet>
+     <fieldFacet showMissing="true">
+       <field>string_sd</field>
+     </fieldFacet>
+     <fieldFacet showMissing="true">
+       <field>date_dtdm</field>
+     </fieldFacet>
+   </analyticsRequest>
 </analyticsRequestEnvelope>



Mime
View raw message