Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
From: jburwell <git@git.apache.org>
To: dev@cloudstack.apache.org
Reply-To: dev@cloudstack.apache.org
References: <git-pr-689-cloudstack@git.apache.org>
In-Reply-To: <git-pr-689-cloudstack@git.apache.org>
Subject: [GitHub] cloudstack pull request: Quota master
Content-Type: text/plain
Message-Id: <20150820211744.A2154E7DF2@git1-us-west.apache.org>
Date: Thu, 20 Aug 2015 21:17:44 +0000 (UTC)

Github user jburwell commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/689#discussion_r37582361
  
    --- Diff: framework/quota/src/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImpl.java ---
    @@ -0,0 +1,201 @@
    +//Licensed to the Apache Software Foundation (ASF) under one
    +//or more contributor license agreements.  See the NOTICE file
    +//distributed with this work for additional information
    +//regarding copyright ownership.  The ASF licenses this file
    +//to you under the Apache License, Version 2.0 (the
    +//"License"); you may not use this file except in compliance
    +//with the License.  You may obtain a copy of the License at
    +//
    +//http://www.apache.org/licenses/LICENSE-2.0
    +//
    +//Unless required by applicable law or agreed to in writing,
    +//software distributed under the License is distributed on an
    +//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    +//KIND, either express or implied.  See the License for the
    +//specific language governing permissions and limitations
    +//under the License.
    +package org.apache.cloudstack.quota.dao;
    +
    +import java.math.BigDecimal;
    +import java.util.ArrayList;
    +import java.util.Date;
    +import java.util.Iterator;
    +import java.util.List;
    +
    +import javax.ejb.Local;
    +
    +import org.springframework.stereotype.Component;
    +import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
    +import org.apache.log4j.Logger;
    +
    +import com.cloud.exception.InvalidParameterValueException;
    +import com.cloud.utils.db.Filter;
    +import com.cloud.utils.db.GenericDaoBase;
    +import com.cloud.utils.db.SearchCriteria;
    +import com.cloud.utils.db.TransactionLegacy;
    +
    +@Component
    +@Local(value = { QuotaBalanceDao.class })
    +public class QuotaBalanceDaoImpl extends GenericDaoBase<QuotaBalanceVO, Long> implements QuotaBalanceDao {
    +    private static final Logger s_logger = Logger.getLogger(QuotaBalanceDaoImpl.class.getName());
    +
    +    @SuppressWarnings("deprecation")
    +    @Override
    +    public QuotaBalanceVO findLastBalanceEntry(final long accountId, final long domainId, final Date beforeThis) {
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +        TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
    +        Filter filter = new Filter(QuotaBalanceVO.class, "updatedOn", false, 0L, 1L);
    +        SearchCriteria<QuotaBalanceVO> sc = createSearchCriteria();
    +        sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
    +        sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
    +        sc.addAnd("creditsId", SearchCriteria.Op.EQ, 0);
    +        sc.addAnd("updatedOn", SearchCriteria.Op.LT, beforeThis);
    +        List<QuotaBalanceVO> quotab = this.search(sc, filter);
    +        TransactionLegacy.open(opendb).close();
    +        return quotab.size() > 0 ? quotab.get(0) : null;
    +    }
    +
    +    @SuppressWarnings("deprecation")
    +    @Override
    +    public QuotaBalanceVO findLaterBalanceEntry(final long accountId, final long domainId, final Date afterThis) {
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +        TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
    +        Filter filter = new Filter(QuotaBalanceVO.class, "updatedOn", true, 0L, 1L);
    +        SearchCriteria<QuotaBalanceVO> sc = createSearchCriteria();
    +        sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
    +        sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
    +        sc.addAnd("creditsId", SearchCriteria.Op.EQ, 0);
    +        sc.addAnd("updatedOn", SearchCriteria.Op.GT, afterThis);
    +        List<QuotaBalanceVO> quotab = this.search(sc, filter);
    +        TransactionLegacy.open(opendb).close();
    +        return quotab.size() > 0 ? quotab.get(0) : null;
    +    }
    +
    +    @Override
    +    public void saveQuotaBalance(final List<QuotaBalanceVO> credits) {
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
    +        try {
    +            for (QuotaBalanceVO credit : credits) {
    +                persist(credit);
    +            }
    +        } finally {
    +            txn.close();
    +        }
    +        TransactionLegacy.open(opendb).close();
    +    }
    +
    +    @SuppressWarnings("deprecation")
    +    @Override
    +    public List<QuotaBalanceVO> findCreditBalance(final long accountId, final long domainId, final Date lastbalancedate, final Date beforeThis) {
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +        TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
    +        Filter filter = new Filter(QuotaBalanceVO.class, "updatedOn", true, 0L, Long.MAX_VALUE);
    +        SearchCriteria<QuotaBalanceVO> sc = createSearchCriteria();
    +        sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
    +        sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
    +        sc.addAnd("creditsId", SearchCriteria.Op.GT, 0);
    +        if ((lastbalancedate != null) && (beforeThis != null) && lastbalancedate.before(beforeThis)) {
    +            sc.addAnd("updatedOn", SearchCriteria.Op.BETWEEN, lastbalancedate, beforeThis);
    +        } else {
    +            return new ArrayList<QuotaBalanceVO>();
    +        }
    +        List<QuotaBalanceVO> qb = search(sc, filter);
    +        TransactionLegacy.open(opendb).close();
    +        return qb;
    +    }
    +
    +    @SuppressWarnings("deprecation")
    +    @Override
    +    public List<QuotaBalanceVO> findQuotaBalance(final Long accountId, final Long domainId, final Date startDate, final Date endDate) {
    +    // TODO account for series of credits around boundaries
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +
    +        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
    +        List<QuotaBalanceVO> quotaUsageRecords = null;
    +        try {
    +            SearchCriteria<QuotaBalanceVO> sc = createSearchCriteria();
    +            if (accountId != null) {
    +                sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
    +            }
    +            if (domainId != null) {
    +                sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
    +            }
    +            if ((startDate != null) && (endDate != null) && startDate.before(endDate)) {
    +                sc.addAnd("updatedOn", SearchCriteria.Op.BETWEEN, startDate, endDate);
    +            } else {
    +                return new ArrayList<QuotaBalanceVO>();
    +            }
    +            quotaUsageRecords = listBy(sc);
    +            if (quotaUsageRecords.size() == 0) {
    +                quotaUsageRecords.addAll(lastQuotaBalanceVO(accountId, domainId, startDate));
    +            }
    +        } finally {
    +            txn.close();
    +        }
    +
    +        TransactionLegacy.open(opendb).close();
    +        return quotaUsageRecords;
    +    }
    +
    +
    +    @SuppressWarnings("deprecation")
    +    @Override
    +    public List<QuotaBalanceVO> lastQuotaBalanceVO(final Long accountId, final Long domainId, final Date pivotDate) {
    +        final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
    +
    +        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
    +        List<QuotaBalanceVO> quotaUsageRecords = null;
    +        List<QuotaBalanceVO> trimmedRecords = new ArrayList<QuotaBalanceVO>();
    +        try {
    +            Filter filter = new Filter(QuotaBalanceVO.class, "updatedOn", false, 0L, 100L);
    +            // ASSUMPTION there will be less than 100 continuous credit
    +            // transactions
    +            SearchCriteria<QuotaBalanceVO> sc = createSearchCriteria();
    +            if (accountId != null) {
    +                sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
    +            }
    +            if (domainId != null) {
    +                sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
    +            }
    +            if ((pivotDate != null)) {
    +                sc.addAnd("updatedOn", SearchCriteria.Op.LTEQ, pivotDate);
    +            }
    +            quotaUsageRecords = search(sc, filter);
    +
    +            // get records before startDate to find start balance
    +            for (Iterator<QuotaBalanceVO> it = quotaUsageRecords.iterator(); it.hasNext();) {
    +                QuotaBalanceVO entry = it.next();
    +                s_logger.info("findQuotaBalance Date=" + entry.getUpdatedOn().toGMTString() + " balance=" + entry.getCreditBalance() + " credit=" + entry.getCreditsId());
    +                if (entry.getCreditsId() > 0) {
    +                    trimmedRecords.add(entry);
    +                } else {
    +                    trimmedRecords.add(entry);
    +                    break; // add only consecutive credit entries and last balance entry
    +                }
    +            }
    +
    +        } finally {
    +            txn.close();
    +        }
    +
    +        TransactionLegacy.open(opendb).close();
    --- End diff --
    
    See previous comments regarding apparently needless open/close of a database transaction.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---