Optimization after split up #5337

tobiasKaminsky · 2020-01-28T06:52:43Z

This is second PR after splitup of #5150
It includes only code optimizations, done by @JorisBodin

Plan is to have all possible/needed tests in #5336 and then they need to work also on this PR before merging.

For checking that everything was split up correctly, you can compare this PR with #5150

Signed-off-by: tobiasKaminsky [email protected]

tobiasKaminsky · 2020-01-28T07:09:20Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -100,6 +100,114 @@ public FileDataStorageManager(Account account, ContentProviderClient contentProv
        this.account = account;
    }

+    private Cursor executeQuery(Uri uri, String[] projection, String selection,


We have the code style convention that if a line with parameters needs to be wrapped, that we then put all parameters in a separate line, so

private Cursor executeQuery(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder, String errorMessage) {

I will change it, but just for your info :-) (it is not that bad, if we sometimes forget this, but it makes diff a bit easier, if a paremeter gets changed)

Hi,

I take note for next time :)

nextcloud-android-bot · 2020-06-16T07:34:20Z

Here is an overview of what got changed by this pull request:

Issues
======
+ Solved 5
- Added 18
           

Complexity decreasing per file
==============================
+ src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java  -3

See the complete overview on Codacy

nextcloud-android-bot · 2020-06-16T07:34:37Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+        return contentProviderResults;
+    }
+
+    private ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations) {


Issue found: Avoid using implementation types like 'ArrayList'; use the interface instead

nextcloud-android-bot · 2020-06-16T07:34:38Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

-            } catch (RemoteException e) {
-                Log_OC.e(TAG, "Could not get file details: " + e.getMessage(), e);
-                cursor = null;
+    private ArrayList<OCFile> getFilesExistsID(ArrayList<OCFile> updatedFiles) {


Issue found: Avoid using implementation types like 'ArrayList'; use the interface instead

nextcloud-android-bot · 2020-06-16T07:34:39Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+        return executeQuery(uri, null, selection, selectionArgs, null, errorMessage);
+    }
+
+    private ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations, String errorMessage) {


Issue found: Avoid using implementation types like 'ArrayList'; use the interface instead

nextcloud-android-bot · 2020-06-16T07:34:40Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+
+            listIDString.clear();
+            listPathString.clear();
+            StringBuilder inList = new StringBuilder(loopSize * 2);


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:41Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    do {
+                        OCFile ocFile = new OCFile(cursor.getString(cursor.getColumnIndex(ProviderTableMeta.FILE_PATH)));


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:42Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+                + ProviderTableMeta.FILE_PATH
+                + " IN (" + inList + "))";
+
+            ArrayList<String> selectionArgsList = new ArrayList<>();


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:43Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+            selectionArgsList.add(account.name);
+            selectionArgsList.addAll(listIDString);
+            selectionArgsList.addAll(listPathString);
+            String[] selectionArgs = selectionArgsList.toArray(new String[0]);


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:44Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

-                            Log_OC.e(TAG, "Failed querying for descendents in conflict " + e.getMessage(), e);
-                        }
-                    }
+                    selectionArgs = new String[]{account.name, parentPath + "%"};


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:45Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+            for (int i = 0; i < loopSize; i++, processSize++) {
+                OCFile ocFile = updatedFiles.get(processSize);
+                if (i > 0) {
+                    inList.append(",");


Issue found: Avoid appending characters as strings in StringBuffer.append.

nextcloud-android-bot · 2020-06-16T07:34:45Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+        processSize = 0;
+
+        do {
+            loopSize = Math.min((totalSize - processSize), 499);


Issue found: Useless parentheses.

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

nextcloud-android-bot · 2020-06-16T07:34:47Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+        return deleted;
+    }
+
+    private int deleteFiles(Uri uri, String where, String[] whereArgs) {


Issue found: Consider using varargs for methods or constructors which take an array the last parameter.

nextcloud-android-bot · 2020-06-16T07:34:48Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -357,19 +451,24 @@ public void saveNewFile(OCFile newFile) {
     * @param updatedFiles
     * @param filesToRemove
     */
-    public void saveFolder(OCFile folder, List<OCFile> updatedFiles, Collection<OCFile> filesToRemove) {
+    public void saveFolder(OCFile folder, ArrayList<OCFile> updatedFiles, Collection<OCFile> filesToRemove) {


Issue found: Avoid using implementation types like 'ArrayList'; use the interface instead

nextcloud-android-bot · 2020-06-16T07:34:49Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+                if (i > 0) {
+                    inList.append(",");
+                }
+                inList.append("?");


Issue found: Avoid appending characters as strings in StringBuffer.append.

nextcloud-android-bot · 2020-06-16T07:34:50Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+            processSize = 0;
+
+            do {
+                loopSize = Math.min((totalSize - processSize), 998);


Issue found: Useless parentheses.

nextcloud-android-bot · 2020-06-16T07:34:51Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+                loopSize = Math.min((totalSize - processSize), 998);
+
+                listPathString.clear();
+                StringBuilder inList = new StringBuilder(folderContent.size() * 2);


Issue found: Avoid instantiating new objects inside loops

nextcloud-android-bot · 2020-06-16T07:34:53Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

-            saveFile(newFile);
-        } else {
-            throw new IllegalArgumentException("Saving a new file in an unexisting folder");
+    private boolean isFileExists(ArrayList<OCFile> filesExists, OCFile ocFile) {


Issue found: Avoid using implementation types like 'ArrayList'; use the interface instead

nextcloud-android-bot · 2020-06-16T07:34:53Z

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

+        ArrayList<String> listIDString = new ArrayList<>();
+        ArrayList<String> listPathString = new ArrayList<>();
+
+        int totalSize, processSize, loopSize;


Issue found: Use one line for each declaration, it enhances code readability.

nextcloud-android-bot · 2020-06-16T07:35:10Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14490.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

Optimization isFileExists Fix sql injection bulkInsert is more efficient Split query for SQL variables limit and remove unused method Remove bulkInsert and optimize applyBatch (only >= Android M) Optimization RemoveSharesInFolder Begin refactor FileDataStorageManager Finish refactor FileDataStorageManager Extract method for applyBatch and updateFiles Extract insertFile and DeleteFiles Finish extract deleteFiles and applyBatch Prepare remove duplication Add old comment Remove createContentValueForFile doublon Export createContentValue for saveFile() Fix when search file Fix bug on first connect Oups Signed-off-by: Joris Bodin <[email protected]> Signed-off-by: tobiasKaminsky <[email protected]>

Signed-off-by: tobiasKaminsky <[email protected]>

nextcloud-android-bot · 2022-05-16T13:05:24Z

Codacy

Lint

Type	master	PR
Warnings	87	87
Errors	0	4

SpotBugs

Category	Base	New
Bad practice	33	33
Correctness	45	44
Dodgy code	360	362
Experimental	1	1
Internationalization	9	9
Multithreaded correctness	9	9
Performance	66	72
Security	29	29
Total	552	559

Lint increased!

SpotBugs increased!

github-actions · 2022-05-16T13:07:36Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/5337.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

nextcloud-android-bot · 2022-05-16T17:21:56Z

master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/4954-IT-master-17-20

nextcloud-android-bot · 2022-05-16T17:27:08Z

stable-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/4954-IT-stable-17-25

tobiasKaminsky added the 2. developing label Jan 28, 2020

tobiasKaminsky commented Jan 28, 2020

View reviewed changes

JorisBodin approved these changes Jan 28, 2020

View reviewed changes

tobiasKaminsky force-pushed the fdsTests branch from 93fb7d6 to 92c6f4f Compare May 19, 2020 08:58

tobiasKaminsky force-pushed the fdsTests branch from 92c6f4f to 1fe8164 Compare May 27, 2020 15:07

tobiasKaminsky force-pushed the fdsTests branch 3 times, most recently from c7998aa to 008f1af Compare June 10, 2020 11:15

tobiasKaminsky force-pushed the fdsTests branch 2 times, most recently from e9f1c79 to 37bf0dd Compare June 16, 2020 06:10

tobiasKaminsky changed the base branch from fdsTests to master June 16, 2020 06:47

tobiasKaminsky force-pushed the optimizationAfterSplit branch 2 times, most recently from 3c44331 to e05c649 Compare June 16, 2020 07:31

nextcloud-android-bot reviewed Jun 16, 2020

View reviewed changes

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java Outdated Show resolved Hide resolved

nextcloud-android-bot reviewed Jun 16, 2020

View reviewed changes

JorisBodin and others added 2 commits May 16, 2022 11:49

update

a5196d5

Signed-off-by: tobiasKaminsky <[email protected]>

tobiasKaminsky force-pushed the optimizationAfterSplit branch from e05c649 to a5196d5 Compare May 16, 2022 10:22

wip

c1c7a81

Signed-off-by: tobiasKaminsky <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimization after split up #5337

Optimization after split up #5337

tobiasKaminsky commented Jan 28, 2020

tobiasKaminsky Jan 28, 2020

JorisBodin Jan 28, 2020

nextcloud-android-bot commented Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot Jun 16, 2020

nextcloud-android-bot commented Jun 16, 2020

nextcloud-android-bot commented May 16, 2022

github-actions bot commented May 16, 2022

nextcloud-android-bot commented May 16, 2022

nextcloud-android-bot commented May 16, 2022

Optimization after split up #5337

Are you sure you want to change the base?

Optimization after split up #5337

Conversation

tobiasKaminsky commented Jan 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nextcloud-android-bot commented Jun 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nextcloud-android-bot commented Jun 16, 2020

nextcloud-android-bot commented May 16, 2022

Codacy

Lint

SpotBugs

Lint increased!

SpotBugs increased!

github-actions bot commented May 16, 2022

nextcloud-android-bot commented May 16, 2022

nextcloud-android-bot commented May 16, 2022