From ae4d589c8e9010b1615094d31dccf54a576de47c Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 26 Jan 2023 17:46:37 +0800 Subject: [PATCH] Move to androidx collection LongSparseArray --- .../ehviewer/download/DownloadManager.kt | 6 +- .../ehviewer/download/DownloadService.kt | 4 +- .../hippo/ehviewer/spider/SpiderQueen.java | 4 +- .../hippo/yorozuya/collect/SparseJLArray.java | 408 ------------------ 4 files changed, 7 insertions(+), 415 deletions(-) delete mode 100644 app/src/main/java/com/hippo/yorozuya/collect/SparseJLArray.java diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt index d31aed9b2..1db8d0699 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt @@ -18,6 +18,7 @@ package com.hippo.ehviewer.download import android.annotation.SuppressLint import android.os.AsyncTask import android.util.Log +import androidx.collection.LongSparseArray import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.client.data.BaseGalleryInfo import com.hippo.ehviewer.client.data.GalleryInfo @@ -35,7 +36,6 @@ import com.hippo.yorozuya.ObjectUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.collect.LongList import com.hippo.yorozuya.collect.SparseIJArray -import com.hippo.yorozuya.collect.SparseJLArray import java.io.IOException import java.util.LinkedList @@ -44,7 +44,7 @@ class DownloadManager : OnSpiderListener { private val mAllInfoList: LinkedList // All download info map - private val mAllInfoMap: SparseJLArray + private val mAllInfoMap: LongSparseArray // label and info list map, without default label info list private val mMap: MutableMap> @@ -85,7 +85,7 @@ class DownloadManager : OnSpiderListener { mAllInfoList = LinkedList(allInfoList) // Create all info map - val allInfoMap = SparseJLArray(allInfoList.size + 10) + val allInfoMap = LongSparseArray(allInfoList.size + 10) mAllInfoMap = allInfoMap for (info in allInfoList) { diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt index d16e73bb4..309882f97 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt @@ -25,6 +25,7 @@ import android.os.IBinder import android.os.SystemClock import android.util.Log import androidx.annotation.IntDef +import androidx.collection.LongSparseArray import androidx.core.app.ActivityCompat import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationCompat @@ -41,7 +42,6 @@ import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.collect.LongList import com.hippo.yorozuya.collect.SparseJBArray -import com.hippo.yorozuya.collect.SparseJLArray class DownloadService : Service(), DownloadManager.DownloadListener { private var mNotifyManager: NotificationManagerCompat? = null @@ -534,7 +534,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener { private const val ID_DOWNLOADED = 2 private const val ID_509 = 3 private val sItemStateArray = SparseJBArray() - private val sItemTitleArray = SparseJLArray() + private val sItemTitleArray = LongSparseArray() private var sFailedCount = 0 private var sFinishedCount = 0 private var sDownloadedCount = 0 diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java index 0148ff5c1..bb4ea78bd 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -28,6 +28,7 @@ import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.collection.LongSparseArray; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.GetText; @@ -55,7 +56,6 @@ import com.hippo.yorozuya.IOUtils; import com.hippo.yorozuya.MathUtils; import com.hippo.yorozuya.OSUtils; import com.hippo.yorozuya.StringUtils; -import com.hippo.yorozuya.collect.SparseJLArray; import com.hippo.yorozuya.thread.PriorityThread; import com.hippo.yorozuya.thread.PriorityThreadFactory; @@ -106,7 +106,7 @@ public final class SpiderQueen implements Runnable { "/509.gif", "/509s.gif" }; - private static final SparseJLArray sQueenMap = new SparseJLArray<>(); + private static final LongSparseArray sQueenMap = new LongSparseArray<>(); @NonNull private final OkHttpClient mHttpClient; @NonNull diff --git a/app/src/main/java/com/hippo/yorozuya/collect/SparseJLArray.java b/app/src/main/java/com/hippo/yorozuya/collect/SparseJLArray.java deleted file mode 100644 index 54b871184..000000000 --- a/app/src/main/java/com/hippo/yorozuya/collect/SparseJLArray.java +++ /dev/null @@ -1,408 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed 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 com.hippo.yorozuya.collect; - -/** - * SparseArrays map longs to Objects. Unlike a normal array of Objects, - * there can be gaps in the indices. It is intended to be more memory efficient - * than using a HashMap to map Integers to Objects, both because it avoids - * auto-boxing keys and its data structure doesn't rely on an extra entry object - * for each mapping. - * - *

Note that this container keeps its mappings in an array data structure, - * using a binary search to find keys. The implementation is not intended to be appropriate for - * data structures - * that may contain large numbers of items. It is generally slower than a traditional - * HashMap, since lookups require a binary search and adds and removes require inserting - * and deleting entries in the array. For containers holding up to hundreds of items, - * the performance difference is not significant, less than 50%.

- * - *

To help with performance, the container includes an optimization when removing - * keys: instead of compacting its array immediately, it leaves the removed entry marked - * as deleted. The entry can then be re-used for the same key, or compacted later in - * a single garbage collection step of all removed entries. This garbage collection will - * need to be performed at any time the array needs to be grown or the the map size or - * entry values are retrieved.

- * - *

It is possible to iterate over the items in this container using - * {@link #keyAt(int)} and {@link #valueAt(int)}. Iterating over the keys using - * keyAt(int) with ascending values of the index will return the - * keys in ascending order, or the values corresponding to the keys in ascending - * order in the case of valueAt(int).

- */ -public class SparseJLArray { - private static final Object DELETED = new Object(); - private boolean mGarbage = false; - - private long[] mKeys; - private Object[] mValues; - private int mSize; - - /** - * Creates a new SparseJLArray containing no mappings. - */ - public SparseJLArray() { - this(10); - } - - /** - * Creates a new SparseArray containing no mappings that will not - * require any additional memory allocation to store the specified - * number of mappings. If you supply an initial capacity of 0, the - * sparse array will be initialized with a light-weight representation - * not requiring any additional array allocations. - */ - public SparseJLArray(int initialCapacity) { - if (initialCapacity == 0) { - mKeys = CollectionUtils.EMPTY_LONG_ARRAY; - mValues = CollectionUtils.EMPTY_OBJECT_ARRAY; - } else { - mKeys = new long[initialCapacity]; - mValues = new Object[initialCapacity]; - } - mSize = 0; - } - - @Override - @SuppressWarnings("unchecked") - public SparseJLArray clone() { - SparseJLArray clone = null; - try { - clone = (SparseJLArray) super.clone(); - clone.mKeys = mKeys.clone(); - clone.mValues = mValues.clone(); - } catch (CloneNotSupportedException e) { - /* ignore */ - } - return clone; - } - - /** - * Gets the Object mapped from the specified key, or null - * if no such mapping has been made. - */ - public E get(long key) { - return get(key, null); - } - - /** - * Gets the Object mapped from the specified key, or the specified Object - * if no such mapping has been made. - */ - @SuppressWarnings("unchecked") - public E get(long key, E valueIfKeyNotFound) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i < 0 || mValues[i] == DELETED) { - return valueIfKeyNotFound; - } else { - return (E) mValues[i]; - } - } - - /** - * Removes the mapping from the specified key, if there was any. - */ - @SuppressWarnings("unchecked") - public E delete(long key) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - E deleted = (E) mValues[i]; - if (deleted != DELETED) { - mValues[i] = DELETED; - mGarbage = true; - return deleted; - } - } - - return null; - } - - /** - * Removes the mapping from the specified key, if there was any, returning the old value. - */ - @SuppressWarnings("unchecked") - public E removeReturnOld(long key) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - if (mValues[i] != DELETED) { - final E old = (E) mValues[i]; - mValues[i] = DELETED; - mGarbage = true; - return old; - } - } - return null; - } - - /** - * Alias for {@link #delete(long)}. - */ - public E remove(long key) { - return delete(key); - } - - /** - * Removes the mapping at the specified index. - */ - public void removeAt(int index) { - if (mValues[index] != DELETED) { - mValues[index] = DELETED; - mGarbage = true; - } - } - - /** - * Remove a range of mappings as a batch. - * - * @param index Index to begin at - * @param size Number of mappings to remove - */ - public void removeAtRange(int index, int size) { - final int end = Math.min(mSize, index + size); - for (int i = index; i < end; i++) { - removeAt(i); - } - } - - private void gc() { - // Log.e("SparseJLArray", "gc start with " + mSize); - - int n = mSize; - int o = 0; - long[] keys = mKeys; - Object[] values = mValues; - - for (int i = 0; i < n; i++) { - Object val = values[i]; - - if (val != DELETED) { - if (i != o) { - keys[o] = keys[i]; - values[o] = val; - values[i] = null; - } - - o++; - } - } - - mGarbage = false; - mSize = o; - - // Log.e("SparseJLArray", "gc end with " + mSize); - } - - /** - * Adds a mapping from the specified key to the specified value, - * replacing the previous mapping from the specified key if there - * was one. - */ - public void put(long key, E value) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - mValues[i] = value; - } else { - i = ~i; - - if (i < mSize && mValues[i] == DELETED) { - mKeys[i] = key; - mValues[i] = value; - return; - } - - if (mGarbage && mSize >= mKeys.length) { - gc(); - - // Search again because indices may have changed. - i = ~ContainerHelpers.binarySearch(mKeys, mSize, key); - } - - mKeys = CollectionUtils.insert(mKeys, mSize, i, key); - mValues = CollectionUtils.insert(mValues, mSize, i, value); - mSize++; - } - } - - /** - * Returns the number of key-value mappings that this SparseJLArray - * currently stores. - */ - public int size() { - if (mGarbage) { - gc(); - } - - return mSize; - } - - /** - * Given an index in the range 0...size()-1, returns - * the key from the indexth key-value mapping that this - * SparseJLArray stores. - * - *

The keys corresponding to indices in ascending order are guaranteed to - * be in ascending order, e.g., keyAt(0) will return the - * smallest key and keyAt(size()-1) will return the largest - * key.

- */ - public long keyAt(int index) { - if (mGarbage) { - gc(); - } - - return mKeys[index]; - } - - /** - * Given an index in the range 0...size()-1, returns - * the value from the indexth key-value mapping that this - * SparseJLArray stores. - * - *

The values corresponding to indices in ascending order are guaranteed - * to be associated with keys in ascending order, e.g., - * valueAt(0) will return the value associated with the - * smallest key and valueAt(size()-1) will return the value - * associated with the largest key.

- */ - @SuppressWarnings("unchecked") - public E valueAt(int index) { - if (mGarbage) { - gc(); - } - - return (E) mValues[index]; - } - - /** - * Given an index in the range 0...size()-1, sets a new - * value for the indexth key-value mapping that this - * SparseJLArray stores. - */ - public void setValueAt(int index, E value) { - if (mGarbage) { - gc(); - } - - mValues[index] = value; - } - - /** - * Returns the index for which {@link #keyAt} would return the - * specified key, or a negative number if the specified - * key is not mapped. - */ - public int indexOfKey(long key) { - if (mGarbage) { - gc(); - } - - return ContainerHelpers.binarySearch(mKeys, mSize, key); - } - - /** - * Returns an index for which {@link #valueAt} would return the - * specified key, or a negative number if no keys map to the - * specified value. - *

Beware that this is a linear search, unlike lookups by key, - * and that multiple keys can map to the same value and this will - * find only one of them. - *

Note also that unlike most collections' {@code indexOf} methods, - * this method compares values using {@code ==} rather than {@code equals}. - */ - public int indexOfValue(E value) { - if (mGarbage) { - gc(); - } - - for (int i = 0; i < mSize; i++) - if (mValues[i] == value) - return i; - - return -1; - } - - /** - * Removes all key-value mappings from this SparseJLArray. - */ - public void clear() { - int n = mSize; - Object[] values = mValues; - - for (int i = 0; i < n; i++) { - values[i] = null; - } - - mSize = 0; - mGarbage = false; - } - - /** - * Puts a key/value pair into the array, optimizing for the case where - * the key is greater than all existing keys in the array. - */ - public void append(long key, E value) { - if (mSize != 0 && key <= mKeys[mSize - 1]) { - put(key, value); - return; - } - - if (mGarbage && mSize >= mKeys.length) { - gc(); - } - - mKeys = CollectionUtils.append(mKeys, mSize, key); - mValues = CollectionUtils.append(mValues, mSize, value); - mSize++; - } - - /** - * {@inheritDoc} - * - *

This implementation composes a string by iterating over its mappings. If - * this map contains itself as a value, the string "(this Map)" - * will appear in its place. - */ - @Override - public String toString() { - if (size() <= 0) { - return "{}"; - } - - StringBuilder buffer = new StringBuilder(mSize * 28); - buffer.append('{'); - for (int i = 0; i < mSize; i++) { - if (i > 0) { - buffer.append(", "); - } - long key = keyAt(i); - buffer.append(key); - buffer.append('='); - Object value = valueAt(i); - if (value != this) { - buffer.append(value); - } else { - buffer.append("(this Map)"); - } - } - buffer.append('}'); - return buffer.toString(); - } -}