Merge pull request #564 from zinggAI/issue561

issue 561, null pointer due to insufficient data
zinggAI · Apr 25, 2023 · eb7ecb2 · eb7ecb2
2 parents c456b40 + fc2db88
commit eb7ecb2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/common/core/src/main/java/zingg/common/core/block/Block.java b/common/core/src/main/java/zingg/common/core/block/Block.java
@@ -11,6 +11,7 @@
 
 import zingg.common.client.FieldDefinition;
 import zingg.common.client.ZFrame;
+import zingg.common.client.ZinggClientException;
 import zingg.common.client.util.ListMap;
 import zingg.common.core.hash.HashFunction;
 
@@ -201,9 +202,10 @@ protected void setFunctionsMap(ListMap<T, HashFunction<D,R,C,T>> m) {
 	 * @param node
 	 * @param used
 	 * @return
+	 * @throws ZinggClientException 
 	 */
 	public Tree<Canopy<R>> getBlockingTree(Tree<Canopy<R>> tree, Canopy<R>parent,
-			Canopy<R>node, List<FieldDefinition> fieldsOfInterest) throws Exception {
+			Canopy<R>node, List<FieldDefinition> fieldsOfInterest) throws Exception, ZinggClientException {
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("Tree so far ");
 			LOG.debug(tree);
@@ -253,6 +255,9 @@ public Tree<Canopy<R>> getBlockingTree(Tree<Canopy<R>> tree, Canopy<R>parent,
 			}
 			else {
 				LOG.debug("Min size reached " + size + " for node " + node);
+				if (tree==null) {
+					throw new ZinggClientException("Unable to create Zingg models due to insufficient data. Please run Zingg after adding more data");
+				}
 			}
 			// tree.addLeaf(parent, node);
 			node.clearBeforeSaving();

diff --git a/common/core/src/main/java/zingg/common/core/util/BlockingTreeUtil.java b/common/core/src/main/java/zingg/common/core/util/BlockingTreeUtil.java
@@ -44,7 +44,7 @@ public abstract Block<D,R,C,T> getBlock(ZFrame<D,R,C> sample, ZFrame<D,R,C> posi
 	public Tree<Canopy<R>> createBlockingTree(ZFrame<D,R,C> testData,  
 			ZFrame<D,R,C> positives, double sampleFraction, long blockSize,
             Arguments args,
-			ListMap<T, HashFunction<D,R,C,T>> hashFunctions) throws Exception {
+			ListMap<T, HashFunction<D,R,C,T>> hashFunctions) throws Exception, ZinggClientException {
 		ZFrame<D,R,C> sample = testData.sample(false, sampleFraction);
 		sample = sample.cache();
 		long totalCount = sample.count();
@@ -82,7 +82,7 @@ public Tree<Canopy<R>> createBlockingTree(ZFrame<D,R,C> testData,
 
 	public  Tree<Canopy<R>> createBlockingTreeFromSample(ZFrame<D,R,C> testData,  
 			ZFrame<D,R,C> positives, double sampleFraction, long blockSize, Arguments args, 
-            ListMap hashFunctions) throws Exception {
+            ListMap hashFunctions) throws Exception, ZinggClientException {
 		ZFrame<D,R,C> sample = testData.sample(false, sampleFraction); 
 		return createBlockingTree(sample, positives, sampleFraction, blockSize, args, hashFunctions);
 	}