You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/01/28 20:49:22 UTC
asterixdb git commit: [ASTERIXDB-2256] Hand-prepare two problematic
files for source format
Repository: asterixdb
Updated Branches:
refs/heads/master a05657664 -> e5190b99b
[ASTERIXDB-2256] Hand-prepare two problematic files for source format
Change-Id: Ibcb24e807979629f25892d58bff1c44c061b42e3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2334
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Integration-Tests: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e5190b99
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e5190b99
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e5190b99
Branch: refs/heads/master
Commit: e5190b99bde1d9de6d7ad8a21d67dd8d011f3d21
Parents: a056576
Author: Michael Blow <mi...@couchbase.com>
Authored: Sun Jan 28 15:41:13 2018 -0500
Committer: Michael Blow <mb...@apache.org>
Committed: Sun Jan 28 12:49:02 2018 -0800
----------------------------------------------------------------------
.../lsm/invertedindex/search/SearchResult.java | 43 --------------------
.../java/org/apache/hyracks/util/MathUtil.java | 6 ++-
2 files changed, 5 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e5190b99/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/SearchResult.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/SearchResult.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/SearchResult.java
index 37eb600..2da1434 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/SearchResult.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/SearchResult.java
@@ -143,47 +143,4 @@ public class SearchResult {
return numResults;
}
- // TODO: This code may help to clean up the core list-merging algorithms.
- /*
- public SearchResultCursor getCursor() {
- cursor.reset();
- return cursor;
- }
-
- public class SearchResultCursor {
- private int bufferIndex;
- private int resultIndex;
- private int frameResultIndex;
- private ByteBuffer currentBuffer;
-
- public void reset() {
- bufferIndex = 0;
- resultIndex = 0;
- frameResultIndex = 0;
- currentBuffer = buffers.get(0);
- resultFrameTupleAcc.reset(currentBuffer);
- }
-
- public boolean hasNext() {
- return resultIndex < numResults;
- }
-
- public void next() {
- resultTuple.reset(currentBuffer.array(), resultFrameTupleAcc.getTupleStartOffset(frameResultIndex));
- if (frameResultIndex < resultFrameTupleAcc.getTupleCount()) {
- frameResultIndex++;
- } else {
- bufferIndex++;
- currentBuffer = buffers.get(bufferIndex);
- resultFrameTupleAcc.reset(currentBuffer);
- frameResultIndex = 0;
- }
- resultIndex++;
- }
-
- public ITupleReference getTuple() {
- return resultTuple;
- }
- }
- */
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e5190b99/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MathUtil.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MathUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MathUtil.java
index 2b157e4..2581934 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MathUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MathUtil.java
@@ -20,6 +20,10 @@
package org.apache.hyracks.util;
public class MathUtil {
+
+ private MathUtil() {
+ }
+
/**
* Fast way to calculate the log2(x). Note: x should be >= 1.
*
@@ -44,7 +48,7 @@ public class MathUtil {
log |= 4;
}
- if (n > 0b11) {
+ if (n > 3) {
n >>>= 2;
log |= 2;
}