align lib-core #326

gunplar · 2024-08-07T09:19:52Z

No description provided.

…onstructors are only functions, not to be used with new.

…on, allows better result-set management.

…Feature into JbFeature.

…n options, rename realm to map (sync with IMS).

…, ...

…(cache supportive).

…ecture.

…sh calculation, fix geo-grid calc, merge PgOptions with SessionOptions, plenty other fixes

…nto Pg, to share with PLV8, ...

# Conflicts: # here-naksha-lib-core/src/test/java/com/here/naksha/lib/core/JsonMappingTest.java # here-naksha-lib-model/src/commonMain/kotlin/naksha/model/FeatureEncoding.kt

# Conflicts: # here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/models/storage/ContextResult.java # here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/models/storage/ContextXyzFeatureResult.java # here-naksha-lib-core/src/main/java/com/here/naksha/lib/core/util/storage/ResultHelper.java

Amaneusz

Approved conditionally ;) discussed on webex

Amaneusz · 2024-08-07T09:44:24Z

build.gradle.kts

@@ -7,7 +7,7 @@ import java.time.format.DateTimeFormatter

 repositories {
    // provides dev versions!
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+    //maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")


If not needed then maybe let's remove them?

This may still serves as reminder for the guys later. I did not modify this part.

Amaneusz · 2024-08-07T09:44:29Z

build.gradle.kts

-    id("org.jetbrains.kotlin.multiplatform").version("2.1.0-dev-1329").apply(false)
-    kotlin("plugin.js-plain-objects").version("2.1.0-dev-1329")
-    //id("org.jetbrains.kotlin.multiplatform").version("2.0.20-Beta1").apply(false)
-    //kotlin("plugin.js-plain-objects").version("2.0.20-Beta1")


If not needed then maybe let's remove them?

These are deleted lines

Amaneusz · 2024-08-07T09:45:14Z

...log/src/main/java/com/here/naksha/handler/activitylog/ActivityLogRequestTranslationUtil.java

 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 class ActivityLogRequestTranslationUtil {

  private static final String[] ACTIVITY_LOG_ID_PATH = new String[] {PROPERTIES, XYZ_ACTIVITY_LOG_NS, ID};
-  static final PRef PREF_ACTIVITY_LOG_ID = pRefFromPropPath(ACTIVITY_LOG_ID_PATH);
+  static final Property PREF_ACTIVITY_LOG_ID = new Property(ACTIVITY_LOG_ID_PATH);


Are sure that these two lines are logically equal? This not a rhetorical question :D

Seems to be a result of refactoring by Alex, should be correct

Amaneusz · 2024-08-07T09:47:11Z

here-naksha-lib-core/src/test/java/com/here/naksha/lib/core/util/RequestHelperTest.java

+//        final PRef pref = RequestHelper.pRefFromPropPath(new String[]{"properties","prop_1"});
+//        assertNotNull(pref);
+//        assertTrue(pref instanceof NON_INDEXED_PREF, "Must be instanceof NonIndexedPRef");
+//    }


This is shaky, but I understand that this might be not yours - let's add keast add a TODO comment to see if this test can get uncommented / deleted

Amaneusz · 2024-08-07T09:48:25Z

here-naksha-lib-psql/src/jvmTest/java/naksha/psql/PsqlTablespaceTest.kt

+//
+//    fun partition(): Boolean = true
+//}


please add TODO comment to address it (delete test / repair it)

Amaneusz · 2024-08-07T09:48:57Z

here-naksha-lib-psql/src/commonTest/kotlin/naksha/psql/DbReadWriteTest.kt

-//import naksha.model.response.ErrorResponse
-//import naksha.model.response.Response
-//import naksha.model.response.SuccessResponse
+//import naksha.model.request.condition.BufferTransformation.Companion.bufferInMeters


please add TODO comment to address this file (delete test / repair it)

actually I think you can mention all files in this package

lib-psql is under Alex's and Pawel's decision, but I think they already marked these with TODOs, this file is marked line 615

Amaneusz · 2024-08-07T09:51:19Z

...-naksha-lib-core/src/test/java/com/here/naksha/lib/core/models/storage/ReadFeaturesTest.java

+//    // then
+//    String expectedJson = "{\"collectionIds\":[],\"limit\":100000,\"limitVersions\":1,\"noFeature\":false,\"noGeoRef\":false,\"noGeometry\":false,\"noMeta\":false,\"noTags\":false,\"queryDeleted\":false,\"queryHistory\":false,\"resultFilter\":[],\"returnHandle\":false}";
+//    assertEquals(expectedJson, json, "there is a property change in ReadFeatures, add it to shallowCopy and update json");
+//  }


Does it have to be commented?
If you know how - try to fix this plz, otherwise add a TODO comment

I will add a prefix, the TODO is already on line 14

Amaneusz · 2024-08-07T09:52:00Z

here-naksha-lib-core/src/test/java/com/here/naksha/lib/core/models/storage/StringCodec.javabak

-    JbFeatureDecoder jbFeatureDecoder = new JbFeatureDecoder(new JbDictManager()).mapBytes(featureBytes, 0, featureBytes.length);
-    Map<String, Object> featureAsMap = (Map<String, Object>) new JbMapDecoder().mapReader(jbFeatureDecoder.getReader()).toIMap();
+    JbRecordDecoder jbRecordDecoder = new JbRecordDecoder(new JbDictManager()).mapBytes(featureBytes, 0, featureBytes.length);
+    Map<String, Object> featureAsMap = (Map<String, Object>) new JbMapDecoder().mapReader(jbRecordDecoder.getReader()).toIMap();


Why would be need javabak file?
If you know we need it - leave it. If you know that we don't - delete. If you don't know - add a TODO comment plz :)

I would prefer to keep all of these as reference. There might be some functionalities that have not been ported into our new Kotlin classes, hence in some other unmigrated modules these will be called and result in compiler errors. It's better to have these to check what were actually performed underneath.

Alexander Lowey-Weber and others added 30 commits July 25, 2024 17:12

Add inline method to subtracting from array.

787f50b

Rename JavaScript version of methods in HereTile, because secondary c…

af7c974

…onstructors are only functions, not to be used with new.

Change request model, separate sub-queries to allow better optimisati…

cf68712

…on, allows better result-set management.

Fix errors in lib-psql resulting from model change.

5cdf602

Clarify terms, refactor JBON feature into JBON record, refactor JbMap…

0a4ba43

…Feature into JbFeature.

Add iterator for enumerations defined.

ff4f95b

Simplify error handling, share identifier limits (needed), add sessio…

60f6096

…n options, rename realm to map (sync with IMS).

Fix JBON refactoring.

f18bc2b

Fix identifier length, ordering of partitions, index creation, naming…

cf2dcd6

…, ...

In between push.

e9fb64e

Add generalized hashCodeOf method.

faab3de

Finish model changes to allow for rows and postponed feature loading …

4611ce8

…(cache supportive).

Add row cache, fix many small issues.

160c3ce

Fix compile errors, change parts so that they fit the modified archit…

57cdb58

…ecture.

Fix index creation, add documentation of fast fetch.

59cc980

Add a simple way to extract values from a JBON feature.

32b8dbe

Fix minor issues in the model, and docs, improve testing.

565da01

Refactor geo classes to Sp..., add basic centroid calculation, add ha…

83bd951

…sh calculation, fix geo-grid calc, merge PgOptions with SessionOptions, plenty other fixes

Fix all encoding and decodings, extract most code from Psql classes i…

03513ac

…nto Pg, to share with PLV8, ...

Merge remote-tracking branch 'origin/v3_alw_temp' into v3

7e6288b

# Conflicts: # here-naksha-lib-core/src/test/java/com/here/naksha/lib/core/JsonMappingTest.java # here-naksha-lib-model/src/commonMain/kotlin/naksha/model/FeatureEncoding.kt

aligning lib core with new request structure

0fce2dd

Rename row to tuple, which matches PostgresQL standard

36df4ad

fix errors

a91a1a0

Improve documentation, remove tuple writes (they are not senseful).

6b520bc

Fix collection-number sequence, and map-number sequence.

5bb2048

Fix documentation, adjust naming, start fixing create collection.

de219dd

Fix minor issues.

3de236d

Implement basics of create collection, basics of fetch.

bb169e1

Improve storage fetch, and cursor.

0b5a88f

fixing compiler error

aae2cd0

gunplar requested a review from Amaneusz August 7, 2024 09:19

Amaneusz approved these changes Aug 7, 2024

View reviewed changes

gunplar added 2 commits August 7, 2024 12:23

PR comments

dababbf

PR comments

0d8aada

gunplar merged commit 7b30842 into v3 Aug 7, 2024
1 of 3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

align lib-core #326

align lib-core #326

gunplar commented Aug 7, 2024

Amaneusz left a comment

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

Amaneusz Aug 7, 2024

Amaneusz Aug 7, 2024

Amaneusz Aug 7, 2024

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

Amaneusz Aug 7, 2024

gunplar Aug 7, 2024

align lib-core #326

align lib-core #326

Conversation

gunplar commented Aug 7, 2024

Amaneusz left a 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