Move sorting back to loading thread. (2010ff78) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/BaseActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import android.support.annotation.VisibleForTesting;
		import android.support.v7.widget.RecyclerView;
		import android.util.Log;
		import android.view.KeyEvent;
		import android.view.KeyboardShortcutGroup;
		import android.view.Menu;
		import android.view.MenuItem;
		import android.view.View;

src/com/android/documentsui/DirectoryLoader.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.net.Uri;
		import android.os.CancellationSignal;
		import android.os.OperationCanceledException;
		import android.os.RemoteException;
		import android.provider.DocumentsContract;
		import android.provider.DocumentsContract.Document;
		import android.util.Log;

		@@ -35,8 +34,6 @@ import com.android.documentsui.base.RootInfo;
		import com.android.documentsui.roots.RootCursorWrapper;
		import com.android.documentsui.sorting.SortModel;

		import java.io.FileNotFoundException;

		import libcore.io.IoUtils;

		public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
		@@ -86,7 +83,6 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {

		final DirectoryResult result = new DirectoryResult();
		result.doc = mDoc;
		result.sortModel = mModel;

		ContentProviderClient client = null;
		Cursor cursor;
		@@ -107,6 +103,8 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
		cursor = new FilteringCursorWrapper(cursor, null, SEARCH_REJECT_MIMES);
		}

		cursor = mModel.sortCursor(cursor);

		result.client = client;
		result.cursor = cursor;
		} catch (Exception e) {

src/com/android/documentsui/DirectoryResult.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.ContentProviderClient;
		import android.database.Cursor;

		import com.android.documentsui.base.DocumentInfo;
		import com.android.documentsui.sorting.SortModel;

		import libcore.io.IoUtils;

		@@ -29,7 +28,6 @@ public class DirectoryResult implements AutoCloseable {
		public Cursor cursor;
		public Exception exception;
		public DocumentInfo doc;
		public SortModel sortModel;

		@Override
		public void close() {
		@@ -37,6 +35,6 @@ public class DirectoryResult implements AutoCloseable {
		ContentProviderClient.releaseQuietly(client);
		cursor = null;
		client = null;
		sortModel = null;
		doc = null;
		}
		}

src/com/android/documentsui/RecentsLoader.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -40,10 +40,10 @@ import com.android.documentsui.roots.RootCursorWrapper;
		import com.android.documentsui.roots.RootsAccess;
		import com.android.internal.annotations.GuardedBy;

		import com.google.common.util.concurrent.AbstractFuture;

		import libcore.io.IoUtils;

		import com.google.common.util.concurrent.AbstractFuture;

		import java.io.Closeable;
		import java.io.IOException;
		import java.util.ArrayList;
		@@ -180,7 +180,6 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> {
		}

		final DirectoryResult result = new DirectoryResult();
		result.sortModel = mState.sortModel;

		final Cursor merged;
		if (cursors.size() > 0) {
		@@ -190,13 +189,16 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> {
		merged = new MatrixCursor(new String[0]);
		}


		final Cursor sorted = mState.sortModel.sortCursor(merged);

		// Tell the UI if this is an in-progress result. When loading is complete, another update is
		// sent with EXTRA_LOADING set to false.
		Bundle extras = new Bundle();
		extras.putBoolean(DocumentsContract.EXTRA_LOADING, !allDone);
		merged.setExtras(extras);
		sorted.setExtras(extras);

		result.cursor = merged;
		result.cursor = sorted;

		return result;
		}

src/com/android/documentsui/dirlist/Model.java

+3 −251

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.documentsui.dirlist;

		import static com.android.documentsui.base.DocumentInfo.getCursorLong;
		import static com.android.documentsui.base.DocumentInfo.getCursorString;
		import static com.android.documentsui.base.Shared.DEBUG;

		@@ -34,11 +33,8 @@ import android.util.Log;
		import com.android.documentsui.DirectoryResult;
		import com.android.documentsui.base.DocumentInfo;
		import com.android.documentsui.base.EventListener;
		import com.android.documentsui.base.Shared;
		import com.android.documentsui.dirlist.MultiSelectManager.Selection;
		import com.android.documentsui.roots.RootCursorWrapper;
		import com.android.documentsui.sorting.SortDimension;
		import com.android.documentsui.sorting.SortModel;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -60,12 +56,7 @@ public class Model {
		private int mCursorCount;
		/** Maps Model ID to cursor positions, for looking up items by Model ID. */
		private Map<String, Integer> mPositions = new HashMap<>();
		/**
		* A sorted array of model IDs for the files currently in the Model. Sort order is determined
		* by {@link #mSortModel}
		*/
		private String mIds[] = new String[0];
		private SortModel mSortModel;

		@Nullable String info;
		@Nullable String error;
		@@ -126,7 +117,6 @@ public class Model {

		mCursor = result.cursor;
		mCursorCount = mCursor.getCount();
		mSortModel = result.sortModel;
		doc = result.doc;

		updateModelData();
		@@ -151,24 +141,7 @@ public class Model {
		* according to the current sort order.
		*/
		private void updateModelData() {
		int[] positions = new int[mCursorCount];
		mIds = new String[mCursorCount];
		boolean[] isDirs = new boolean[mCursorCount];
		String[] displayNames = null;
		long[] longValues = null;

		final int id = mSortModel.getSortedDimensionId();
		switch (id) {
		case SortModel.SORT_DIMENSION_ID_TITLE:
		displayNames = new String[mCursorCount];
		break;
		case SortModel.SORT_DIMENSION_ID_DATE:
		case SortModel.SORT_DIMENSION_ID_SIZE:
		longValues = new long[mCursorCount];
		break;
		}

		String mimeType;

		mCursor.moveToPosition(-1);
		for (int pos = 0; pos < mCursorCount; ++pos) {
		@@ -176,246 +149,25 @@ public class Model {
		Log.e(TAG, "Fail to move cursor to next pos: " + pos);
		return;
		}
		positions[pos] = pos;

		// Generates a Model ID for a cursor entry that refers to a document. The Model ID is a
		// unique string that can be used to identify the document referred to by the cursor.
		// If the cursor is a merged cursor over multiple authorities, then prefix the ids
		// with the authority to avoid collisions.
		if (mCursor instanceof MergeCursor) {
		mIds[pos] = getCursorString(mCursor, RootCursorWrapper.COLUMN_AUTHORITY) + "\|" +
		getCursorString(mCursor, Document.COLUMN_DOCUMENT_ID);
		mIds[pos] = getCursorString(mCursor, RootCursorWrapper.COLUMN_AUTHORITY)
		+ "\|" + getCursorString(mCursor, Document.COLUMN_DOCUMENT_ID);
		} else {
		mIds[pos] = getCursorString(mCursor, Document.COLUMN_DOCUMENT_ID);
		}

		mimeType = getCursorString(mCursor, Document.COLUMN_MIME_TYPE);
		isDirs[pos] = Document.MIME_TYPE_DIR.equals(mimeType);

		switch(id) {
		case SortModel.SORT_DIMENSION_ID_TITLE:
		final String displayName = getCursorString(
		mCursor, Document.COLUMN_DISPLAY_NAME);
		displayNames[pos] = displayName;
		break;
		case SortModel.SORT_DIMENSION_ID_DATE:
		longValues[pos] = getLastModified(mCursor);
		break;
		case SortModel.SORT_DIMENSION_ID_SIZE:
		longValues[pos] = getCursorLong(mCursor, Document.COLUMN_SIZE);
		break;
		}
		}

		final SortDimension dimension = mSortModel.getDimensionById(id);
		switch (id) {
		case SortModel.SORT_DIMENSION_ID_TITLE:
		binarySort(displayNames, isDirs, positions, mIds, dimension.getSortDirection());
		break;
		case SortModel.SORT_DIMENSION_ID_DATE:
		case SortModel.SORT_DIMENSION_ID_SIZE:
		binarySort(longValues, isDirs, positions, mIds, dimension.getSortDirection());
		break;
		}

		// Populate the positions.
		mPositions.clear();
		for (int i = 0; i < mCursorCount; ++i) {
		mPositions.put(mIds[i], positions[i]);
		mPositions.put(mIds[i], i);
		}
		}

		/**
		* Sorts model data. Takes three columns of index-corresponded data. The first column is the
		* sort key. Rows are sorted in ascending alphabetical order on the sort key.
		* Directories are always shown first. This code is based on TimSort.binarySort().
		*
		* @param sortKey Data is sorted in ascending alphabetical order.
		* @param isDirs Array saying whether an item is a directory or not.
		* @param positions Cursor positions to be sorted.
		* @param ids Model IDs to be sorted.
		*/
		private static void binarySort(
		String[] sortKey,
		boolean[] isDirs,
		int[] positions,
		String[] ids,
		@SortDimension.SortDirection int direction) {
		final int count = positions.length;
		for (int start = 1; start < count; start++) {
		final int pivotPosition = positions[start];
		final String pivotValue = sortKey[start];
		final boolean pivotIsDir = isDirs[start];
		final String pivotId = ids[start];

		int left = 0;
		int right = start;

		while (left < right) {
		int mid = (left + right) >>> 1;

		// Directories always go in front.
		int compare = 0;
		final boolean rhsIsDir = isDirs[mid];
		if (pivotIsDir && !rhsIsDir) {
		compare = -1;
		} else if (!pivotIsDir && rhsIsDir) {
		compare = 1;
		} else {
		final String lhs = pivotValue;
		final String rhs = sortKey[mid];
		switch (direction) {
		case SortDimension.SORT_DIRECTION_ASCENDING:
		compare = Shared.compareToIgnoreCaseNullable(lhs, rhs);
		break;
		case SortDimension.SORT_DIRECTION_DESCENDING:
		compare = -Shared.compareToIgnoreCaseNullable(lhs, rhs);
		break;
		default:
		throw new IllegalArgumentException(
		"Unknown sorting direction: " + direction);
		}
		}

		if (compare < 0) {
		right = mid;
		} else {
		left = mid + 1;
		}
		}

		int n = start - left;
		switch (n) {
		case 2:
		positions[left + 2] = positions[left + 1];
		sortKey[left + 2] = sortKey[left + 1];
		isDirs[left + 2] = isDirs[left + 1];
		ids[left + 2] = ids[left + 1];
		case 1:
		positions[left + 1] = positions[left];
		sortKey[left + 1] = sortKey[left];
		isDirs[left + 1] = isDirs[left];
		ids[left + 1] = ids[left];
		break;
		default:
		System.arraycopy(positions, left, positions, left + 1, n);
		System.arraycopy(sortKey, left, sortKey, left + 1, n);
		System.arraycopy(isDirs, left, isDirs, left + 1, n);
		System.arraycopy(ids, left, ids, left + 1, n);
		}

		positions[left] = pivotPosition;
		sortKey[left] = pivotValue;
		isDirs[left] = pivotIsDir;
		ids[left] = pivotId;
		}
		}

		/**
		* Sorts model data. Takes four columns of index-corresponded data. The first column is the sort
		* key, and the second is an array of mime types. The rows are first bucketed by mime type
		* (directories vs documents) and then each bucket is sorted independently in descending
		* numerical order on the sort key. This code is based on TimSort.binarySort().
		*
		* @param sortKey Data is sorted in descending numerical order.
		* @param isDirs Array saying whether an item is a directory or not.
		* @param positions Cursor positions to be sorted.
		* @param ids Model IDs to be sorted.
		*/
		private static void binarySort(
		long[] sortKey,
		boolean[] isDirs,
		int[] positions,
		String[] ids,
		@SortDimension.SortDirection int direction) {
		final int count = positions.length;
		for (int start = 1; start < count; start++) {
		final int pivotPosition = positions[start];
		final long pivotValue = sortKey[start];
		final boolean pivotIsDir = isDirs[start];
		final String pivotId = ids[start];

		int left = 0;
		int right = start;

		while (left < right) {
		int mid = ((left + right) >>> 1);

		// Directories always go in front.
		int compare = 0;
		final boolean rhsIsDir = isDirs[mid];
		if (pivotIsDir && !rhsIsDir) {
		compare = -1;
		} else if (!pivotIsDir && rhsIsDir) {
		compare = 1;
		} else {
		final long lhs = pivotValue;
		final long rhs = sortKey[mid];
		switch (direction) {
		case SortDimension.SORT_DIRECTION_ASCENDING:
		compare = Long.compare(lhs, rhs);
		break;
		case SortDimension.SORT_DIRECTION_DESCENDING:
		compare = -Long.compare(lhs, rhs);
		break;
		default:
		throw new IllegalArgumentException(
		"Unknown sorting direction: " + direction);
		}
		}

		// If numerical comparison yields a tie, use document ID as a tie breaker. This
		// will yield stable results even if incoming items are continually shuffling and
		// have identical numerical sort keys. One common example of this scenario is seen
		// when sorting a set of active downloads by mod time.
		if (compare == 0) {
		compare = pivotId.compareTo(ids[mid]);
		}

		if (compare < 0) {
		right = mid;
		} else {
		left = mid + 1;
		}
		}

		int n = start - left;
		switch (n) {
		case 2:
		positions[left + 2] = positions[left + 1];
		sortKey[left + 2] = sortKey[left + 1];
		isDirs[left + 2] = isDirs[left + 1];
		ids[left + 2] = ids[left + 1];
		case 1:
		positions[left + 1] = positions[left];
		sortKey[left + 1] = sortKey[left];
		isDirs[left + 1] = isDirs[left];
		ids[left + 1] = ids[left];
		break;
		default:
		System.arraycopy(positions, left, positions, left + 1, n);
		System.arraycopy(sortKey, left, sortKey, left + 1, n);
		System.arraycopy(isDirs, left, isDirs, left + 1, n);
		System.arraycopy(ids, left, ids, left + 1, n);
		}

		positions[left] = pivotPosition;
		sortKey[left] = pivotValue;
		isDirs[left] = pivotIsDir;
		ids[left] = pivotId;
		}
		}

		/**
		* @return Timestamp for the given document. Some docs (e.g. active downloads) have a null
		* timestamp - these will be replaced with MAX_LONG so that such files get sorted to the top
		* when sorting descending by date.
		*/
		long getLastModified(Cursor cursor) {
		long l = getCursorLong(mCursor, Document.COLUMN_LAST_MODIFIED);
		return (l == -1) ? Long.MAX_VALUE : l;
		}

		public @Nullable Cursor getItem(String modelId) {
		Integer pos = mPositions.get(modelId);
		if (pos == null) {