[DROOLS-1583] remove redundant methods and review locks on KnowledgeB…

…aseImpl (apache#1315)
kiegroup · Jun 9, 2017 · efae52f · efae52f
1 parent c999f53
commit efae52f
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 1,107 deletions.
diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
@@ -36,6 +36,7 @@
 import java.util.Set;
 import java.util.Stack;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
 import org.drools.compiler.compiler.AnnotationDeclarationError;
@@ -1148,8 +1149,7 @@ private Map<String, RuleBuildContext> preProcessRules(PackageDescr packageDescr,
             }
 
             if (needsRemoval) {
-                try {
+                kBase.enqueueModification( () -> {
-                    this.kBase.lock();
                     for( org.kie.api.definition.rule.Rule rule : pkg.getRules() ) {
                         if (filterAcceptsRemoval( ResourceChange.Type.RULE, rule.getPackageName(), rule.getName() ) ) {
                             this.kBase.removeRule(pkg, pkg.getRule(rule.getName()));
@@ -1169,9 +1169,7 @@ private Map<String, RuleBuildContext> preProcessRules(PackageDescr packageDescr,
                     if (!rulesToBeRemoved.isEmpty()) {
                         kBase.removeRules( pkg, rulesToBeRemoved );
                     }
-                } finally {
+                } );
-                    this.kBase.unlock();
-                }
             }
         }
 
@@ -1580,13 +1578,10 @@ public PackageRegistry newPackage(final PackageDescr packageDescr) {
 
             // if there is a rulebase then add the package.
             if (this.kBase != null) {
-                // Must lock here, otherwise the assumption about addPackage/getPackage behavior below might be violated
-                this.kBase.lock();
                 try {
-                    this.kBase.addPackage(pkg);
+                    pkg = (InternalKnowledgePackage) this.kBase.addPackage(pkg).get();
-                    pkg = this.kBase.getPackage(packageDescr.getName());
+                } catch (InterruptedException | ExecutionException e) {
-                } finally {
+                    throw new RuntimeException( e );
-                    this.kBase.unlock();
                 }
             } else {
                 // the RuleBase will also initialise the

diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
@@ -260,13 +260,8 @@ private Results update(final InternalKieModule currentKM, final ReleaseId newRel
                 kbasesToRemove.add( kbaseName );
             } else {
                 final InternalKnowledgeBase kBase = (InternalKnowledgeBase) kBaseEntry.getValue();
-                kBase.enqueueModification( new Runnable() {
+                kBase.enqueueModification( () -> updateKBase( kBase, currentKM, newReleaseId, newKM, cs, modifiedClasses, modifyingUsedClass,
-                    @Override
+                                                              unchangedResources, results, newKieBaseModel, currentKieBaseModel ) );
-                    public void run() {
-                        updateKBase( kBase, currentKM, newReleaseId, newKM, cs, modifiedClasses, modifyingUsedClass,
-                                     unchangedResources, results, newKieBaseModel, currentKieBaseModel);
-                    }
-                } );
             }
         }
 

diff --git a/drools-compiler/src/test/java/org/drools/compiler/builder/impl/KnowledgeBuilderTest.java b/drools-compiler/src/test/java/org/drools/compiler/builder/impl/KnowledgeBuilderTest.java
@@ -182,7 +182,7 @@ public void testReload() throws Exception {
                       builder.getErrors().getErrors() );
 
         InternalKnowledgeBase kBase = KnowledgeBaseFactory.newKnowledgeBase();
-        kBase.getGlobals().put( "map", Map.class );
+        kBase.addGlobal( "map", Map.class );
         final KieSession workingMemory = kBase.newKieSession();
 
         final HashMap map = new HashMap();

diff --git a/drools-compiler/src/test/java/org/drools/compiler/command/KBuilderBatchExecutionTest.java b/drools-compiler/src/test/java/org/drools/compiler/command/KBuilderBatchExecutionTest.java
diff --git a/...-core/src/main/java/org/drools/core/command/KnowledgeBaseAddKnowledgePackagesCommand.java b/...-core/src/main/java/org/drools/core/command/KnowledgeBaseAddKnowledgePackagesCommand.java
diff --git a/drools-core/src/main/java/org/drools/core/command/builder/KnowledgeBuilderAddCommand.java b/drools-core/src/main/java/org/drools/core/command/builder/KnowledgeBuilderAddCommand.java