From 821e1640416c7c57fbcd702061fd48afb610cce7 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Tue, 31 Dec 2019 10:41:43 +0000
Subject: [PATCH] Bug 63700: Make D* functions work with numeric result column

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872136 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/ss/formula/functions/DStarRunner.java |  41 ++++++++++--------
 test-data/spreadsheet/DGet.xls                | Bin 54784 -> 55296 bytes
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
index b55ba808b0..295721b4dd 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
+++ b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
@@ -54,13 +54,13 @@ public final class DStarRunner implements Function3Arg {
         /** @see DSum */
         DSUM(DSum::new),
         ;
-        
+
         private final Supplier<IDStarAlgorithm> implSupplier;
 
-        private DStarAlgorithmEnum(Supplier<IDStarAlgorithm> implSupplier) {
+        DStarAlgorithmEnum(Supplier<IDStarAlgorithm> implSupplier) {
             this.implSupplier = implSupplier;
         }
-        
+
         /**
          * @return a new function implementation instance
          */
@@ -94,7 +94,7 @@ public final class DStarRunner implements Function3Arg {
         }
         AreaEval db = (AreaEval)database;
         AreaEval cdb = (AreaEval)conditionDatabase;
-        
+
         try {
             filterColumn = OperandResolver.getSingleValue(filterColumn, srcRowIndex, srcColumnIndex);
         } catch (EvaluationException e) {
@@ -149,7 +149,7 @@ public final class DStarRunner implements Function3Arg {
     }
 
     /**
-     * 
+     *
      *
      * @param nameValueEval Must not be a RefEval or AreaEval. Thus make sure resolveReference() is called on the value first!
      * @param db Database
@@ -158,8 +158,17 @@ public final class DStarRunner implements Function3Arg {
      */
     private static int getColumnForName(ValueEval nameValueEval, AreaEval db)
             throws EvaluationException {
-        String name = OperandResolver.coerceValueToString(nameValueEval);
-        return getColumnForString(db, name);
+        if (nameValueEval instanceof NumericValueEval) {
+            int columnNo =  OperandResolver.coerceValueToInt(nameValueEval) - 1;
+            if (columnNo < 0 || columnNo >= db.getWidth()) {
+                return -1;
+            }
+            return columnNo;
+        }
+        else {
+            String name = OperandResolver.coerceValueToString(nameValueEval);
+            return getColumnForString(db, name);
+        }
     }
 
     /**
@@ -169,10 +178,8 @@ public final class DStarRunner implements Function3Arg {
      * @param db Database.
      * @param name Column heading.
      * @return Corresponding column number.
-     * @throws EvaluationException If it's not possible to turn all headings into strings.
      */
-    private static int getColumnForString(AreaEval db,String name)
-            throws EvaluationException {
+    private static int getColumnForString(AreaEval db,String name) {
         int resultColumn = -1;
         final int width = db.getWidth();
         for(int column = 0; column < width; ++column) {
@@ -216,10 +223,10 @@ public final class DStarRunner implements Function3Arg {
                 // special column that accepts formulas.
                 boolean columnCondition = true;
                 ValueEval condition;
-                
+
                 // The condition to apply.
                 condition = resolveReference(cdb, conditionRow, column);
-                
+
                 // If the condition is empty it matches.
                 if(condition instanceof BlankEval)
                     continue;
@@ -229,7 +236,7 @@ public final class DStarRunner implements Function3Arg {
                 if(!(targetHeader instanceof StringValueEval)) {
                     throw new EvaluationException(ErrorEval.VALUE_INVALID);
                 }
-                
+
                 if (getColumnForName(targetHeader, db) == -1)
                     // No column found, it's again a special column that accepts formulas.
                     columnCondition = false;
@@ -269,7 +276,7 @@ public final class DStarRunner implements Function3Arg {
             throws EvaluationException {
         if(condition instanceof StringEval) {
             String conditionString = ((StringEval)condition).getStringValue();
-        
+
             if(conditionString.startsWith("<")) { // It's a </<= condition.
                 String number = conditionString.substring(1);
                 if(number.startsWith("=")) {
@@ -378,7 +385,7 @@ public final class DStarRunner implements Function3Arg {
         }
         return false; // Can not be reached.
     }
-    
+
     private static Double getNumberFromValueEval(ValueEval value) {
         if(value instanceof NumericValueEval) {
             return ((NumericValueEval)value).getNumberValue();
@@ -395,11 +402,11 @@ public final class DStarRunner implements Function3Arg {
             return null;
         }
     }
-    
+
     /**
      * Resolve a ValueEval that's in an AreaEval.
      *
-     * @param db AreaEval from which the cell to resolve is retrieved. 
+     * @param db AreaEval from which the cell to resolve is retrieved.
      * @param dbRow Relative row in the AreaEval.
      * @param dbCol Relative column in the AreaEval.
      * @return A ValueEval that is a NumberEval, StringEval, BoolEval, BlankEval or ErrorEval.
diff --git a/test-data/spreadsheet/DGet.xls b/test-data/spreadsheet/DGet.xls
index b75120cbb02d5d4ed2a360fb48b7d397aee5ab4d..ddec841904954518cd02030a25c9cc94f12ab4d9 100644
GIT binary patch
delta 1937
zcmZuxTTEO<82;v*U3OV6OSoexIZ$kBqjC{V9~7*;m|DSDOw$(Fvg{r%6?V<C+g&Ji
zv4Qr<gfcG`8d{0eq~3s4pBgn$t1sRn#Mm^!Cu1}*eKcNJzd5_*5}3(9^IyOD=l|!N
z(RcOHd3~Z*oVi@L!`262;l&R`A}Mk;kt+?o)YXUyLA8clS!=7bl*O{w_DISs-?wF^
zx$iCRj^*=j+FmFd?K!m9+Dctd;FgvKQn(H4xD$4Tt9&xod=g9cruw4nlZ=1^$4sx^
zXg0@@jpBB>XWu)HmBPn~_I2XUzLvsxDbNxb=rTithIh~inS+u3u;B~#M+O29fWh5n
z$PD;Qqn9vd$mkj}0+xFbFl>f`TY@TpV8ArO!JyIa4fU8?9C%>ZjD;iKeub37lZ`+y
zY;*@B0e@mo^GHrc)hS@6O@7vKHF3DjuN9B*9#x&dy$JB_>%iD`;JbO+XFR|1BJG@m
z2qQuYqX%AuxWB@+4*_z6Fv*{_)>_oj`zV66_fcaF8^m2WHTTM>Lm(4VSq)A<1cZ>c
zJl!r;_<YqyA%E}`R@&mN2M#tnwM&j_>i!}<OylpQ*4ElX6y<r(ZuyI+yo|6*$P?Sc
z#@AsPlO7EyKa#VH?*%$f=fIVGmV$lobM8$~KfP5xsqqP1z-ut>UZys!R@f>clY6GM
zrVMs&cA*Iev^bah?r9`$4bG`76{s%%yc4*Y19TPu-8<HI1tk;&H$5HdsDYhIP1uw|
z(=<_!^;v-@ndEPJwM{^`r$VaKrl59OvK2>el=%@r86aQkS`;G*hwoUWJTvY}_{JPU
zuS32Z7+=-vks}vI3KJJDepI3xI4)PF%Vg`!QDMkyGbgAyCEuJWOB7u53JPtOFmb&{
z3GGUd1+$Nl@38o;*%!!rET?Z~pVIoAS{@$^kY_cQjBxXT<RQ9^F1C$sXdB(|Ho9~2
zpSLP`^l2VlBpc>b8exl{o(q!q%0J&Ok<~Y*L^AQ|joX>=Mtn|~|5(ll=@7;#2`z(C
z7M?{09%b4BZfey?CIKHrvJ?+SF+{Ty6+-bb2D`BT4>&ZwQoySa&$6X%j4>`H>6E^p
zq)?+4sus7P6)cb01dC0ucFoBU1?LtDEXoJ%#+Pa6C?TKWn@t@Q<v;2GE>L<^Q=U#7
zB!90d73V^;<*Aa0A+GMGV58REnAN5vY+I6uZAc<!C2>1_Y>Y`9S-WkFNj!(?HJg+F
zh>L5I3oVvsMjSP)<K_a#m_*rnflCDHwyAJTU1!M3=05I_mCr=_6xE(oKU1C#9LCi(
zo0HwW#P5(!H5g7cgJnpym>I2Z&Y*r{2C5mu8|pA@o%>Z9`y6*Ss=5Be&s5I?$~F1k
z{NA0rah#VPWA&TSsO9713?H4ICh_MYn>s3T;{;M4ahy}vW%<H~lZ!uROwP^iYF|#Q
zES@*^pP+p;nN0GBjy6&|se|MpohEgXl)a0)LidwQQa7oG)GOck(Kop?;CQIM|7QEL
bkm02<?d1je_tLO9DI?4AY%jg|nOft2xleQz

delta 1161
zcmZWoTTE0}6kX@u3&V^Km~lWJX#*`W#Dru9M~hJqwBQS^ifK?rhJia&szxQqhmSD6
z(xfd0-HB<845dD5T7!>E+aEu$P5e@08Vb=gwSV=;82^kR&~+{&n0QXs+54`&_qzMs
zb8hmMnY>~4hg9deaFMkK!0l}}l{2lf4ds_&Gv8N@enr}VUqV)iOXkTQt9&Lb!<IMg
zJ$AjPZq8&n9+c_~KjR@Q-?tohjkJ)~jm+uxXJ}oW<DJcM#xhn{<R+U~0S~q(;&$=o
z#2L)T*UeH^`Lm}n_%YS~aGq9f2|6R2kNGn%>;wYM($I3r`Lo$J@_JZ#y%p%8v*Rq_
z8v-s5GoG6F+61DUHrnM?%R&{E7qP_!7S!J;G;^LIQ^AXi^CDR`6yGlEV;w&I5tO@#
ziUxZd*KXZVNSRU~cZ{Kb7z)t_h{pO*9St@eIM|u!N_2%kTZc+SuoUH}!>6dnC-fq;
z%ej_g4I^Rt<z&LB<r={XEx?Y(P-eW}QIp?LY^}*Kxz<MHkW(WUV)+~9n$+cUV|`7x
zr3--X0;xiq8()&1dY5l~d$zz!#l0m*r>Cc9DLU>&pfwHkQEgXee4oT)MZGpgM@KO_
zn`q-JHm0@SMe9PKqe#CWNEOc6w>gvK4aR{5gzj|4c;Tb7*nOO#6e`}CA6i%iAKN{;
zMsF|_kVCpS;Qh(3WfaGAQz;Kht>0Z$o|!xJgTe!@9``wk3?+}^cT|saqHTMLSpmN@
zekxm;%b?`H(^F;`0lC)`bSBUIvWOy|OL(9_9u91x-zBdG3nY@NqQ6V~PG2g{%i_Eo
zJgLY<-FV;7QU$p;^d*@VH*4JwRfbGn36RdY+CjRTbguMWJwQJ$|Ngj0@~&M}Q_k&c
z_q}EgO6AC{BHsir+BWX)ijpUHmef@n0sNY|k(;P-H&Txr+HbNJ5H68keE6Oh%ERyZ
z0W-`tmsV)w1f;<kk)#tkKk_8=tlj_Hw`0z;k>kZxQ@jHFuds_~CZfb{qJ@YNIv%Ih
y8tsHW&IHjxd?5pWwV!LX&X4bx?5Ib&$4?t8Z_1nTBdSRbPxQ`jWs-Z`H2(tupYzQC

-- 
2.39.5