Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87DDE1874E for ; Sat, 10 Oct 2015 06:28:14 +0000 (UTC) Received: (qmail 16004 invoked by uid 500); 10 Oct 2015 06:28:14 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 15972 invoked by uid 500); 10 Oct 2015 06:28:14 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 15963 invoked by uid 99); 10 Oct 2015 06:28:14 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 06:28:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 02F08C5281 for ; Sat, 10 Oct 2015 06:28:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id uqEG0LAy1UNO for ; Sat, 10 Oct 2015 06:28:07 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 131CE439BA for ; Sat, 10 Oct 2015 06:28:06 +0000 (UTC) Received: (qmail 15935 invoked by uid 99); 10 Oct 2015 06:28:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 06:28:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F82EDFA24; Sat, 10 Oct 2015 06:28:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mhubail@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb git commit: Updated LSMOperationType references to LSM API package Date: Sat, 10 Oct 2015 06:28:06 +0000 (UTC) Repository: incubator-asterixdb Updated Branches: refs/heads/master 2bc26dd4d -> e61cc6767 Updated LSMOperationType references to LSM API package Change-Id: Ie3fca99e7019424f2b2a3ca43180cf6390feb761 Reviewed-on: https://asterix-gerrit.ics.uci.edu/448 Tested-by: Jenkins Reviewed-by: Yingyi Bu Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/e61cc676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/e61cc676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/e61cc676 Branch: refs/heads/master Commit: e61cc67671b431a28fb6876dad09581c24caa131 Parents: 2bc26dd Author: Murtadha Hubail Authored: Fri Oct 9 22:20:09 2015 -0700 Committer: Murtadha Hubail Committed: Fri Oct 9 23:25:16 2015 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/common/context/BaseOperationTracker.java | 2 +- .../asterix/common/context/PrimaryIndexOperationTracker.java | 2 +- .../common/ioopcallbacks/AbstractLSMIOOperationCallback.java | 2 +- .../asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java | 2 +- .../common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java | 2 +- .../common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java | 2 +- .../asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java | 2 +- .../management/service/transaction/TransactionContext.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java b/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java index 889877f..3b824ec 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java @@ -24,7 +24,7 @@ import org.apache.hyracks.storage.am.common.api.IModificationOperationCallback; import org.apache.hyracks.storage.am.common.api.ISearchOperationCallback; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex; import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; public class BaseOperationTracker implements ILSMOperationTracker { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java b/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java index 2603de2..6c63248 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java @@ -37,8 +37,8 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexInternal; import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; public class PrimaryIndexOperationTracker extends BaseOperationTracker { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java index ee3808f..abf7ba9 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java @@ -27,7 +27,7 @@ import org.apache.hyracks.storage.am.common.api.ITreeIndex; import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrame; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; import org.apache.hyracks.storage.common.buffercache.IBufferCache; import org.apache.hyracks.storage.common.buffercache.ICachedPage; import org.apache.hyracks.storage.common.file.BufferedFileHandle; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java index 613daa7..12680fd 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java @@ -25,7 +25,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.btree.impls.BTree; import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTreeDiskComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; public class LSMBTreeIOOperationCallback extends AbstractLSMIOOperationCallback { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java index 25a9e2f..b5ce879 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTreeWithBuddyDiskComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; public class LSMBTreeWithBuddyIOOperationCallback extends AbstractLSMIOOperationCallback { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java index 587ed23..fd3cf12 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; import org.apache.hyracks.storage.am.lsm.invertedindex.impls.LSMInvertedIndexDiskComponent; public class LSMInvertedIndexIOOperationCallback extends AbstractLSMIOOperationCallback { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java index 41b5f19..5d243a3 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java +++ b/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; import org.apache.hyracks.storage.am.lsm.rtree.impls.LSMRTreeDiskComponent; public class LSMRTreeIOOperationCallback extends AbstractLSMIOOperationCallback { http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e61cc676/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java ---------------------------------------------------------------------- diff --git a/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java b/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java index 42b73aa..ecb1bc9 100644 --- a/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java +++ b/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java @@ -37,7 +37,7 @@ import org.apache.asterix.common.transactions.MutableLong; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.am.common.api.IModificationOperationCallback; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex; -import org.apache.hyracks.storage.am.lsm.common.impls.LSMOperationType; +import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType; /* * An object of TransactionContext is created and accessed(read/written) by multiple threads which work for