You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/02/29 21:35:11 UTC

incubator-asterixdb-hyracks git commit: Fix Double-Checked Locking (Coverity)

Repository: incubator-asterixdb-hyracks
Updated Branches:
  refs/heads/master 756ba73d1 -> a672f4421


Fix Double-Checked Locking (Coverity)

Fix CIDs 68208,68209,68210 - eliminate problematic double-checked locking

Change-Id: I3383035b5e8e0aa3cfd54f803f12d56090f006cf
Reviewed-on: https://asterix-gerrit.ics.uci.edu/667
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <im...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/a672f442
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/a672f442
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/a672f442

Branch: refs/heads/master
Commit: a672f4421761f27b8b9f3974855c40bc70e76a52
Parents: 756ba73
Author: Michael Blow <mi...@couchbase.com>
Authored: Mon Feb 29 14:58:29 2016 -0500
Committer: Till Westmann <ti...@apache.org>
Committed: Mon Feb 29 12:30:07 2016 -0800

----------------------------------------------------------------------
 .../am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java        | 3 ---
 .../lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java  | 3 ---
 .../am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java        | 3 ---
 3 files changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/a672f442/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java
index c82bf28..ab5be15 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java
@@ -56,9 +56,6 @@ public class ExternalBTreeDataflowHelper extends LSMBTreeDataflowHelper {
 
     @Override
     public IIndex getIndexInstance() {
-        if (index != null) {
-            return index;
-        }
         synchronized (lcManager) {
             if (index == null) {
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/a672f442/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java
index 56e9014..6e0beb3 100644
--- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java
+++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java
@@ -57,9 +57,6 @@ public class ExternalBTreeWithBuddyDataflowHelper extends AbstractLSMIndexDatafl
 
     @Override
     public IIndex getIndexInstance() {
-        if (index != null) {
-            return index;
-        }
         synchronized (lcManager) {
             if (index == null) {
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/a672f442/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java
index 48cc476..79e082c 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java
+++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java
@@ -72,9 +72,6 @@ public class ExternalRTreeDataflowHelper extends LSMRTreeDataflowHelper {
 
     @Override
     public IIndex getIndexInstance() {
-        if (index != null) {
-            return index;
-        }
         synchronized (lcManager) {
             if (index == null) {
                 try {